Merge "remove framework_base_subdirs"
diff --git a/Android.bp b/Android.bp
index dab54f0..e7a3efc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -405,6 +405,8 @@
filegroup {
name: "statsd_aidl",
srcs: [
+ "core/java/android/os/IPullAtomCallback.aidl",
+ "core/java/android/os/IPullAtomResultReceiver.aidl",
"core/java/android/os/IStatsCompanionService.aidl",
"core/java/android/os/IStatsManager.aidl",
"core/java/android/os/IStatsPullerCallback.aidl",
@@ -425,6 +427,7 @@
name: "framework-minus-apex",
defaults: ["framework-defaults"],
srcs: [":framework-non-updatable-sources"],
+ libs: ["app-compat-annotations"],
installable: true,
javac_shard_size: 150,
required: [
@@ -463,12 +466,14 @@
defaults: ["framework-defaults"],
srcs: [":framework-all-sources"],
installable: false,
+ libs: ["app-compat-annotations"],
}
java_library {
name: "framework-annotation-proc",
defaults: ["framework-aidl-export-defaults"],
srcs: [":framework-all-sources"],
+ libs: ["app-compat-annotations"],
installable: false,
plugins: [
"unsupportedappusage-annotation-processor",
@@ -509,6 +514,7 @@
java_library {
name: "framework-atb-backward-compatibility",
installable: true,
+ libs: ["app-compat-annotations"],
srcs: [
"core/java/android/content/pm/AndroidTestBaseUpdater.java",
],
@@ -760,6 +766,46 @@
},
}
+filegroup {
+ name: "incremental_aidl",
+ srcs: [
+ "core/java/android/os/incremental/IIncrementalService.aidl",
+ "core/java/android/os/incremental/IIncrementalServiceProxy.aidl",
+ "core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl",
+ "core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl",
+ "core/java/android/os/incremental/NamedParcelFileDescriptor.aidl",
+ ],
+ path: "core/java",
+}
+
+filegroup {
+ name: "incremental_data_loader_aidl",
+ srcs: [
+ "core/java/android/service/incremental/IIncrementalDataLoaderStatusListener.aidl",
+ "core/java/android/service/incremental/IIncrementalDataLoaderService.aidl",
+ ],
+ path: "core/java",
+}
+
+aidl_interface {
+ name: "libincremental_aidl",
+ srcs: [
+ ":incremental_aidl",
+ ":incremental_data_loader_aidl",
+ ],
+ backend: {
+ java: {
+ sdk_version: "28",
+ },
+ cpp: {
+ enabled: true,
+ },
+ ndk: {
+ enabled: true,
+ },
+ },
+ api_dir: "aidl/incremental",
+}
gensrcs {
name: "gen-platform-proto-constants",
@@ -946,21 +992,6 @@
"--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
"--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*"
-// http://b/129765390 Rewrite links to "platform" or "technotes" folders
-// which are siblings (and thus outside of) {@docRoot}.
-//
-// We have to escape \ as \\ and $ as $$ here because they get resolved by
-// different layers of the build tooling. The arguments are wrapped in '' so
-// that the shell doesn't add yet another level of escaping.
-metalava_framework_docs_args += " --replace-documentation " +
- // packages whose descendants to apply replacement to (all packages from
- // libcore/ojluni/src/main/java that contribute to documentation).
- "com.sun:java:javax:jdk.net:sun " +
- // regex of the string to replace
- "'(<a\\s+href\\s?=[\\*\\s]*\")(?:(?:\\{@docRoot\\}/\\.\\./)|(?:(?:\\.\\./)+))((?:platform|technotes).+)\">' " +
- // replacement (with $1, $2 backreferences to the regex groups)
- "'$$1https://docs.oracle.com/javase/8/docs/$$2\">' "
-
packages_to_document = [
"android",
"dalvik",
diff --git a/apct-tests/perftests/core/AndroidTest.xml b/apct-tests/perftests/core/AndroidTest.xml
index 1b28913..478cfc1 100644
--- a/apct-tests/perftests/core/AndroidTest.xml
+++ b/apct-tests/perftests/core/AndroidTest.xml
@@ -25,4 +25,9 @@
<option name="package" value="com.android.perftests.core" />
<option name="hidden-api-checks" value="false"/>
</test>
+
+ <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+ <option name="directory-keys" value="/data/local/CorePerfTests" />
+ <option name="collect-on-run-ended-only" value="true" />
+ </metrics_collector>
</configuration>
diff --git a/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java b/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java
index f43bdf8..f32bf9a 100644
--- a/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java
+++ b/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java
@@ -111,11 +111,9 @@
private static class RelayoutRunner {
final Rect mOutFrame = new Rect();
- final Rect mOutOverscanInsets = new Rect();
final Rect mOutContentInsets = new Rect();
final Rect mOutVisibleInsets = new Rect();
final Rect mOutStableInsets = new Rect();
- final Rect mOutOutsets = new Rect();
final Rect mOutBackDropFrame = new Rect();
final DisplayCutout.ParcelableWrapper mOutDisplayCutout =
new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT);
@@ -149,8 +147,8 @@
while (state.keepRunning()) {
session.relayout(mWindow, mSeq, mParams, mWidth, mHeight,
mViewVisibility.getAsInt(), mFlags, mFrameNumber, mOutFrame,
- mOutOverscanInsets, mOutContentInsets, mOutVisibleInsets, mOutStableInsets,
- mOutOutsets, mOutBackDropFrame, mOutDisplayCutout, mOutMergedConfiguration,
+ mOutContentInsets, mOutVisibleInsets, mOutStableInsets,
+ mOutBackDropFrame, mOutDisplayCutout, mOutMergedConfiguration,
mOutSurfaceControl, mOutInsetsState);
}
}
diff --git a/apct-tests/perftests/core/src/android/wm/WindowAddRemovePerfTest.java b/apct-tests/perftests/core/src/android/wm/WindowAddRemovePerfTest.java
index 27790e6..4ac3adf 100644
--- a/apct-tests/perftests/core/src/android/wm/WindowAddRemovePerfTest.java
+++ b/apct-tests/perftests/core/src/android/wm/WindowAddRemovePerfTest.java
@@ -44,7 +44,11 @@
import org.junit.Test;
@LargeTest
-public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase {
+public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase
+ implements ManualBenchmarkState.CustomizedIterationListener {
+
+ private static final int PROFILED_ITERATIONS = 2;
+
@Rule
public final PerfManualStatusReporter mPerfStatusReporter = new PerfManualStatusReporter();
@@ -59,10 +63,24 @@
sUiAutomation.dropShellPermissionIdentity();
}
+ /** The last {@link #PROFILED_ITERATIONS} will provide the information of method profiling. */
+ @Override
+ public void onStart(int iteration) {
+ startProfiling(WindowAddRemovePerfTest.class.getSimpleName()
+ + "_MethodTracing_" + iteration + ".trace");
+ }
+
+ @Override
+ public void onFinished(int iteration) {
+ stopProfiling();
+ }
+
@Test
@ManualBenchmarkTest(warmupDurationNs = TIME_1_S_IN_NS, targetTestDurationNs = TIME_5_S_IN_NS)
public void testAddRemoveWindow() throws Throwable {
- new TestWindow().runBenchmark(mPerfStatusReporter.getBenchmarkState());
+ final ManualBenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+ state.setCustomizedIterations(PROFILED_ITERATIONS, this);
+ new TestWindow().runBenchmark(state);
}
private static class TestWindow extends BaseIWindow {
@@ -70,7 +88,6 @@
final Rect mOutFrame = new Rect();
final Rect mOutContentInsets = new Rect();
final Rect mOutStableInsets = new Rect();
- final Rect mOutOutsets = new Rect();
final DisplayCutout.ParcelableWrapper mOutDisplayCutout =
new DisplayCutout.ParcelableWrapper();
final InsetsState mOutInsetsState = new InsetsState();
@@ -92,7 +109,7 @@
long startTime = SystemClock.elapsedRealtimeNanos();
session.addToDisplay(this, mSeq, mLayoutParams, View.VISIBLE,
Display.DEFAULT_DISPLAY, mOutFrame, mOutContentInsets, mOutStableInsets,
- mOutOutsets, mOutDisplayCutout, inputChannel, mOutInsetsState);
+ mOutDisplayCutout, inputChannel, mOutInsetsState);
final long elapsedTimeNsOfAdd = SystemClock.elapsedRealtimeNanos() - startTime;
state.addExtraResult("add", elapsedTimeNsOfAdd);
@@ -102,6 +119,7 @@
state.addExtraResult("remove", elapsedTimeNsOfRemove);
elapsedTimeNs = elapsedTimeNsOfAdd + elapsedTimeNsOfRemove;
+ inputChannel.dispose();
}
}
}
diff --git a/apct-tests/perftests/core/src/android/wm/WindowManagerPerfTestBase.java b/apct-tests/perftests/core/src/android/wm/WindowManagerPerfTestBase.java
index 4d278c3..62e9ba8 100644
--- a/apct-tests/perftests/core/src/android/wm/WindowManagerPerfTestBase.java
+++ b/apct-tests/perftests/core/src/android/wm/WindowManagerPerfTestBase.java
@@ -21,6 +21,7 @@
import android.app.Activity;
import android.app.UiAutomation;
import android.content.Intent;
+import android.os.ParcelFileDescriptor;
import android.perftests.utils.PerfTestActivity;
import androidx.test.rule.ActivityTestRule;
@@ -32,6 +33,10 @@
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.util.concurrent.TimeUnit;
public class WindowManagerPerfTestBase {
@@ -40,16 +45,54 @@
static final long TIME_1_S_IN_NS = 1 * NANOS_PER_S;
static final long TIME_5_S_IN_NS = 5 * NANOS_PER_S;
+ /**
+ * The out directory matching the directory-keys of collector in AndroidTest.xml. The directory
+ * is in /data because while enabling method profling of system server, it cannot write the
+ * trace to external storage.
+ */
+ static final File BASE_OUT_PATH = new File("/data/local/CorePerfTests");
+
@BeforeClass
public static void setUpOnce() {
+ if (!BASE_OUT_PATH.exists()) {
+ executeShellCommand("mkdir -p " + BASE_OUT_PATH);
+ }
// In order to be closer to the real use case.
- sUiAutomation.executeShellCommand("input keyevent KEYCODE_WAKEUP");
- sUiAutomation.executeShellCommand("wm dismiss-keyguard");
+ executeShellCommand("input keyevent KEYCODE_WAKEUP");
+ executeShellCommand("wm dismiss-keyguard");
getInstrumentation().getContext().startActivity(new Intent(Intent.ACTION_MAIN)
.addCategory(Intent.CATEGORY_HOME).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
/**
+ * Executes shell command with reading the output. It may also used to block until the current
+ * command is completed.
+ */
+ static ByteArrayOutputStream executeShellCommand(String command) {
+ final ParcelFileDescriptor pfd = sUiAutomation.executeShellCommand(command);
+ final byte[] buf = new byte[512];
+ final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ int bytesRead;
+ try (FileInputStream fis = new ParcelFileDescriptor.AutoCloseInputStream(pfd)) {
+ while ((bytesRead = fis.read(buf)) != -1) {
+ bytes.write(buf, 0, bytesRead);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return bytes;
+ }
+
+ /** Starts method tracing on system server. */
+ void startProfiling(String subPath) {
+ executeShellCommand("am profile start system " + new File(BASE_OUT_PATH, subPath));
+ }
+
+ void stopProfiling() {
+ executeShellCommand("am profile stop system");
+ }
+
+ /**
* Provides an activity that keeps screen on and is able to wait for a stable lifecycle stage.
*/
static class PerfTestActivityRule extends ActivityTestRule<PerfTestActivity> {
diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
index e74e4a9..278a786 100644
--- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
+++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
@@ -516,7 +516,7 @@
/** Creates a managed (work) profile under the current user, returning its userId. */
private int createManagedProfile() {
final UserInfo userInfo = mUm.createProfileForUser("TestProfile",
- UserInfo.FLAG_MANAGED_PROFILE, mAm.getCurrentUser());
+ UserManager.USER_TYPE_PROFILE_MANAGED, /* flags */ 0, mAm.getCurrentUser());
if (userInfo == null) {
throw new IllegalStateException("Creating managed profile failed. Most likely there is "
+ "already a pre-existing profile on the device.");
diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/ManualBenchmarkState.java b/apct-tests/perftests/utils/src/android/perftests/utils/ManualBenchmarkState.java
index a83254b..b075239 100644
--- a/apct-tests/perftests/utils/src/android/perftests/utils/ManualBenchmarkState.java
+++ b/apct-tests/perftests/utils/src/android/perftests/utils/ManualBenchmarkState.java
@@ -88,6 +88,15 @@
int[] percentiles() default {};
}
+ /** The interface to receive the events of customized iteration. */
+ public interface CustomizedIterationListener {
+ /** The customized iteration starts. */
+ void onStart(int iteration);
+
+ /** The customized iteration finished. */
+ void onFinished(int iteration);
+ }
+
/** It means the entire {@link StatsReport} is not given. */
private static final int DEFAULT_STATS_REPORT = -2;
@@ -105,7 +114,8 @@
private static final int NOT_STARTED = 0; // The benchmark has not started yet.
private static final int WARMUP = 1; // The benchmark is warming up.
private static final int RUNNING = 2; // The benchmark is running.
- private static final int FINISHED = 3; // The benchmark has stopped.
+ private static final int RUNNING_CUSTOMIZED = 3; // Running for customized measurement.
+ private static final int FINISHED = 4; // The benchmark has stopped.
private int mState = NOT_STARTED; // Current benchmark state.
@@ -116,6 +126,14 @@
private int mMaxIterations = 0;
+ /**
+ * Additinal iteration that used to apply customized measurement. The result during these
+ * iterations won't be counted into {@link #mStats}.
+ */
+ private int mMaxCustomizedIterations;
+ private int mCustomizedIterations;
+ private CustomizedIterationListener mCustomizedIterationListener;
+
// Individual duration in nano seconds.
private ArrayList<Long> mResults = new ArrayList<>();
@@ -189,10 +207,25 @@
final boolean keepRunning = mResults.size() < mMaxIterations;
if (!keepRunning) {
mStats = new Stats(mResults);
+ if (mMaxCustomizedIterations > 0 && mCustomizedIterationListener != null) {
+ mState = RUNNING_CUSTOMIZED;
+ mCustomizedIterationListener.onStart(mCustomizedIterations);
+ return true;
+ }
mState = FINISHED;
}
return keepRunning;
}
+ case RUNNING_CUSTOMIZED: {
+ mCustomizedIterationListener.onFinished(mCustomizedIterations);
+ mCustomizedIterations++;
+ if (mCustomizedIterations >= mMaxCustomizedIterations) {
+ mState = FINISHED;
+ return false;
+ }
+ mCustomizedIterationListener.onStart(mCustomizedIterations);
+ return true;
+ }
case FINISHED:
throw new IllegalStateException("The benchmark has finished.");
default:
@@ -210,11 +243,21 @@
}
/**
- * Adds additional result while this benchmark isn't warming up. It is used when a sequence of
- * operations is executed consecutively, the duration of each operation can also be recorded.
+ * This is used to run the benchmark with more information by enabling some debug mechanism but
+ * we don't want to account the special runs (slower) in the stats report.
+ */
+ public void setCustomizedIterations(int iterations, CustomizedIterationListener listener) {
+ mMaxCustomizedIterations = iterations;
+ mCustomizedIterationListener = listener;
+ }
+
+ /**
+ * Adds additional result while this benchmark isn't warming up or running in customized state.
+ * It is used when a sequence of operations is executed consecutively, the duration of each
+ * operation can also be recorded.
*/
public void addExtraResult(String key, long duration) {
- if (isWarmingUp()) {
+ if (isWarmingUp() || mState == RUNNING_CUSTOMIZED) {
return;
}
if (mExtraResults == null) {
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
index 4e96f5e..0a4e020 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
@@ -2697,7 +2697,6 @@
args);
}
-
/**
* <b>For internal system user only!</b>
* Returns a list of all currently-executing jobs.
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java b/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
index 1e4861a..82292cf 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
@@ -578,7 +578,7 @@
}
}
} catch (IOException | XmlPullParserException e) {
- Slog.e(TAG, "Unable to read app idle file for user " + userId);
+ Slog.e(TAG, "Unable to read app idle file for user " + userId, e);
} finally {
IoUtils.closeQuietly(fis);
}
@@ -608,6 +608,11 @@
final int N = userHistory.size();
for (int i = 0; i < N; i++) {
String packageName = userHistory.keyAt(i);
+ // Skip any unexpected null package names
+ if (packageName == null) {
+ Slog.w(TAG, "Skipping App Idle write for unexpected null package");
+ continue;
+ }
AppUsageHistory history = userHistory.valueAt(i);
xml.startTag(null, TAG_PACKAGE);
xml.attribute(null, ATTR_NAME, packageName);
@@ -641,7 +646,7 @@
appIdleFile.finishWrite(fos);
} catch (Exception e) {
appIdleFile.failWrite(fos);
- Slog.e(TAG, "Error writing app idle file for user " + userId);
+ Slog.e(TAG, "Error writing app idle file for user " + userId, e);
}
}
diff --git a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
index 518a29c..a0615aa 100644
--- a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
+++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
@@ -18,7 +18,6 @@
import static android.app.AppOpsManager.OP_FLAGS_ALL_TRUSTED;
import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED;
import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;
-import static android.os.Process.getPidsForCommands;
import static android.os.Process.getUidForPid;
import static android.os.storage.VolumeInfo.TYPE_PRIVATE;
import static android.os.storage.VolumeInfo.TYPE_PUBLIC;
@@ -27,6 +26,7 @@
import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;
import static com.android.server.stats.IonMemoryUtil.readProcessSystemIonHeapSizesFromDebugfs;
import static com.android.server.stats.IonMemoryUtil.readSystemIonHeapSizeFromDebugfs;
+import static com.android.server.stats.ProcfsMemoryUtil.forEachPid;
import static com.android.server.stats.ProcfsMemoryUtil.readCmdlineFromProcfs;
import static com.android.server.stats.ProcfsMemoryUtil.readMemorySnapshotFromProcfs;
@@ -76,6 +76,7 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder;
+import android.os.IPullAtomCallback;
import android.os.IStatsCompanionService;
import android.os.IStatsManager;
import android.os.IStoraged;
@@ -144,6 +145,8 @@
import com.android.server.storage.DiskStatsFileLogger;
import com.android.server.storage.DiskStatsLoggingService;
+import com.google.android.collect.Sets;
+
import libcore.io.IoUtils;
import org.json.JSONArray;
@@ -163,6 +166,8 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -216,7 +221,7 @@
* <p>Processes are matched by their cmdline in procfs. Example: cat /proc/pid/cmdline returns
* /system/bin/statsd for the stats daemon.
*/
- private static final String[] MEMORY_INTERESTING_NATIVE_PROCESSES = new String[]{
+ private static final Set<String> MEMORY_INTERESTING_NATIVE_PROCESSES = Sets.newHashSet(
"/system/bin/statsd", // Stats daemon.
"/system/bin/surfaceflinger",
"/system/bin/apexd", // APEX daemon.
@@ -239,8 +244,7 @@
"/system/bin/traced_probes", // Perfetto.
"webview_zygote",
"zygote",
- "zygote64",
- };
+ "zygote64");
/**
* Lowest available uid for apps.
*
@@ -270,6 +274,72 @@
private final BroadcastReceiver mAppUpdateReceiver;
private final BroadcastReceiver mUserUpdateReceiver;
private final ShutdownEventReceiver mShutdownEventReceiver;
+
+ private static final class PullerKey {
+ private final int mUid;
+ private final int mAtomTag;
+
+ PullerKey(int uid, int atom) {
+ mUid = uid;
+ mAtomTag = atom;
+ }
+
+ public int getUid() {
+ return mUid;
+ }
+
+ public int getAtom() {
+ return mAtomTag;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mUid, mAtomTag);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof PullerKey) {
+ PullerKey other = (PullerKey) obj;
+ return this.mUid == other.getUid() && this.mAtomTag == other.getAtom();
+ }
+ return false;
+ }
+ }
+
+ private static final class PullerValue {
+ private final long mCoolDownNs;
+ private final long mTimeoutNs;
+ private int[] mAdditiveFields;
+ private IPullAtomCallback mCallback;
+
+ PullerValue(long coolDownNs, long timeoutNs, int[] additiveFields,
+ IPullAtomCallback callback) {
+ mCoolDownNs = coolDownNs;
+ mTimeoutNs = timeoutNs;
+ mAdditiveFields = additiveFields;
+ mCallback = callback;
+ }
+
+ public long getCoolDownNs() {
+ return mCoolDownNs;
+ }
+
+ public long getTimeoutNs() {
+ return mTimeoutNs;
+ }
+
+ public int[] getAdditiveFields() {
+ return mAdditiveFields;
+ }
+
+ public IPullAtomCallback getCallback() {
+ return mCallback;
+ }
+ }
+
+ private final HashMap<PullerKey, PullerValue> mPullers = new HashMap<>();
+
private final KernelWakelockReader mKernelWakelockReader = new KernelWakelockReader();
private final KernelWakelockStats mTmpWakelockStats = new KernelWakelockStats();
private IWifiManager mWifiManager = null;
@@ -321,7 +391,6 @@
@Override
public void onReceive(Context context, Intent intent) {
synchronized (sStatsdLock) {
- sStatsd = fetchStatsdService();
if (sStatsd == null) {
Slog.w(TAG, "Could not access statsd for UserUpdateReceiver");
return;
@@ -1220,27 +1289,28 @@
e.writeInt(snapshot.rssHighWaterMarkInKilobytes);
pulledData.add(e);
}
- int[] pids = getPidsForCommands(MEMORY_INTERESTING_NATIVE_PROCESSES);
- for (int pid : pids) {
- final String processName = readCmdlineFromProcfs(pid);
+ forEachPid((pid, cmdLine) -> {
+ if (!MEMORY_INTERESTING_NATIVE_PROCESSES.contains(cmdLine)) {
+ return;
+ }
final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid);
if (snapshot == null) {
- continue;
+ return;
}
// Sometimes we get here a process that is not included in the whitelist. It comes
// from forking the zygote for an app. We can ignore that sample because this process
// is collected by ProcessMemoryState.
if (isAppUid(snapshot.uid)) {
- continue;
+ return;
}
StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
e.writeInt(snapshot.uid);
- e.writeString(processName);
+ e.writeString(cmdLine);
// RSS high-water mark in bytes.
e.writeLong((long) snapshot.rssHighWaterMarkInKilobytes * 1024L);
e.writeInt(snapshot.rssHighWaterMarkInKilobytes);
pulledData.add(e);
- }
+ });
// Invoke rss_hwm_reset binary to reset RSS HWM counters for all processes.
SystemProperties.set("sys.rss_hwm_reset.on", "1");
}
@@ -1267,22 +1337,23 @@
e.writeInt(snapshot.anonRssInKilobytes + snapshot.swapInKilobytes);
pulledData.add(e);
}
- int[] pids = getPidsForCommands(MEMORY_INTERESTING_NATIVE_PROCESSES);
- for (int pid : pids) {
- final String processName = readCmdlineFromProcfs(pid);
+ forEachPid((pid, cmdLine) -> {
+ if (!MEMORY_INTERESTING_NATIVE_PROCESSES.contains(cmdLine)) {
+ return;
+ }
final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid);
if (snapshot == null) {
- continue;
+ return;
}
// Sometimes we get here a process that is not included in the whitelist. It comes
// from forking the zygote for an app. We can ignore that sample because this process
// is collected by ProcessMemoryState.
if (isAppUid(snapshot.uid)) {
- continue;
+ return;
}
StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
e.writeInt(snapshot.uid);
- e.writeString(processName);
+ e.writeString(cmdLine);
e.writeInt(pid);
e.writeInt(-1001); // Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1.
e.writeInt(snapshot.rssInKilobytes);
@@ -1290,7 +1361,7 @@
e.writeInt(snapshot.swapInKilobytes);
e.writeInt(snapshot.anonRssInKilobytes + snapshot.swapInKilobytes);
pulledData.add(e);
- }
+ });
}
private static boolean isAppUid(int uid) {
@@ -2549,10 +2620,40 @@
mContext.enforceCallingPermission(android.Manifest.permission.STATSCOMPANION, null);
}
+ @Override
+ public void registerPullAtomCallback(int atomTag, long coolDownNs, long timeoutNs,
+ int[] additiveFields, IPullAtomCallback pullerCallback) {
+ synchronized (sStatsdLock) {
+ // Always cache the puller in SCS.
+ // If statsd is down, we will register it when it comes back up.
+ int callingUid = Binder.getCallingUid();
+ final long token = Binder.clearCallingIdentity();
+ PullerKey key = new PullerKey(callingUid, atomTag);
+ PullerValue val = new PullerValue(
+ coolDownNs, timeoutNs, additiveFields, pullerCallback);
+ mPullers.put(key, val);
+
+ if (sStatsd == null) {
+ Slog.w(TAG, "Could not access statsd for registering puller for atom " + atomTag);
+ return;
+ }
+ try {
+ sStatsd.registerPullAtomCallback(
+ callingUid, atomTag, coolDownNs, timeoutNs, additiveFields, pullerCallback);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Failed to access statsd to register puller for atom " + atomTag);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+ }
+
// Lifecycle and related code
/**
- * Fetches the statsd IBinder service
+ * Fetches the statsd IBinder service.
+ * Note: This should only be called from sayHiToStatsd. All other clients should use the cached
+ * sStatsd with a null check.
*/
private static IStatsManager fetchStatsdService() {
return IStatsManager.Stub.asInterface(ServiceManager.getService("stats"));
@@ -2650,6 +2751,8 @@
// Pull the latest state of UID->app name, version mapping when
// statsd starts.
informAllUidsLocked(mContext);
+ // Register all pullers. If SCS has just started, this should be empty.
+ registerAllPullersLocked();
} finally {
restoreCallingIdentity(token);
}
@@ -2661,10 +2764,21 @@
}
}
+ @GuardedBy("sStatsdLock")
+ private void registerAllPullersLocked() throws RemoteException {
+ // TODO: pass in one call, using a file descriptor (similar to uidmap).
+ for (Map.Entry<PullerKey, PullerValue> entry : mPullers.entrySet()) {
+ PullerKey key = entry.getKey();
+ PullerValue val = entry.getValue();
+ sStatsd.registerPullAtomCallback(key.getUid(), key.getAtom(), val.getCoolDownNs(),
+ val.getTimeoutNs(), val.getAdditiveFields(), val.getCallback());
+ }
+ }
+
private class StatsdDeathRecipient implements IBinder.DeathRecipient {
@Override
public void binderDied() {
- Slog.i(TAG, "Statsd is dead - erase all my knowledge.");
+ Slog.i(TAG, "Statsd is dead - erase all my knowledge, except pullers");
synchronized (sStatsdLock) {
long now = SystemClock.elapsedRealtime();
for (Long timeMillis : mDeathTimeMillis) {
diff --git a/api/current.txt b/api/current.txt
index f9a2957..7dccf7f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1597,7 +1597,7 @@
field public static final int windowMinWidthMinor = 16843607; // 0x1010357
field public static final int windowNoDisplay = 16843294; // 0x101021e
field public static final int windowNoTitle = 16842838; // 0x1010056
- field public static final int windowOverscan = 16843727; // 0x10103cf
+ field @Deprecated public static final int windowOverscan = 16843727; // 0x10103cf
field public static final int windowReenterTransition = 16843951; // 0x10104af
field public static final int windowReturnTransition = 16843950; // 0x10104ae
field public static final int windowSharedElementEnterTransition = 16843833; // 0x1010439
@@ -2333,13 +2333,13 @@
field public static final int Theme_Material_Light_LightStatusBar = 16974549; // 0x10302d5
field public static final int Theme_Material_Light_NoActionBar = 16974401; // 0x1030241
field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974402; // 0x1030242
- field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974403; // 0x1030243
+ field @Deprecated public static final int Theme_Material_Light_NoActionBar_Overscan = 16974403; // 0x1030243
field public static final int Theme_Material_Light_NoActionBar_TranslucentDecor = 16974404; // 0x1030244
field public static final int Theme_Material_Light_Panel = 16974405; // 0x1030245
field public static final int Theme_Material_Light_Voice = 16974406; // 0x1030246
field public static final int Theme_Material_NoActionBar = 16974382; // 0x103022e
field public static final int Theme_Material_NoActionBar_Fullscreen = 16974383; // 0x103022f
- field public static final int Theme_Material_NoActionBar_Overscan = 16974384; // 0x1030230
+ field @Deprecated public static final int Theme_Material_NoActionBar_Overscan = 16974384; // 0x1030230
field public static final int Theme_Material_NoActionBar_TranslucentDecor = 16974385; // 0x1030231
field public static final int Theme_Material_Panel = 16974386; // 0x1030232
field public static final int Theme_Material_Settings = 16974387; // 0x1030233
@@ -4271,8 +4271,8 @@
method public android.app.AlertDialog show();
}
- public class AliasActivity extends android.app.Activity {
- ctor public AliasActivity();
+ @Deprecated public class AliasActivity extends android.app.Activity {
+ ctor @Deprecated public AliasActivity();
}
public class AppComponentFactory {
@@ -8445,6 +8445,7 @@
method public int describeContents();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean fetchUuidsWithSdp();
method public String getAddress();
+ method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH) public String getAlias();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public android.bluetooth.BluetoothClass getBluetoothClass();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getBondState();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public String getName();
@@ -8456,6 +8457,7 @@
field public static final String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED";
field public static final String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED";
field public static final String ACTION_ACL_DISCONNECT_REQUESTED = "android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED";
+ field public static final String ACTION_ALIAS_CHANGED = "android.bluetooth.action.ALIAS_CHANGED";
field public static final String ACTION_BOND_STATE_CHANGED = "android.bluetooth.device.action.BOND_STATE_CHANGED";
field public static final String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED";
field public static final String ACTION_FOUND = "android.bluetooth.device.action.FOUND";
@@ -9475,6 +9477,7 @@
method @Nullable public android.net.Uri canonicalize(@NonNull android.net.Uri);
method @NonNull public final android.content.ContentProvider.CallingIdentity clearCallingIdentity();
method public abstract int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]);
+ method public int delete(@NonNull android.net.Uri, @Nullable android.os.Bundle);
method public void dump(java.io.FileDescriptor, java.io.PrintWriter, String[]);
method @Nullable public final String getCallingFeatureId();
method @Nullable public final String getCallingPackage();
@@ -9485,6 +9488,7 @@
method @Nullable public abstract String getType(@NonNull android.net.Uri);
method @Nullable public final String getWritePermission();
method @Nullable public abstract android.net.Uri insert(@NonNull android.net.Uri, @Nullable android.content.ContentValues);
+ method @Nullable public android.net.Uri insert(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable android.os.Bundle);
method protected boolean isTemporary();
method public void onConfigurationChanged(android.content.res.Configuration);
method public abstract boolean onCreate();
@@ -9510,6 +9514,7 @@
method public void shutdown();
method @Nullable public android.net.Uri uncanonicalize(@NonNull android.net.Uri);
method public abstract int update(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]);
+ method public int update(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable android.os.Bundle);
}
public final class ContentProvider.CallingIdentity {
@@ -9528,10 +9533,12 @@
method @Nullable public final android.net.Uri canonicalize(@NonNull android.net.Uri) throws android.os.RemoteException;
method public void close();
method public int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]) throws android.os.RemoteException;
+ method public int delete(@NonNull android.net.Uri, @Nullable android.os.Bundle) throws android.os.RemoteException;
method @Nullable public android.content.ContentProvider getLocalContentProvider();
method @Nullable public String[] getStreamTypes(@NonNull android.net.Uri, @NonNull String) throws android.os.RemoteException;
method @Nullable public String getType(@NonNull android.net.Uri) throws android.os.RemoteException;
method @Nullable public android.net.Uri insert(@NonNull android.net.Uri, @Nullable android.content.ContentValues) throws android.os.RemoteException;
+ method @Nullable public android.net.Uri insert(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable android.os.Bundle) throws android.os.RemoteException;
method @Nullable public android.content.res.AssetFileDescriptor openAssetFile(@NonNull android.net.Uri, @NonNull String) throws java.io.FileNotFoundException, android.os.RemoteException;
method @Nullable public android.content.res.AssetFileDescriptor openAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;
method @Nullable public android.os.ParcelFileDescriptor openFile(@NonNull android.net.Uri, @NonNull String) throws java.io.FileNotFoundException, android.os.RemoteException;
@@ -9546,6 +9553,7 @@
method @Deprecated public boolean release();
method @Nullable public final android.net.Uri uncanonicalize(@NonNull android.net.Uri) throws android.os.RemoteException;
method public int update(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]) throws android.os.RemoteException;
+ method public int update(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable android.os.Bundle) throws android.os.RemoteException;
}
public class ContentProviderOperation implements android.os.Parcelable {
@@ -9633,6 +9641,7 @@
method public static void cancelSync(android.content.SyncRequest);
method @Nullable public final android.net.Uri canonicalize(@NonNull android.net.Uri);
method public final int delete(@NonNull @RequiresPermission.Write android.net.Uri, @Nullable String, @Nullable String[]);
+ method public final int delete(@NonNull @RequiresPermission.Write android.net.Uri, @Nullable android.os.Bundle);
method @Deprecated public static android.content.SyncInfo getCurrentSync();
method public static java.util.List<android.content.SyncInfo> getCurrentSyncs();
method public static int getIsSyncable(android.accounts.Account, String);
@@ -9646,12 +9655,14 @@
method @Nullable public final String getType(@NonNull android.net.Uri);
method @NonNull public final android.content.ContentResolver.MimeTypeInfo getTypeInfo(@NonNull String);
method @Nullable public final android.net.Uri insert(@NonNull @RequiresPermission.Write android.net.Uri, @Nullable android.content.ContentValues);
+ method @Nullable public final android.net.Uri insert(@NonNull @RequiresPermission.Write android.net.Uri, @Nullable android.content.ContentValues, @Nullable android.os.Bundle);
method public static boolean isSyncActive(android.accounts.Account, String);
method public static boolean isSyncPending(android.accounts.Account, String);
method @NonNull public android.graphics.Bitmap loadThumbnail(@NonNull android.net.Uri, @NonNull android.util.Size, @Nullable android.os.CancellationSignal) throws java.io.IOException;
method public void notifyChange(@NonNull android.net.Uri, @Nullable android.database.ContentObserver);
- method public void notifyChange(@NonNull android.net.Uri, @Nullable android.database.ContentObserver, boolean);
+ method @Deprecated public void notifyChange(@NonNull android.net.Uri, @Nullable android.database.ContentObserver, boolean);
method public void notifyChange(@NonNull android.net.Uri, @Nullable android.database.ContentObserver, int);
+ method public void notifyChange(@NonNull Iterable<android.net.Uri>, @Nullable android.database.ContentObserver, int);
method @Nullable public final android.content.res.AssetFileDescriptor openAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
method @Nullable public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String) throws java.io.FileNotFoundException;
method @Nullable public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
@@ -9682,6 +9693,7 @@
method @Nullable public final android.net.Uri uncanonicalize(@NonNull android.net.Uri);
method public final void unregisterContentObserver(@NonNull android.database.ContentObserver);
method public final int update(@NonNull @RequiresPermission.Write android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]);
+ method public final int update(@NonNull @RequiresPermission.Write android.net.Uri, @Nullable android.content.ContentValues, @Nullable android.os.Bundle);
method public static void validateSyncExtrasBundle(android.os.Bundle);
method @NonNull public static android.content.ContentResolver wrap(@NonNull android.content.ContentProvider);
method @NonNull public static android.content.ContentResolver wrap(@NonNull android.content.ContentProviderClient);
@@ -9694,12 +9706,16 @@
field public static final String EXTRA_TOTAL_COUNT = "android.content.extra.TOTAL_COUNT";
field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2
field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1
+ field public static final String QUERY_ARG_GROUP_COLUMNS = "android:query-arg-group-columns";
field public static final String QUERY_ARG_LIMIT = "android:query-arg-limit";
field public static final String QUERY_ARG_OFFSET = "android:query-arg-offset";
field public static final String QUERY_ARG_SORT_COLLATION = "android:query-arg-sort-collation";
field public static final String QUERY_ARG_SORT_COLUMNS = "android:query-arg-sort-columns";
field public static final String QUERY_ARG_SORT_DIRECTION = "android:query-arg-sort-direction";
field public static final String QUERY_ARG_SORT_LOCALE = "android:query-arg-sort-locale";
+ field public static final String QUERY_ARG_SQL_GROUP_BY = "android:query-arg-sql-group-by";
+ field public static final String QUERY_ARG_SQL_HAVING = "android:query-arg-sql-having";
+ field public static final String QUERY_ARG_SQL_LIMIT = "android:query-arg-sql-limit";
field public static final String QUERY_ARG_SQL_SELECTION = "android:query-arg-sql-selection";
field public static final String QUERY_ARG_SQL_SELECTION_ARGS = "android:query-arg-sql-selection-args";
field public static final String QUERY_ARG_SQL_SORT_ORDER = "android:query-arg-sql-sort-order";
@@ -15712,6 +15728,8 @@
public final class Icon implements android.os.Parcelable {
method public static android.graphics.drawable.Icon createWithAdaptiveBitmap(android.graphics.Bitmap);
+ method @NonNull public static android.graphics.drawable.Icon createWithAdaptiveBitmapContentUri(@NonNull String);
+ method @NonNull public static android.graphics.drawable.Icon createWithAdaptiveBitmapContentUri(@NonNull android.net.Uri);
method public static android.graphics.drawable.Icon createWithBitmap(android.graphics.Bitmap);
method public static android.graphics.drawable.Icon createWithContentUri(String);
method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri);
@@ -15738,6 +15756,7 @@
field public static final int TYPE_DATA = 3; // 0x3
field public static final int TYPE_RESOURCE = 2; // 0x2
field public static final int TYPE_URI = 4; // 0x4
+ field public static final int TYPE_URI_ADAPTIVE_BITMAP = 6; // 0x6
}
public static interface Icon.OnDrawableLoadedListener {
@@ -23038,17 +23057,17 @@
}
public final class GnssStatus {
- method public float getAzimuthDegrees(int);
- method public float getCarrierFrequencyHz(int);
- method public float getCn0DbHz(int);
- method public int getConstellationType(int);
- method public float getElevationDegrees(int);
- method public int getSatelliteCount();
- method public int getSvid(int);
- method public boolean hasAlmanacData(int);
- method public boolean hasCarrierFrequencyHz(int);
- method public boolean hasEphemerisData(int);
- method public boolean usedInFix(int);
+ method @FloatRange(from=0, to=360) public float getAzimuthDegrees(@IntRange(from=0) int);
+ method @FloatRange(from=0) public float getCarrierFrequencyHz(@IntRange(from=0) int);
+ method @FloatRange(from=0, to=63) public float getCn0DbHz(@IntRange(from=0) int);
+ method public int getConstellationType(@IntRange(from=0) int);
+ method @FloatRange(from=0xffffffa6, to=90) public float getElevationDegrees(@IntRange(from=0) int);
+ method @IntRange(from=0) public int getSatelliteCount();
+ method @IntRange(from=1, to=200) public int getSvid(@IntRange(from=0) int);
+ method public boolean hasAlmanacData(@IntRange(from=0) int);
+ method public boolean hasCarrierFrequencyHz(@IntRange(from=0) int);
+ method public boolean hasEphemerisData(@IntRange(from=0) int);
+ method public boolean usedInFix(@IntRange(from=0) int);
field public static final int CONSTELLATION_BEIDOU = 5; // 0x5
field public static final int CONSTELLATION_GALILEO = 6; // 0x6
field public static final int CONSTELLATION_GLONASS = 3; // 0x3
@@ -23059,10 +23078,17 @@
field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
}
+ public static final class GnssStatus.Builder {
+ ctor public GnssStatus.Builder();
+ method @NonNull public android.location.GnssStatus.Builder addSatellite(int, @IntRange(from=1, to=200) int, @FloatRange(from=0, to=63) float, @FloatRange(from=0xffffffa6, to=90) float, @FloatRange(from=0, to=360) float, boolean, boolean, boolean, boolean, @FloatRange(from=0) float);
+ method @NonNull public android.location.GnssStatus build();
+ method @NonNull public android.location.GnssStatus.Builder clearSatellites();
+ }
+
public abstract static class GnssStatus.Callback {
ctor public GnssStatus.Callback();
method public void onFirstFix(int);
- method public void onSatelliteStatusChanged(android.location.GnssStatus);
+ method public void onSatelliteStatusChanged(@NonNull android.location.GnssStatus);
method public void onStarted();
method public void onStopped();
}
@@ -23078,6 +23104,7 @@
}
@Deprecated public final class GpsStatus {
+ method @Deprecated @NonNull public static android.location.GpsStatus create(@NonNull android.location.GnssStatus, int);
method @Deprecated public int getMaxSatellites();
method @Deprecated public Iterable<android.location.GpsSatellite> getSatellites();
method @Deprecated public int getTimeToFirstFix();
@@ -23164,6 +23191,7 @@
public class LocationManager {
method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addGpsStatusListener(android.location.GpsStatus.Listener);
+ method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.GpsStatus.NmeaListener);
method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.OnNmeaMessageListener);
method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.OnNmeaMessageListener, @Nullable android.os.Handler);
method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull java.util.concurrent.Executor, @NonNull android.location.OnNmeaMessageListener);
@@ -23194,6 +23222,7 @@
method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull android.location.GnssStatus.Callback, @Nullable android.os.Handler);
method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull java.util.concurrent.Executor, @NonNull android.location.GnssStatus.Callback);
method @Deprecated public void removeGpsStatusListener(android.location.GpsStatus.Listener);
+ method @Deprecated public void removeNmeaListener(@NonNull android.location.GpsStatus.NmeaListener);
method public void removeNmeaListener(@NonNull android.location.OnNmeaMessageListener);
method @RequiresPermission(anyOf={"android.permission.ACCESS_COARSE_LOCATION", "android.permission.ACCESS_FINE_LOCATION"}, apis="..22") public void removeProximityAlert(@NonNull android.app.PendingIntent);
method public void removeTestProvider(@NonNull String);
@@ -23500,6 +23529,7 @@
method @Deprecated public boolean isBluetoothA2dpOn();
method public boolean isBluetoothScoAvailableOffCall();
method public boolean isBluetoothScoOn();
+ method public boolean isCallScreeningModeSupported();
method public static boolean isHapticPlaybackSupported();
method public boolean isMicrophoneMute();
method public boolean isMusicActive();
@@ -23598,6 +23628,7 @@
field public static final int GET_DEVICES_ALL = 3; // 0x3
field public static final int GET_DEVICES_INPUTS = 1; // 0x1
field public static final int GET_DEVICES_OUTPUTS = 2; // 0x2
+ field public static final int MODE_CALL_SCREENING = 4; // 0x4
field public static final int MODE_CURRENT = -1; // 0xffffffff
field public static final int MODE_INVALID = -2; // 0xfffffffe
field public static final int MODE_IN_CALL = 2; // 0x2
@@ -24037,7 +24068,7 @@
ctor public ExifInterface(@NonNull String) throws java.io.IOException;
ctor public ExifInterface(@NonNull java.io.FileDescriptor) throws java.io.IOException;
ctor public ExifInterface(@NonNull java.io.InputStream) throws java.io.IOException;
- method @NonNull public static android.media.ExifInterface fromStandalone(@NonNull java.io.InputStream) throws java.io.IOException;
+ ctor public ExifInterface(@NonNull java.io.InputStream, int) throws java.io.IOException;
method public double getAltitude(double);
method @Nullable public String getAttribute(@NonNull String);
method @Nullable public byte[] getAttributeBytes(@NonNull String);
@@ -24064,6 +24095,8 @@
field public static final int ORIENTATION_TRANSPOSE = 5; // 0x5
field public static final int ORIENTATION_TRANSVERSE = 7; // 0x7
field public static final int ORIENTATION_UNDEFINED = 0; // 0x0
+ field public static final int STREAM_TYPE_EXIF_DATA_ONLY = 1; // 0x1
+ field public static final int STREAM_TYPE_FULL_IMAGE_DATA = 0; // 0x0
field @Deprecated public static final String TAG_APERTURE = "FNumber";
field public static final String TAG_APERTURE_VALUE = "ApertureValue";
field public static final String TAG_ARTIST = "Artist";
@@ -24149,6 +24182,9 @@
field public static final String TAG_MODEL = "Model";
field public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
field public static final String TAG_OECF = "OECF";
+ field public static final String TAG_OFFSET_TIME = "OffsetTime";
+ field public static final String TAG_OFFSET_TIME_DIGITIZED = "OffsetTimeDigitized";
+ field public static final String TAG_OFFSET_TIME_ORIGINAL = "OffsetTimeOriginal";
field public static final String TAG_ORF_ASPECT_FRAME = "AspectFrame";
field public static final String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";
field public static final String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";
@@ -30038,6 +30074,7 @@
method public java.util.List<android.net.wifi.ScanResult> getScanResults();
method public int getWifiState();
method public boolean is5GHzBandSupported();
+ method public boolean is6GHzBandSupported();
method @Deprecated public boolean isDeviceToApRttSupported();
method public boolean isEasyConnectSupported();
method public boolean isEnhancedOpenSupported();
@@ -30352,6 +30389,7 @@
public static final class WifiAwareNetworkSpecifier.Builder {
ctor public WifiAwareNetworkSpecifier.Builder(@NonNull android.net.wifi.aware.DiscoverySession, @NonNull android.net.wifi.aware.PeerHandle);
method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier build();
+ method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPmk(@NonNull byte[]);
method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPort(@IntRange(from=0, to=65535) int);
method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPskPassphrase(@NonNull String);
method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setTransportProtocol(@IntRange(from=0, to=255) int);
@@ -35351,6 +35389,8 @@
public class RemoteException extends android.util.AndroidException {
ctor public RemoteException();
ctor public RemoteException(String);
+ method @NonNull public RuntimeException rethrowAsRuntimeException();
+ method @NonNull public RuntimeException rethrowFromSystemServer();
}
public class ResultReceiver implements android.os.Parcelable {
@@ -38958,6 +38998,7 @@
field public static final String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS";
field public static final String ACTION_NIGHT_DISPLAY_SETTINGS = "android.settings.NIGHT_DISPLAY_SETTINGS";
field public static final String ACTION_NOTIFICATION_ASSISTANT_SETTINGS = "android.settings.NOTIFICATION_ASSISTANT_SETTINGS";
+ field public static final String ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS = "android.settings.NOTIFICATION_LISTENER_DETAIL_SETTINGS";
field public static final String ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
field public static final String ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS";
field public static final String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS";
@@ -38997,6 +39038,7 @@
field public static final String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";
field public static final String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";
field public static final String EXTRA_INPUT_METHOD_ID = "input_method_id";
+ field public static final String EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME = "android.provider.extra.NOTIFICATION_LISTENER_COMPONENT_NAME";
field public static final String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";
field public static final String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";
field public static final String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";
@@ -45218,6 +45260,8 @@
method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);
method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);
method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();
+ method @Nullable public java.util.List<android.telephony.SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList();
+ method public static int getActiveDataSubscriptionId();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();
method public int getActiveSubscriptionInfoCountMax();
@@ -45768,11 +45812,13 @@
method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void updateSubscriptionNickname(int, @Nullable String, @NonNull android.app.PendingIntent);
field public static final String ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS = "android.telephony.euicc.action.MANAGE_EMBEDDED_SUBSCRIPTIONS";
field public static final String ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE = "android.telephony.euicc.action.NOTIFY_CARRIER_SETUP_INCOMPLETE";
+ field public static final String ACTION_START_EUICC_ACTIVATION = "android.telephony.euicc.action.START_EUICC_ACTIVATION";
field public static final int EMBEDDED_SUBSCRIPTION_RESULT_ERROR = 2; // 0x2
field public static final int EMBEDDED_SUBSCRIPTION_RESULT_OK = 0; // 0x0
field public static final int EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR = 1; // 0x1
field public static final String EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE = "android.telephony.euicc.extra.EMBEDDED_SUBSCRIPTION_DETAILED_CODE";
field public static final String EXTRA_EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTION = "android.telephony.euicc.extra.EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTION";
+ field public static final String EXTRA_USE_QR_SCANNER = "android.telephony.euicc.extra.USE_QR_SCANNER";
field public static final String META_DATA_CARRIER_ICON = "android.telephony.euicc.carriericon";
}
@@ -52270,7 +52316,7 @@
field public static final int FLAG_KEEP_SCREEN_ON = 128; // 0x80
field public static final int FLAG_LAYOUT_ATTACHED_IN_DECOR = 1073741824; // 0x40000000
field public static final int FLAG_LAYOUT_INSET_DECOR = 65536; // 0x10000
- field public static final int FLAG_LAYOUT_IN_OVERSCAN = 33554432; // 0x2000000
+ field @Deprecated public static final int FLAG_LAYOUT_IN_OVERSCAN = 33554432; // 0x2000000
field public static final int FLAG_LAYOUT_IN_SCREEN = 256; // 0x100
field public static final int FLAG_LAYOUT_NO_LIMITS = 512; // 0x200
field public static final int FLAG_LOCAL_FOCUS_MODE = 268435456; // 0x10000000
diff --git a/api/removed.txt b/api/removed.txt
index c348ed9..e0e26f7 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -217,11 +217,6 @@
method @Deprecated public void removeVerticalAccuracy();
}
- public class LocationManager {
- method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
- method @Deprecated public void removeNmeaListener(android.location.GpsStatus.NmeaListener);
- }
-
}
package android.media {
diff --git a/api/system-current.txt b/api/system-current.txt
index d5f544c..aed13b7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1306,6 +1306,7 @@
method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean isEncrypted();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isInSilenceMode();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean removeBond();
+ method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean setAlias(@NonNull String);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setMetadata(int, @NonNull byte[]);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setPhonebookAccessPermission(int);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setSilenceMode(boolean);
@@ -1414,6 +1415,7 @@
method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.content.Intent registerReceiverForAllUsers(@Nullable android.content.BroadcastReceiver, @NonNull android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler);
method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);
+ method public void sendBroadcastMultiplePermissions(@NonNull android.content.Intent, @NonNull String[]);
method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);
field public static final String APP_PREDICTION_SERVICE = "app_prediction";
@@ -4845,7 +4847,7 @@
method public boolean isPortableHotspotSupported();
method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();
method public boolean isWifiScannerSupported();
- method @RequiresPermission("android.permission.NETWORK_SETTINGS") public void registerSoftApCallback(@NonNull android.net.wifi.WifiManager.SoftApCallback, @Nullable java.util.concurrent.Executor);
+ method @RequiresPermission("android.permission.NETWORK_SETTINGS") public void registerSoftApCallback(@Nullable java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SoftApCallback);
method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void removeOnWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);
method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void save(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener);
method @RequiresPermission("android.permission.WIFI_SET_DEVICE_MOBILITY_STATE") public void setDeviceMobilityState(int);
@@ -5091,10 +5093,6 @@
method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPmk(@NonNull android.net.wifi.aware.PeerHandle, @NonNull byte[]);
}
- public static final class WifiAwareNetworkSpecifier.Builder {
- method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPmk(@NonNull byte[]);
- }
-
public class WifiAwareSession implements java.lang.AutoCloseable {
method public android.net.NetworkSpecifier createNetworkSpecifierPmk(int, @NonNull byte[], @NonNull byte[]);
}
@@ -6410,6 +6408,10 @@
package android.security.keystore {
+ public class AndroidKeyStoreProvider extends java.security.Provider {
+ method @NonNull public static java.security.KeyStore getKeyStoreForUid(int) throws java.security.KeyStoreException, java.security.NoSuchProviderException;
+ }
+
public abstract class AttestationUtils {
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static java.security.cert.X509Certificate[] attestDeviceIds(android.content.Context, @NonNull int[], @NonNull byte[]) throws android.security.keystore.DeviceIdAttestationException;
field public static final int ID_TYPE_IMEI = 2; // 0x2
@@ -6423,6 +6425,10 @@
ctor public DeviceIdAttestationException(@Nullable String, @Nullable Throwable);
}
+ public static final class KeyGenParameterSpec.Builder {
+ method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUid(int);
+ }
+
}
package android.security.keystore.recovery {
@@ -6812,7 +6818,7 @@
method public android.service.euicc.DownloadSubscriptionResult onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean, @Nullable android.os.Bundle);
method @Deprecated public int onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean);
method @Deprecated public abstract int onEraseSubscriptions(int);
- method public int onEraseSubscriptionsWithOptions(int, @android.telephony.euicc.EuiccCardManager.ResetOption int);
+ method public int onEraseSubscriptions(int, @android.telephony.euicc.EuiccCardManager.ResetOption int);
method public abstract android.service.euicc.GetDefaultDownloadableSubscriptionListResult onGetDefaultDownloadableSubscriptionList(int, boolean);
method public abstract android.service.euicc.GetDownloadableSubscriptionMetadataResult onGetDownloadableSubscriptionMetadata(int, android.telephony.euicc.DownloadableSubscription, boolean);
method public abstract String onGetEid(int);
@@ -6832,6 +6838,8 @@
field public static final String ACTION_RESOLVE_DEACTIVATE_SIM = "android.service.euicc.action.RESOLVE_DEACTIVATE_SIM";
field public static final String ACTION_RESOLVE_NO_PRIVILEGES = "android.service.euicc.action.RESOLVE_NO_PRIVILEGES";
field public static final String ACTION_RESOLVE_RESOLVABLE_ERRORS = "android.service.euicc.action.RESOLVE_RESOLVABLE_ERRORS";
+ field public static final String ACTION_START_CARRIER_ACTIVATION = "android.service.euicc.action.START_CARRIER_ACTIVATION";
+ field public static final String ACTION_START_EUICC_ACTIVATION = "android.service.euicc.action.START_EUICC_ACTIVATION";
field public static final String ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED = "android.service.euicc.action.TOGGLE_SUBSCRIPTION_PRIVILEGED";
field public static final String CATEGORY_EUICC_UI = "android.service.euicc.category.EUICC_UI";
field public static final String EUICC_SERVICE_INTERFACE = "android.service.euicc.EuiccService";
@@ -7957,6 +7965,7 @@
public final class DataSpecificRegistrationInfo implements android.os.Parcelable {
method public int describeContents();
method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();
+ method public boolean isUsingCarrierAggregation();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationInfo> CREATOR;
}
@@ -8095,6 +8104,7 @@
method @Nullable public android.telephony.CellIdentity getCellIdentity();
method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();
method public int getDomain();
+ method public int getNrState();
method public int getRegistrationState();
method public int getRejectCause();
method public int getRoamingType();
@@ -8337,6 +8347,9 @@
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);
+ method public int getNrFrequencyRange();
+ method @Nullable public String getOperatorAlphaLongRaw();
+ method @Nullable public String getOperatorAlphaShortRaw();
field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2
field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3
field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0
@@ -8473,6 +8486,7 @@
public class SubscriptionInfo implements android.os.Parcelable {
method @Nullable public java.util.List<android.telephony.UiccAccessRule> getAccessRules();
method public int getProfileClass();
+ method public boolean isGroupDisabled();
}
public class SubscriptionManager {
@@ -8555,6 +8569,7 @@
method @Deprecated public boolean getDataEnabled();
method @Deprecated public boolean getDataEnabled(int);
method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);
+ method @NonNull public static String getDefaultSimCountryIso();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();
@@ -8586,7 +8601,9 @@
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();
+ method public boolean isModemEnabledForSlot(int);
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();
+ method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
@@ -8607,6 +8624,7 @@
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);
+ method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
@@ -8941,7 +8959,7 @@
public class EuiccManager {
method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void continueOperation(android.content.Intent, android.os.Bundle);
method @Deprecated @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptions(@NonNull android.app.PendingIntent);
- method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptionsWithOptions(@android.telephony.euicc.EuiccCardManager.ResetOption int, @NonNull android.app.PendingIntent);
+ method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptions(@android.telephony.euicc.EuiccCardManager.ResetOption int, @NonNull android.app.PendingIntent);
method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void getDefaultDownloadableSubscriptionList(android.app.PendingIntent);
method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void getDownloadableSubscriptionMetadata(android.telephony.euicc.DownloadableSubscription, android.app.PendingIntent);
method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public int getOtaStatus();
@@ -8964,6 +8982,7 @@
field public static final String EXTRA_ENABLE_SUBSCRIPTION = "android.telephony.euicc.extra.ENABLE_SUBSCRIPTION";
field public static final String EXTRA_FORCE_PROVISION = "android.telephony.euicc.extra.FORCE_PROVISION";
field public static final String EXTRA_FROM_SUBSCRIPTION_ID = "android.telephony.euicc.extra.FROM_SUBSCRIPTION_ID";
+ field public static final String EXTRA_PHYSICAL_SLOT_ID = "android.telephony.euicc.extra.PHYSICAL_SLOT_ID";
field public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.euicc.extra.SUBSCRIPTION_ID";
field public static final String EXTRA_SUBSCRIPTION_NICKNAME = "android.telephony.euicc.extra.SUBSCRIPTION_NICKNAME";
}
@@ -9216,7 +9235,7 @@
public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
method @NonNull public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);
- method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException;
+ method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>) throws android.telephony.ims.ImsException;
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiModeSetting();
diff --git a/api/test-current.txt b/api/test-current.txt
index 35b1757..44f736c 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -717,6 +717,7 @@
}
public class Intent implements java.lang.Cloneable android.os.Parcelable {
+ field @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public static final String ACTION_MANAGE_DEFAULT_APP = "android.intent.action.MANAGE_DEFAULT_APP";
field public static final String ACTION_ROLLBACK_COMMITTED = "android.intent.action.ROLLBACK_COMMITTED";
field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";
}
@@ -3358,7 +3359,7 @@
public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
method @NonNull public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);
- method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getFeatureState(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException;
+ method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getFeatureState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>) throws android.telephony.ims.ImsException;
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getVoWiFiModeSetting();
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index 41d546f..22e1d01 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -174,6 +174,8 @@
instrument.noWindowAnimation = true;
} else if (opt.equals("--no-hidden-api-checks")) {
instrument.disableHiddenApiChecks = true;
+ } else if (opt.equals("--no-test-api-checks")) {
+ instrument.disableTestApiChecks = true;
} else if (opt.equals("--no-isolated-storage")) {
instrument.disableIsolatedStorage = true;
} else if (opt.equals("--user")) {
diff --git a/cmds/am/src/com/android/commands/am/Instrument.java b/cmds/am/src/com/android/commands/am/Instrument.java
index 4d7b5a7..6afd7c4 100644
--- a/cmds/am/src/com/android/commands/am/Instrument.java
+++ b/cmds/am/src/com/android/commands/am/Instrument.java
@@ -17,6 +17,7 @@
package com.android.commands.am;
import static android.app.ActivityManager.INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS;
+import static android.app.ActivityManager.INSTR_FLAG_DISABLE_TEST_API_CHECKS;
import static android.app.ActivityManager.INSTR_FLAG_MOUNT_EXTERNAL_STORAGE_FULL;
import android.app.IActivityManager;
@@ -85,6 +86,7 @@
String logPath = null;
public boolean noWindowAnimation = false;
public boolean disableHiddenApiChecks = false;
+ public boolean disableTestApiChecks = false;
public boolean disableIsolatedStorage = false;
public String abi = null;
public int userId = UserHandle.USER_CURRENT;
@@ -506,6 +508,9 @@
if (disableHiddenApiChecks) {
flags |= INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS;
}
+ if (disableTestApiChecks) {
+ flags |= INSTR_FLAG_DISABLE_TEST_API_CHECKS;
+ }
if (disableIsolatedStorage) {
flags |= INSTR_FLAG_MOUNT_EXTERNAL_STORAGE_FULL;
}
diff --git a/cmds/content/src/com/android/commands/content/Content.java b/cmds/content/src/com/android/commands/content/Content.java
index 7e278e9..59544a9 100644
--- a/cmds/content/src/com/android/commands/content/Content.java
+++ b/cmds/content/src/com/android/commands/content/Content.java
@@ -508,7 +508,7 @@
@Override
public void onExecute(IContentProvider provider) throws Exception {
- provider.insert(resolveCallingPackage(), null, mUri, mContentValues);
+ provider.insert(resolveCallingPackage(), null, mUri, mContentValues, null);
}
}
@@ -522,7 +522,8 @@
@Override
public void onExecute(IContentProvider provider) throws Exception {
- provider.delete(resolveCallingPackage(), null, mUri, mWhere, null);
+ provider.delete(resolveCallingPackage(), null, mUri,
+ ContentResolver.createSqlQueryBundle(mWhere, null));
}
}
@@ -679,7 +680,8 @@
@Override
public void onExecute(IContentProvider provider) throws Exception {
- provider.update(resolveCallingPackage(), null, mUri, mContentValues, mWhere, null);
+ provider.update(resolveCallingPackage(), null, mUri, mContentValues,
+ ContentResolver.createSqlQueryBundle(mWhere, null));
}
}
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 8af925a..cf286e6 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -50,6 +50,7 @@
srcs: [
":statsd_aidl",
+ ":ICarStatsService.aidl",
"src/active_config_list.proto",
"src/anomaly/AlarmMonitor.cpp",
"src/anomaly/AlarmTracker.cpp",
@@ -64,6 +65,7 @@
"src/config/ConfigKey.cpp",
"src/config/ConfigListener.cpp",
"src/config/ConfigManager.cpp",
+ "src/external/CarStatsPuller.cpp",
"src/external/GpuStatsPuller.cpp",
"src/external/Perfetto.cpp",
"src/external/PowerStatsPuller.cpp",
diff --git a/cmds/statsd/src/HashableDimensionKey.cpp b/cmds/statsd/src/HashableDimensionKey.cpp
index 5e156bb..f9f11b2 100644
--- a/cmds/statsd/src/HashableDimensionKey.cpp
+++ b/cmds/statsd/src/HashableDimensionKey.cpp
@@ -59,10 +59,11 @@
return JenkinsHashWhiten(hash);
}
-bool filterValues(const Matcher& matcherField, const vector<FieldValue>& values, Value* output) {
+bool filterValues(const Matcher& matcherField, const vector<FieldValue>& values,
+ FieldValue* output) {
for (const auto& value : values) {
if (value.mField.matches(matcherField)) {
- (*output) = value.mValue;
+ (*output) = value;
return true;
}
}
@@ -106,15 +107,34 @@
size_t count = conditionDimension->getValues().size();
if (count != links.conditionFields.size()) {
- // ALOGE("WTF condition link is bad");
return;
}
for (size_t i = 0; i < count; i++) {
conditionDimension->mutableValue(i)->mField.setField(
- links.conditionFields[i].mMatcher.getField());
+ links.conditionFields[i].mMatcher.getField());
conditionDimension->mutableValue(i)->mField.setTag(
- links.conditionFields[i].mMatcher.getTag());
+ links.conditionFields[i].mMatcher.getTag());
+ }
+}
+
+void getDimensionForState(const std::vector<FieldValue>& eventValues, const Metric2State& link,
+ HashableDimensionKey* statePrimaryKey) {
+ // First, get the dimension from the event using the "what" fields from the
+ // MetricStateLinks.
+ filterValues(link.metricFields, eventValues, statePrimaryKey);
+
+ // Then check that the statePrimaryKey size equals the number of state fields
+ size_t count = statePrimaryKey->getValues().size();
+ if (count != link.stateFields.size()) {
+ return;
+ }
+
+ // For each dimension Value in the statePrimaryKey, set the field and tag
+ // using the state atom fields from MetricStateLinks.
+ for (size_t i = 0; i < count; i++) {
+ statePrimaryKey->mutableValue(i)->mField.setField(link.stateFields[i].mMatcher.getField());
+ statePrimaryKey->mutableValue(i)->mField.setTag(link.stateFields[i].mMatcher.getTag());
}
}
@@ -185,11 +205,11 @@
bool MetricDimensionKey::operator==(const MetricDimensionKey& that) const {
return mDimensionKeyInWhat == that.getDimensionKeyInWhat() &&
- mDimensionKeyInCondition == that.getDimensionKeyInCondition();
+ mStateValuesKey == that.getStateValuesKey();
};
string MetricDimensionKey::toString() const {
- return mDimensionKeyInWhat.toString() + mDimensionKeyInCondition.toString();
+ return mDimensionKeyInWhat.toString() + mStateValuesKey.toString();
}
bool MetricDimensionKey::operator<(const MetricDimensionKey& that) const {
@@ -199,7 +219,7 @@
return false;
}
- return mDimensionKeyInCondition < that.getDimensionKeyInCondition();
+ return mStateValuesKey < that.getStateValuesKey();
}
} // namespace statsd
diff --git a/cmds/statsd/src/HashableDimensionKey.h b/cmds/statsd/src/HashableDimensionKey.h
index a123850..b9b86ce 100644
--- a/cmds/statsd/src/HashableDimensionKey.h
+++ b/cmds/statsd/src/HashableDimensionKey.h
@@ -34,6 +34,12 @@
std::vector<Matcher> conditionFields;
};
+struct Metric2State {
+ int32_t stateAtomId;
+ std::vector<Matcher> metricFields;
+ std::vector<Matcher> stateFields;
+};
+
class HashableDimensionKey {
public:
explicit HashableDimensionKey(const std::vector<FieldValue>& values) {
@@ -76,17 +82,16 @@
};
class MetricDimensionKey {
- public:
+public:
explicit MetricDimensionKey(const HashableDimensionKey& dimensionKeyInWhat,
- const HashableDimensionKey& dimensionKeyInCondition)
- : mDimensionKeyInWhat(dimensionKeyInWhat),
- mDimensionKeyInCondition(dimensionKeyInCondition) {};
+ const HashableDimensionKey& stateValuesKey)
+ : mDimensionKeyInWhat(dimensionKeyInWhat), mStateValuesKey(stateValuesKey){};
MetricDimensionKey(){};
MetricDimensionKey(const MetricDimensionKey& that)
: mDimensionKeyInWhat(that.getDimensionKeyInWhat()),
- mDimensionKeyInCondition(that.getDimensionKeyInCondition()) {};
+ mStateValuesKey(that.getStateValuesKey()){};
MetricDimensionKey& operator=(const MetricDimensionKey& from) = default;
@@ -96,25 +101,25 @@
return mDimensionKeyInWhat;
}
- inline const HashableDimensionKey& getDimensionKeyInCondition() const {
- return mDimensionKeyInCondition;
+ inline const HashableDimensionKey& getStateValuesKey() const {
+ return mStateValuesKey;
}
- inline void setDimensionKeyInCondition(const HashableDimensionKey& key) {
- mDimensionKeyInCondition = key;
+ inline void setStateValuesKey(const HashableDimensionKey& key) {
+ mStateValuesKey = key;
}
- bool hasDimensionKeyInCondition() const {
- return mDimensionKeyInCondition.getValues().size() > 0;
+ bool hasStateValuesKey() const {
+ return mStateValuesKey.getValues().size() > 0;
}
bool operator==(const MetricDimensionKey& that) const;
bool operator<(const MetricDimensionKey& that) const;
- private:
- HashableDimensionKey mDimensionKeyInWhat;
- HashableDimensionKey mDimensionKeyInCondition;
+private:
+ HashableDimensionKey mDimensionKeyInWhat;
+ HashableDimensionKey mStateValuesKey;
};
android::hash_t hashDimension(const HashableDimensionKey& key);
@@ -124,7 +129,7 @@
* The value of the FieldValue is output.
*/
bool filterValues(const Matcher& matcherField, const std::vector<FieldValue>& values,
- Value* output);
+ FieldValue* output);
/**
* Creating HashableDimensionKeys from FieldValues using matcher.
@@ -152,6 +157,13 @@
const Metric2Condition& links,
HashableDimensionKey* conditionDimension);
+/**
+ * Get dimension values using metric's "what" fields and fill statePrimaryKey's
+ * mField information using "state" fields.
+ */
+void getDimensionForState(const std::vector<FieldValue>& eventValues, const Metric2State& link,
+ HashableDimensionKey* statePrimaryKey);
+
} // namespace statsd
} // namespace os
} // namespace android
@@ -172,7 +184,7 @@
struct hash<MetricDimensionKey> {
std::size_t operator()(const MetricDimensionKey& key) const {
android::hash_t hash = hashDimension(key.getDimensionKeyInWhat());
- hash = android::JenkinsHashMix(hash, hashDimension(key.getDimensionKeyInCondition()));
+ hash = android::JenkinsHashMix(hash, hashDimension(key.getStateValuesKey()));
return android::JenkinsHashWhiten(hash);
}
};
diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h
index 17f2770..b41771d 100644
--- a/cmds/statsd/src/StatsLogProcessor.h
+++ b/cmds/statsd/src/StatsLogProcessor.h
@@ -263,9 +263,10 @@
FRIEND_TEST(MetricActivationE2eTest, TestCountMetricWithSameDeactivation);
FRIEND_TEST(MetricActivationE2eTest, TestCountMetricWithTwoMetricsTwoDeactivations);
- FRIEND_TEST(CountMetricE2eTest, TestWithSimpleState);
- FRIEND_TEST(CountMetricE2eTest, TestWithMappedState);
- FRIEND_TEST(CountMetricE2eTest, TestWithMultipleStates);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedState);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);
+ FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithPrimaryFields);
FRIEND_TEST(DurationMetricE2eTest, TestOneBucket);
FRIEND_TEST(DurationMetricE2eTest, TestTwoBuckets);
diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp
index b665a8b..f072c9c 100644
--- a/cmds/statsd/src/StatsService.cpp
+++ b/cmds/statsd/src/StatsService.cpp
@@ -1289,6 +1289,13 @@
return Status::ok();
}
+Status StatsService::registerPullAtomCallback(int32_t uid, int32_t atomTag, int64_t coolDownNs,
+ int64_t timeoutNs, const std::vector<int32_t>& additiveFields,
+ const sp<android::os::IPullAtomCallback>& pullerCallback) {
+ VLOG("StatsService::registerPuller called.");
+ return Status::ok();
+}
+
Status StatsService::unregisterPullerCallback(int32_t atomTag, const String16& packageName) {
ENFORCE_DUMP_AND_USAGE_STATS(packageName);
diff --git a/cmds/statsd/src/StatsService.h b/cmds/statsd/src/StatsService.h
index 9490948..6d40007 100644
--- a/cmds/statsd/src/StatsService.h
+++ b/cmds/statsd/src/StatsService.h
@@ -180,6 +180,13 @@
const String16& packageName) override;
/**
+ * Binder call to register a callback function for a pulled atom.
+ */
+ virtual Status registerPullAtomCallback(int32_t uid, int32_t atomTag, int64_t coolDownNs,
+ int64_t timeoutNs, const std::vector<int32_t>& additiveFields,
+ const sp<android::os::IPullAtomCallback>& pullerCallback) override;
+
+ /**
* Binder call to unregister any existing callback function for a vendor pulled atom.
*/
virtual Status unregisterPullerCallback(int32_t atomTag, const String16& packageName) override;
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index c196c61..b0570fd 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -339,6 +339,7 @@
228 [(allow_from_any_uid) = true];
PerfettoUploaded perfetto_uploaded =
229 [(log_from_module) = "perfetto"];
+ VmsClientConnectionStateChanged vms_client_connection_state_changed = 230;
}
// Pulled events will start at field 10000.
@@ -408,6 +409,7 @@
SurfaceflingerStatsGlobalInfo surfaceflinger_stats_global_info = 10062;
SurfaceflingerStatsLayerInfo surfaceflinger_stats_layer_info = 10063;
ProcessMemorySnapshot process_memory_snapshot = 10064;
+ VmsClientStats vms_client_stats = 10065;
}
// DO NOT USE field numbers above 100,000 in AOSP.
@@ -3732,6 +3734,33 @@
optional Result result = 9;
}
+/**
+ * Logs when a Vehicle Maps Service client's connection state has changed
+ *
+ * Logged from:
+ * packages/services/Car/service/src/com/android/car/stats/VmsClientLog.java
+ */
+message VmsClientConnectionStateChanged {
+ // The UID of the VMS client app
+ optional int32 uid = 1 [(is_uid) = true];
+
+ enum State {
+ UNKNOWN = 0;
+ // Attempting to connect to the client
+ CONNECTING = 1;
+ // Client connection established
+ CONNECTED = 2;
+ // Client connection closed unexpectedly
+ DISCONNECTED = 3;
+ // Client connection closed by VMS
+ TERMINATED = 4;
+ // Error establishing the client connection
+ CONNECTION_ERROR = 5;
+ }
+
+ optional State state = 2;
+}
+
//////////////////////////////////////////////////////////////////////
// Pulled atoms below this line //
//////////////////////////////////////////////////////////////////////
@@ -7275,3 +7304,32 @@
optional int64 trace_uuid_lsb = 2;
optional int64 trace_uuid_msb = 3;
}
+
+/**
+ * Pulls client metrics on data transferred via Vehicle Maps Service.
+ * Metrics are keyed by uid + layer.
+ *
+ * Pulled from:
+ * packages/services/Car/service/src/com/android/car/stats/CarStatsService.java
+ */
+message VmsClientStats {
+ // UID of the VMS client app
+ optional int32 uid = 1 [(is_uid) = true];
+
+ // VMS layer definition
+ optional int32 layer_type = 2;
+ optional int32 layer_channel = 3;
+ optional int32 layer_version = 4;
+
+ // Bytes and packets sent by the client for the layer
+ optional int64 tx_bytes = 5;
+ optional int64 tx_packets = 6;
+
+ // Bytes and packets received by the client for the layer
+ optional int64 rx_bytes = 7;
+ optional int64 rx_packets = 8;
+
+ // Bytes and packets dropped due to client error
+ optional int64 dropped_bytes = 9;
+ optional int64 dropped_packets = 10;
+}
diff --git a/cmds/statsd/src/external/CarStatsPuller.cpp b/cmds/statsd/src/external/CarStatsPuller.cpp
new file mode 100644
index 0000000..70c0456
--- /dev/null
+++ b/cmds/statsd/src/external/CarStatsPuller.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2019 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.
+ */
+
+#define DEBUG false
+#include "Log.h"
+
+#include <binder/IServiceManager.h>
+#include <com/android/internal/car/ICarStatsService.h>
+
+#include "CarStatsPuller.h"
+#include "logd/LogEvent.h"
+#include "stats_log_util.h"
+
+using android::binder::Status;
+using com::android::internal::car::ICarStatsService;
+
+namespace android {
+namespace os {
+namespace statsd {
+
+static std::mutex gCarStatsMutex;
+static sp<ICarStatsService> gCarStats = nullptr;
+
+class CarStatsDeathRecipient : public android::IBinder::DeathRecipient {
+ public:
+ CarStatsDeathRecipient() = default;
+ ~CarStatsDeathRecipient() override = default;
+
+ // android::IBinder::DeathRecipient override:
+ void binderDied(const android::wp<android::IBinder>& /* who */) override {
+ ALOGE("Car service has died");
+ std::lock_guard<std::mutex> lock(gCarStatsMutex);
+ if (gCarStats) {
+ sp<IBinder> binder = IInterface::asBinder(gCarStats);
+ binder->unlinkToDeath(this);
+ gCarStats = nullptr;
+ }
+ }
+};
+
+static sp<CarStatsDeathRecipient> gDeathRecipient = new CarStatsDeathRecipient();
+
+static sp<ICarStatsService> getCarService() {
+ std::lock_guard<std::mutex> lock(gCarStatsMutex);
+ if (!gCarStats) {
+ const sp<IBinder> binder = defaultServiceManager()->checkService(String16("car_stats"));
+ if (!binder) {
+ ALOGW("Car service is unavailable");
+ return nullptr;
+ }
+ gCarStats = interface_cast<ICarStatsService>(binder);
+ binder->linkToDeath(gDeathRecipient);
+ }
+ return gCarStats;
+}
+
+CarStatsPuller::CarStatsPuller(const int tagId) : StatsPuller(tagId) {
+}
+
+bool CarStatsPuller::PullInternal(std::vector<std::shared_ptr<LogEvent>>* data) {
+ const sp<ICarStatsService> carService = getCarService();
+ if (!carService) {
+ return false;
+ }
+
+ vector<StatsLogEventWrapper> returned_value;
+ Status status = carService->pullData(mTagId, &returned_value);
+ if (!status.isOk()) {
+ ALOGW("CarStatsPuller::pull failed for %d", mTagId);
+ return false;
+ }
+
+ data->clear();
+ for (const StatsLogEventWrapper& it : returned_value) {
+ LogEvent::createLogEvents(it, *data);
+ }
+ VLOG("CarStatsPuller::pull succeeded for %d", mTagId);
+ return true;
+}
+
+} // namespace statsd
+} // namespace os
+} // namespace android
diff --git a/cmds/statsd/src/external/CarStatsPuller.h b/cmds/statsd/src/external/CarStatsPuller.h
new file mode 100644
index 0000000..ca0f1a9
--- /dev/null
+++ b/cmds/statsd/src/external/CarStatsPuller.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "StatsPuller.h"
+
+namespace android {
+namespace os {
+namespace statsd {
+
+/**
+ * Pull atoms from CarService.
+ */
+class CarStatsPuller : public StatsPuller {
+public:
+ explicit CarStatsPuller(const int tagId);
+ bool PullInternal(std::vector<std::shared_ptr<LogEvent>>* data) override;
+};
+
+} // namespace statsd
+} // namespace os
+} // namespace android
diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp
index 5a76d1f..535fcfb 100644
--- a/cmds/statsd/src/external/StatsPullerManager.cpp
+++ b/cmds/statsd/src/external/StatsPullerManager.cpp
@@ -32,6 +32,7 @@
#include "../logd/LogEvent.h"
#include "../stats_log_util.h"
#include "../statscompanion_util.h"
+#include "CarStatsPuller.h"
#include "GpuStatsPuller.h"
#include "PowerStatsPuller.h"
#include "ResourceHealthManagerPuller.h"
@@ -272,6 +273,10 @@
{android::util::SURFACEFLINGER_STATS_GLOBAL_INFO,
{.puller =
new SurfaceflingerStatsPuller(android::util::SURFACEFLINGER_STATS_GLOBAL_INFO)}},
+ // VmsClientStats
+ {android::util::VMS_CLIENT_STATS,
+ {.additiveFields = {5, 6, 7, 8, 9, 10},
+ .puller = new CarStatsPuller(android::util::VMS_CLIENT_STATS)}},
};
StatsPullerManager::StatsPullerManager() : mNextPullTimeNs(NO_ALARM_UPDATE) {
diff --git a/cmds/statsd/src/metrics/CountMetricProducer.cpp b/cmds/statsd/src/metrics/CountMetricProducer.cpp
index 4a06387..c29b32c 100644
--- a/cmds/statsd/src/metrics/CountMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/CountMetricProducer.cpp
@@ -57,10 +57,9 @@
const int FIELD_ID_DATA = 1;
// for CountMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
-const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
+const int FIELD_ID_SLICE_BY_STATE = 6;
const int FIELD_ID_BUCKET_INFO = 3;
const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
-const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for CountBucketInfo
const int FIELD_ID_COUNT = 3;
const int FIELD_ID_BUCKET_NUM = 4;
@@ -102,7 +101,13 @@
mConditionSliced = true;
}
- // TODO(tsaichristine): b/142124705 handle metric state links
+ for (const auto& stateLink : metric.state_link()) {
+ Metric2State ms;
+ ms.stateAtomId = stateLink.state_atom_id();
+ translateFieldMatcher(stateLink.fields_in_what(), &ms.metricFields);
+ translateFieldMatcher(stateLink.fields_in_state(), &ms.stateFields);
+ mMetric2StateLinks.push_back(ms);
+ }
flushIfNeededLocked(startTimeNs);
// Adjust start for partial bucket
@@ -132,10 +137,9 @@
(unsigned long)mCurrentSlicedCounter->size());
if (verbose) {
for (const auto& it : *mCurrentSlicedCounter) {
- fprintf(out, "\t(what)%s\t(condition)%s %lld\n",
- it.first.getDimensionKeyInWhat().toString().c_str(),
- it.first.getDimensionKeyInCondition().toString().c_str(),
- (unsigned long long)it.second);
+ fprintf(out, "\t(what)%s\t(state)%s %lld\n",
+ it.first.getDimensionKeyInWhat().toString().c_str(),
+ it.first.getStateValuesKey().toString().c_str(), (unsigned long long)it.second);
}
}
}
@@ -196,22 +200,16 @@
FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
protoOutput->end(dimensionToken);
-
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(),
- str_set, protoOutput);
- protoOutput->end(dimensionInConditionToken);
- }
} else {
writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
- FIELD_ID_DIMENSION_LEAF_IN_CONDITION,
- str_set, protoOutput);
- }
+ }
+ // Then fill slice_by_state.
+ for (auto state : dimensionKey.getStateValuesKey().getValues()) {
+ uint64_t stateToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED |
+ FIELD_ID_SLICE_BY_STATE);
+ writeStateToProto(state, protoOutput);
+ protoOutput->end(stateToken);
}
// Then fill bucket_info (CountBucketInfo).
for (const auto& bucket : counter.second) {
@@ -282,7 +280,7 @@
int64_t eventTimeNs = event.GetElapsedTimestampNs();
flushIfNeededLocked(eventTimeNs);
- if (condition == false) {
+ if (!condition) {
return;
}
diff --git a/cmds/statsd/src/metrics/CountMetricProducer.h b/cmds/statsd/src/metrics/CountMetricProducer.h
index 61e0892..8b17d88 100644
--- a/cmds/statsd/src/metrics/CountMetricProducer.h
+++ b/cmds/statsd/src/metrics/CountMetricProducer.h
@@ -52,7 +52,7 @@
virtual ~CountMetricProducer();
- void onStateChanged(int atomId, const HashableDimensionKey& primaryKey, int oldState,
+ void onStateChanged(int32_t atomId, const HashableDimensionKey& primaryKey, int oldState,
int newState) override;
protected:
diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
index ab2a1c3..fee5e6e 100644
--- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
@@ -53,10 +53,8 @@
const int FIELD_ID_DATA = 1;
// for DurationMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
-const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
const int FIELD_ID_BUCKET_INFO = 3;
const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
-const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for DurationBucketInfo
const int FIELD_ID_DURATION = 3;
const int FIELD_ID_BUCKET_NUM = 4;
@@ -120,9 +118,8 @@
mUseWhatDimensionAsInternalDimension = equalDimensions(mDimensionsInWhat, mInternalDimensions);
if (mWizard != nullptr && mConditionTrackerIndex >= 0 &&
mMetric2ConditionLinks.size() == 1) {
- mHasLinksToAllConditionDimensionsInTracker =
- mWizard->equalOutputDimensions(mConditionTrackerIndex,
- mMetric2ConditionLinks.begin()->conditionFields);
+ mHasLinksToAllConditionDimensionsInTracker = mWizard->equalOutputDimensions(
+ mConditionTrackerIndex, mMetric2ConditionLinks.begin()->conditionFields);
}
flushIfNeededLocked(startTimeNs);
// Adjust start for partial bucket
@@ -206,8 +203,7 @@
mWizard->getTrueSlicedDimensions(mConditionTrackerIndex, &trueConditionDimensions);
for (auto& whatIt : mCurrentSlicedDurationTrackerMap) {
HashableDimensionKey linkedConditionDimensionKey;
- getDimensionForCondition(whatIt.first.getValues(),
- mMetric2ConditionLinks[0],
+ getDimensionForCondition(whatIt.first.getValues(), mMetric2ConditionLinks[0],
&linkedConditionDimensionKey);
if (trueConditionDimensions.find(linkedConditionDimensionKey) !=
trueConditionDimensions.end()) {
@@ -222,8 +218,7 @@
if (currentUnSlicedPartCondition) {
for (auto& whatIt : mCurrentSlicedDurationTrackerMap) {
HashableDimensionKey linkedConditionDimensionKey;
- getDimensionForCondition(whatIt.first.getValues(),
- mMetric2ConditionLinks[0],
+ getDimensionForCondition(whatIt.first.getValues(), mMetric2ConditionLinks[0],
&linkedConditionDimensionKey);
if (dimensionsChangedToTrue->find(linkedConditionDimensionKey) !=
dimensionsChangedToTrue->end()) {
@@ -380,22 +375,9 @@
FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
protoOutput->end(dimensionToken);
-
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(),
- str_set, protoOutput);
- protoOutput->end(dimensionInConditionToken);
- }
} else {
writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
- FIELD_ID_DIMENSION_LEAF_IN_CONDITION,
- str_set, protoOutput);
- }
}
// Then fill bucket_info (DurationBucketInfo).
for (const auto& bucket : pair.second) {
@@ -472,7 +454,7 @@
if (verbose) {
for (const auto& whatIt : mCurrentSlicedDurationTrackerMap) {
for (const auto& slice : whatIt.second) {
- fprintf(out, "\t(what)%s\t(condition)%s\n", whatIt.first.toString().c_str(),
+ fprintf(out, "\t(what)%s\t(states)%s\n", whatIt.first.toString().c_str(),
slice.first.toString().c_str());
slice.second->dumpStates(out, verbose);
}
@@ -483,8 +465,8 @@
bool DurationMetricProducer::hitGuardRailLocked(const MetricDimensionKey& newKey) {
auto whatIt = mCurrentSlicedDurationTrackerMap.find(newKey.getDimensionKeyInWhat());
if (whatIt != mCurrentSlicedDurationTrackerMap.end()) {
- auto condIt = whatIt->second.find(newKey.getDimensionKeyInCondition());
- if (condIt != whatIt->second.end()) {
+ auto stateIt = whatIt->second.find(newKey.getStateValuesKey());
+ if (stateIt != whatIt->second.end()) {
return false;
}
if (whatIt->second.size() > StatsdStats::kDimensionKeySizeSoftLimit - 1) {
@@ -493,8 +475,8 @@
mConfigKey, mMetricId, newTupleCount);
// 2. Don't add more tuples, we are above the allowed threshold. Drop the data.
if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) {
- ALOGE("DurationMetric %lld dropping data for condition dimension key %s",
- (long long)mMetricId, newKey.getDimensionKeyInCondition().toString().c_str());
+ ALOGE("DurationMetric %lld dropping data for state values key %s",
+ (long long)mMetricId, newKey.getStateValuesKey().toString().c_str());
StatsdStats::getInstance().noteHardDimensionLimitReached(mMetricId);
return true;
}
@@ -521,24 +503,24 @@
const ConditionKey& conditionKeys,
bool condition, const LogEvent& event) {
const auto& whatKey = eventKey.getDimensionKeyInWhat();
- const auto& condKey = eventKey.getDimensionKeyInCondition();
+ const auto& stateKey = eventKey.getStateValuesKey();
auto whatIt = mCurrentSlicedDurationTrackerMap.find(whatKey);
if (whatIt == mCurrentSlicedDurationTrackerMap.end()) {
if (hitGuardRailLocked(eventKey)) {
return;
}
- mCurrentSlicedDurationTrackerMap[whatKey][condKey] = createDurationTracker(eventKey);
+ mCurrentSlicedDurationTrackerMap[whatKey][stateKey] = createDurationTracker(eventKey);
} else {
- if (whatIt->second.find(condKey) == whatIt->second.end()) {
+ if (whatIt->second.find(stateKey) == whatIt->second.end()) {
if (hitGuardRailLocked(eventKey)) {
return;
}
- mCurrentSlicedDurationTrackerMap[whatKey][condKey] = createDurationTracker(eventKey);
+ mCurrentSlicedDurationTrackerMap[whatKey][stateKey] = createDurationTracker(eventKey);
}
}
- auto it = mCurrentSlicedDurationTrackerMap.find(whatKey)->second.find(condKey);
+ auto it = mCurrentSlicedDurationTrackerMap.find(whatKey)->second.find(stateKey);
if (mUseWhatDimensionAsInternalDimension) {
it->second->noteStart(whatKey, condition,
event.GetElapsedTimestampNs(), conditionKeys);
@@ -597,8 +579,8 @@
if (mUseWhatDimensionAsInternalDimension) {
auto whatIt = mCurrentSlicedDurationTrackerMap.find(dimensionInWhat);
if (whatIt != mCurrentSlicedDurationTrackerMap.end()) {
- for (const auto& condIt : whatIt->second) {
- condIt.second->noteStop(dimensionInWhat, event.GetElapsedTimestampNs(), false);
+ for (const auto& stateIt : whatIt->second) {
+ stateIt.second->noteStop(dimensionInWhat, event.GetElapsedTimestampNs(), false);
}
}
return;
@@ -611,9 +593,9 @@
auto whatIt = mCurrentSlicedDurationTrackerMap.find(dimensionInWhat);
if (whatIt != mCurrentSlicedDurationTrackerMap.end()) {
- for (const auto& condIt : whatIt->second) {
- condIt.second->noteStop(
- internalDimensionKey, event.GetElapsedTimestampNs(), false);
+ for (const auto& stateIt : whatIt->second) {
+ stateIt.second->noteStop(internalDimensionKey, event.GetElapsedTimestampNs(),
+ false);
}
}
return;
diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
index d0f88a8..64344e8 100644
--- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
@@ -56,10 +56,8 @@
const int FIELD_ID_SKIPPED_END_MILLIS = 4;
// for GaugeMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
-const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
const int FIELD_ID_BUCKET_INFO = 3;
const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
-const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for GaugeBucketInfo
const int FIELD_ID_ATOM = 3;
const int FIELD_ID_ELAPSED_ATOM_TIMESTAMP = 4;
@@ -166,10 +164,9 @@
(unsigned long)mCurrentSlicedBucket->size());
if (verbose) {
for (const auto& it : *mCurrentSlicedBucket) {
- fprintf(out, "\t(what)%s\t(condition)%s %d atoms\n",
- it.first.getDimensionKeyInWhat().toString().c_str(),
- it.first.getDimensionKeyInCondition().toString().c_str(),
- (int)it.second.size());
+ fprintf(out, "\t(what)%s\t(states)%s %d atoms\n",
+ it.first.getDimensionKeyInWhat().toString().c_str(),
+ it.first.getStateValuesKey().toString().c_str(), (int)it.second.size());
}
}
}
@@ -238,22 +235,9 @@
FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
protoOutput->end(dimensionToken);
-
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(),
- str_set, protoOutput);
- protoOutput->end(dimensionInConditionToken);
- }
} else {
writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
- FIELD_ID_DIMENSION_LEAF_IN_CONDITION,
- str_set, protoOutput);
- }
}
// Then fill bucket_info (GaugeBucketInfo).
diff --git a/cmds/statsd/src/metrics/MetricProducer.cpp b/cmds/statsd/src/metrics/MetricProducer.cpp
index 2a700ef..2c8f0e3 100644
--- a/cmds/statsd/src/metrics/MetricProducer.cpp
+++ b/cmds/statsd/src/metrics/MetricProducer.cpp
@@ -16,8 +16,11 @@
#define DEBUG false // STOPSHIP if true
#include "Log.h"
+
#include "MetricProducer.h"
+#include "state/StateTracker.h"
+
using android::util::FIELD_COUNT_REPEATED;
using android::util::FIELD_TYPE_ENUM;
using android::util::FIELD_TYPE_INT32;
@@ -92,9 +95,43 @@
condition = mCondition == ConditionState::kTrue;
}
+ // Stores atom id to primary key pairs for each state atom that the metric is
+ // sliced by.
+ std::map<int, HashableDimensionKey> statePrimaryKeys;
+
+ // For states with primary fields, use MetricStateLinks to get the primary
+ // field values from the log event. These values will form a primary key
+ // that will be used to query StateTracker for the correct state value.
+ for (const auto& stateLink : mMetric2StateLinks) {
+ getDimensionForState(event.getValues(), stateLink,
+ &statePrimaryKeys[stateLink.stateAtomId]);
+ }
+
+ // For each sliced state, query StateTracker for the state value using
+ // either the primary key from the previous step or the DEFAULT_DIMENSION_KEY.
+ //
+ // Expected functionality: for any case where the MetricStateLinks are
+ // initialized incorrectly (ex. # of state links != # of primary fields, no
+ // links are provided for a state with primary fields, links are provided
+ // in the wrong order, etc.), StateTracker will simply return kStateUnknown
+ // when queried using an incorrect key.
+ HashableDimensionKey stateValuesKey;
+ for (auto atomId : mSlicedStateAtoms) {
+ FieldValue value;
+ if (statePrimaryKeys.find(atomId) != statePrimaryKeys.end()) {
+ // found a primary key for this state, query using the key
+ getMappedStateValue(atomId, statePrimaryKeys[atomId], &value);
+ } else {
+ // if no MetricStateLinks exist for this state atom,
+ // query using the default dimension key (empty HashableDimensionKey)
+ getMappedStateValue(atomId, DEFAULT_DIMENSION_KEY, &value);
+ }
+ stateValuesKey.addValue(value);
+ }
+
HashableDimensionKey dimensionInWhat;
filterValues(mDimensionsInWhat, event.getValues(), &dimensionInWhat);
- MetricDimensionKey metricKey(dimensionInWhat, DEFAULT_DIMENSION_KEY);
+ MetricDimensionKey metricKey(dimensionInWhat, stateValuesKey);
onMatchedLogEventInternalLocked(
matcherIndex, metricKey, conditionKey, condition, event);
}
@@ -227,6 +264,31 @@
}
}
+void MetricProducer::getMappedStateValue(const int32_t atomId, const HashableDimensionKey& queryKey,
+ FieldValue* value) {
+ if (!StateManager::getInstance().getStateValue(atomId, queryKey, value)) {
+ value->mValue = Value(StateTracker::kStateUnknown);
+ ALOGW("StateTracker not found for state atom %d", atomId);
+ return;
+ }
+
+ // check if there is a state map for this atom
+ auto atomIt = mStateGroupMap.find(atomId);
+ if (atomIt == mStateGroupMap.end()) {
+ return;
+ }
+ auto valueIt = atomIt->second.find(value->mValue.int_value);
+ if (valueIt == atomIt->second.end()) {
+ // state map exists, but value was not put in a state group
+ // so set mValue to kStateUnknown
+ // TODO(tsaichristine): handle incomplete state maps
+ value->mValue.setInt(StateTracker::kStateUnknown);
+ } else {
+ // set mValue to group_id
+ value->mValue.setLong(valueIt->second);
+ }
+}
+
} // namespace statsd
} // namespace os
} // namespace android
diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h
index a72de22..d7cbcc8 100644
--- a/cmds/statsd/src/metrics/MetricProducer.h
+++ b/cmds/statsd/src/metrics/MetricProducer.h
@@ -30,6 +30,7 @@
#include "matchers/matcher_util.h"
#include "packages/PackageInfoListener.h"
#include "state/StateListener.h"
+#include "state/StateManager.h"
namespace android {
namespace os {
@@ -340,6 +341,12 @@
return (endNs - mTimeBaseNs) / mBucketSizeNs - 1;
}
+ // Query StateManager for original state value.
+ // If no state map exists for this atom, return the original value.
+ // Otherwise, return the group_id mapped to the atom and original value.
+ void getMappedStateValue(const int32_t atomId, const HashableDimensionKey& queryKey,
+ FieldValue* value);
+
const int64_t mMetricId;
const ConfigKey mConfigKey;
@@ -392,14 +399,19 @@
bool mIsActive;
// The slice_by_state atom ids defined in statsd_config.
- std::vector<int> mSlicedStateAtoms;
+ std::vector<int32_t> mSlicedStateAtoms;
// Maps atom ids and state values to group_ids (<atom_id, <value, group_id>>).
- std::unordered_map<int, std::unordered_map<int, int64_t>> mStateGroupMap;
+ std::unordered_map<int32_t, std::unordered_map<int, int64_t>> mStateGroupMap;
- FRIEND_TEST(CountMetricE2eTest, TestWithSimpleState);
- FRIEND_TEST(CountMetricE2eTest, TestWithMappedState);
- FRIEND_TEST(CountMetricE2eTest, TestWithMultipleStates);
+ // MetricStateLinks defined in statsd_config that link fields in the state
+ // atom to fields in the "what" atom.
+ std::vector<Metric2State> mMetric2StateLinks;
+
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedState);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);
+ FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithPrimaryFields);
FRIEND_TEST(DurationMetricE2eTest, TestOneBucket);
FRIEND_TEST(DurationMetricE2eTest, TestTwoBuckets);
diff --git a/cmds/statsd/src/metrics/MetricsManager.h b/cmds/statsd/src/metrics/MetricsManager.h
index d184121..286610a 100644
--- a/cmds/statsd/src/metrics/MetricsManager.h
+++ b/cmds/statsd/src/metrics/MetricsManager.h
@@ -282,9 +282,10 @@
TestActivationOnBootMultipleActivationsDifferentActivationTypes);
FRIEND_TEST(StatsLogProcessorTest, TestActivationsPersistAcrossSystemServerRestart);
- FRIEND_TEST(CountMetricE2eTest, TestWithSimpleState);
- FRIEND_TEST(CountMetricE2eTest, TestWithMappedState);
- FRIEND_TEST(CountMetricE2eTest, TestWithMultipleStates);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedState);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);
+ FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);
+ FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithPrimaryFields);
FRIEND_TEST(DurationMetricE2eTest, TestOneBucket);
FRIEND_TEST(DurationMetricE2eTest, TestTwoBuckets);
diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
index 0ee156b..eb78ebc 100644
--- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
@@ -59,10 +59,8 @@
const int FIELD_ID_SKIPPED_END_MILLIS = 4;
// for ValueMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
-const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
const int FIELD_ID_BUCKET_INFO = 3;
const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
-const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for ValueBucketInfo
const int FIELD_ID_VALUE_INDEX = 1;
const int FIELD_ID_VALUE_LONG = 2;
@@ -129,6 +127,7 @@
if (metric.has_dimensions_in_what()) {
translateFieldMatcher(metric.dimensions_in_what(), &mDimensionsInWhat);
mContainANYPositionInDimensionsInWhat = HasPositionANY(metric.dimensions_in_what());
+ mSliceByPositionALL = HasPositionALL(metric.dimensions_in_what());
}
if (metric.links().size() > 0) {
@@ -142,8 +141,6 @@
mConditionSliced = true;
}
- mSliceByPositionALL = HasPositionALL(metric.dimensions_in_what());
-
int64_t numBucketsForward = calcBucketsForwardCount(startTimeNs);
mCurrentBucketNum += numBucketsForward;
@@ -267,21 +264,9 @@
protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
protoOutput->end(dimensionToken);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken =
- protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(), str_set,
- protoOutput);
- protoOutput->end(dimensionInConditionToken);
- }
} else {
writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
- FIELD_ID_DIMENSION_LEAF_IN_CONDITION, str_set,
- protoOutput);
- }
}
// Then fill bucket_info (ValueBucketInfo).
@@ -366,7 +351,7 @@
// - ConditionTimer tracks changes based on AND of condition and active state.
void ValueMetricProducer::onActiveStateChangedLocked(const int64_t& eventTimeNs) {
bool isEventTooLate = eventTimeNs < mCurrentBucketStartTimeNs;
- if (ConditionState::kTrue == mCondition && isEventTooLate) {
+ if (isEventTooLate) {
// Drop bucket because event arrived too late, ie. we are missing data for this bucket.
invalidateCurrentBucket();
}
@@ -401,53 +386,61 @@
ConditionState newCondition = condition ? ConditionState::kTrue : ConditionState::kFalse;
bool isEventTooLate = eventTimeNs < mCurrentBucketStartTimeNs;
- if (mIsActive) {
- if (isEventTooLate) {
- VLOG("Skip event due to late arrival: %lld vs %lld", (long long)eventTimeNs,
- (long long)mCurrentBucketStartTimeNs);
- StatsdStats::getInstance().noteConditionChangeInNextBucket(mMetricId);
- invalidateCurrentBucket();
- } else {
- if (mCondition == ConditionState::kUnknown) {
- // If the condition was unknown, we mark the bucket as invalid since the bucket will
- // contain partial data. For instance, the condition change might happen close to
- // the end of the bucket and we might miss lots of data.
- //
- // We still want to pull to set the base.
- invalidateCurrentBucket();
- }
-
- // Pull on condition changes.
- bool conditionChanged =
- (mCondition == ConditionState::kTrue && newCondition == ConditionState::kFalse)
- || (mCondition == ConditionState::kFalse &&
- newCondition == ConditionState::kTrue);
- // We do not need to pull when we go from unknown to false.
- //
- // We also pull if the condition was already true in order to be able to flush the
- // bucket at the end if needed.
- //
- // onConditionChangedLocked might happen on bucket boundaries if this is called before
- // #onDataPulled.
- if (mIsPulled && (conditionChanged || condition)) {
- pullAndMatchEventsLocked(eventTimeNs, newCondition);
- }
-
- // When condition change from true to false, clear diff base but don't
- // reset other counters as we may accumulate more value in the bucket.
- if (mUseDiff && mCondition == ConditionState::kTrue
- && newCondition == ConditionState::kFalse) {
- resetBase();
- }
- }
+ // If the config is not active, skip the event.
+ if (!mIsActive) {
+ mCondition = isEventTooLate ? ConditionState::kUnknown : newCondition;
+ return;
}
- mCondition = isEventTooLate ? initialCondition(mConditionTrackerIndex) : newCondition;
-
- if (mIsActive) {
- flushIfNeededLocked(eventTimeNs);
+ // If the event arrived late, mark the bucket as invalid and skip the event.
+ if (isEventTooLate) {
+ VLOG("Skip event due to late arrival: %lld vs %lld", (long long)eventTimeNs,
+ (long long)mCurrentBucketStartTimeNs);
+ StatsdStats::getInstance().noteConditionChangeInNextBucket(mMetricId);
+ invalidateCurrentBucket();
+ mCondition = ConditionState::kUnknown;
mConditionTimer.onConditionChanged(mCondition, eventTimeNs);
+ return;
}
+
+ // If the previous condition was unknown, mark the bucket as invalid
+ // because the bucket will contain partial data. For example, the condition
+ // change might happen close to the end of the bucket and we might miss a
+ // lot of data.
+ //
+ // We still want to pull to set the base.
+ if (mCondition == ConditionState::kUnknown) {
+ invalidateCurrentBucket();
+ }
+
+ // Pull and match for the following condition change cases:
+ // unknown/false -> true - condition changed
+ // true -> false - condition changed
+ // true -> true - old condition was true so we can flush the bucket at the
+ // end if needed.
+ //
+ // We don’t need to pull for unknown -> false or false -> false.
+ //
+ // onConditionChangedLocked might happen on bucket boundaries if this is
+ // called before #onDataPulled.
+ if (mIsPulled &&
+ (newCondition == ConditionState::kTrue || mCondition == ConditionState::kTrue)) {
+ pullAndMatchEventsLocked(eventTimeNs, newCondition);
+ }
+
+ // For metrics that use diff, when condition changes from true to false,
+ // clear diff base but don't reset other counts because we may accumulate
+ // more value in the bucket.
+ if (mUseDiff &&
+ (mCondition == ConditionState::kTrue && newCondition == ConditionState::kFalse)) {
+ resetBase();
+ }
+
+ // Update condition state after pulling.
+ mCondition = newCondition;
+
+ flushIfNeededLocked(eventTimeNs);
+ mConditionTimer.onConditionChanged(mCondition, eventTimeNs);
}
void ValueMetricProducer::pullAndMatchEventsLocked(const int64_t timestampNs,
@@ -472,33 +465,33 @@
void ValueMetricProducer::onDataPulled(const std::vector<std::shared_ptr<LogEvent>>& allData,
bool pullSuccess, int64_t originalPullTimeNs) {
std::lock_guard<std::mutex> lock(mMutex);
- if (mCondition == ConditionState::kTrue) {
- // If the pull failed, we won't be able to compute a diff.
- if (!pullSuccess) {
- invalidateCurrentBucket();
+ if (mCondition == ConditionState::kTrue) {
+ // If the pull failed, we won't be able to compute a diff.
+ if (!pullSuccess) {
+ invalidateCurrentBucket();
+ } else {
+ bool isEventLate = originalPullTimeNs < getCurrentBucketEndTimeNs();
+ if (isEventLate) {
+ // If the event is late, we are in the middle of a bucket. Just
+ // process the data without trying to snap the data to the nearest bucket.
+ accumulateEvents(allData, originalPullTimeNs, originalPullTimeNs, mCondition);
} else {
- bool isEventLate = originalPullTimeNs < getCurrentBucketEndTimeNs();
- if (isEventLate) {
- // If the event is late, we are in the middle of a bucket. Just
- // process the data without trying to snap the data to the nearest bucket.
- accumulateEvents(allData, originalPullTimeNs, originalPullTimeNs, mCondition);
- } else {
- // For scheduled pulled data, the effective event time is snap to the nearest
- // bucket end. In the case of waking up from a deep sleep state, we will
- // attribute to the previous bucket end. If the sleep was long but not very
- // long, we will be in the immediate next bucket. Previous bucket may get a
- // larger number as we pull at a later time than real bucket end.
- //
- // If the sleep was very long, we skip more than one bucket before sleep. In
- // this case, if the diff base will be cleared and this new data will serve as
- // new diff base.
- int64_t bucketEndTime = calcPreviousBucketEndTime(originalPullTimeNs) - 1;
- StatsdStats::getInstance().noteBucketBoundaryDelayNs(
- mMetricId, originalPullTimeNs - bucketEndTime);
- accumulateEvents(allData, originalPullTimeNs, bucketEndTime, mCondition);
- }
+ // For scheduled pulled data, the effective event time is snap to the nearest
+ // bucket end. In the case of waking up from a deep sleep state, we will
+ // attribute to the previous bucket end. If the sleep was long but not very
+ // long, we will be in the immediate next bucket. Previous bucket may get a
+ // larger number as we pull at a later time than real bucket end.
+ //
+ // If the sleep was very long, we skip more than one bucket before sleep. In
+ // this case, if the diff base will be cleared and this new data will serve as
+ // new diff base.
+ int64_t bucketEndTime = calcPreviousBucketEndTime(originalPullTimeNs) - 1;
+ StatsdStats::getInstance().noteBucketBoundaryDelayNs(
+ mMetricId, originalPullTimeNs - bucketEndTime);
+ accumulateEvents(allData, originalPullTimeNs, bucketEndTime, mCondition);
}
}
+ }
// We can probably flush the bucket. Since we used bucketEndTime when calling
// #onMatchedLogEventInternalLocked, the current bucket will not have been flushed.
@@ -579,10 +572,10 @@
if (verbose) {
for (const auto& it : mCurrentSlicedBucket) {
for (const auto& interval : it.second) {
- fprintf(out, "\t(what)%s\t(condition)%s (value)%s\n",
- it.first.getDimensionKeyInWhat().toString().c_str(),
- it.first.getDimensionKeyInCondition().toString().c_str(),
- interval.value.toString().c_str());
+ fprintf(out, "\t(what)%s\t(states)%s (value)%s\n",
+ it.first.getDimensionKeyInWhat().toString().c_str(),
+ it.first.getStateValuesKey().toString().c_str(),
+ interval.value.toString().c_str());
}
}
}
@@ -821,7 +814,7 @@
void ValueMetricProducer::flushIfNeededLocked(const int64_t& eventTimeNs) {
int64_t currentBucketEndTimeNs = getCurrentBucketEndTimeNs();
if (eventTimeNs < currentBucketEndTimeNs) {
- VLOG("eventTime is %lld, less than next bucket start time %lld", (long long)eventTimeNs,
+ VLOG("eventTime is %lld, less than current bucket end time %lld", (long long)eventTimeNs,
(long long)(currentBucketEndTimeNs));
return;
}
diff --git a/cmds/statsd/src/metrics/metrics_manager_util.cpp b/cmds/statsd/src/metrics/metrics_manager_util.cpp
index 33e162e..6e76717 100644
--- a/cmds/statsd/src/metrics/metrics_manager_util.cpp
+++ b/cmds/statsd/src/metrics/metrics_manager_util.cpp
@@ -472,11 +472,13 @@
allStateGroupMaps, slicedStateAtoms, stateGroupMap)) {
return false;
}
+ } else {
+ if (metric.state_link_size() > 0) {
+ ALOGW("CountMetric has a MetricStateLink but doesn't have a slice_by_state");
+ return false;
+ }
}
- // TODO(tsaichristine): add check for unequal number of MetricStateLinks
- // and slice_by_states
-
unordered_map<int, shared_ptr<Activation>> eventActivationMap;
unordered_map<int, vector<shared_ptr<Activation>>> eventDeactivationMap;
bool success = handleMetricActivation(config, metric.id(), metricIndex,
diff --git a/cmds/statsd/src/state/StateListener.h b/cmds/statsd/src/state/StateListener.h
index a31690a..f2b9a6b 100644
--- a/cmds/statsd/src/state/StateListener.h
+++ b/cmds/statsd/src/state/StateListener.h
@@ -43,8 +43,8 @@
* [oldState]: Previous state value before state change
* [newState]: Current state value after state change
*/
- virtual void onStateChanged(int atomId, const HashableDimensionKey& primaryKey, int oldState,
- int newState) = 0;
+ virtual void onStateChanged(int32_t atomId, const HashableDimensionKey& primaryKey,
+ int oldState, int newState) = 0;
};
} // namespace statsd
diff --git a/cmds/statsd/src/state/StateManager.cpp b/cmds/statsd/src/state/StateManager.cpp
index 95b2c76..2fa28c9 100644
--- a/cmds/statsd/src/state/StateManager.cpp
+++ b/cmds/statsd/src/state/StateManager.cpp
@@ -35,7 +35,7 @@
}
}
-bool StateManager::registerListener(int atomId, wp<StateListener> listener) {
+bool StateManager::registerListener(int32_t atomId, wp<StateListener> listener) {
std::lock_guard<std::mutex> lock(mMutex);
// Check if state tracker already exists
@@ -53,7 +53,7 @@
return true;
}
-void StateManager::unregisterListener(int atomId, wp<StateListener> listener) {
+void StateManager::unregisterListener(int32_t atomId, wp<StateListener> listener) {
std::unique_lock<std::mutex> lock(mMutex);
// Hold the sp<> until the lock is released so that ~StateTracker() is
@@ -77,13 +77,15 @@
lock.unlock();
}
-int StateManager::getStateValue(int atomId, const HashableDimensionKey& key) {
+bool StateManager::getStateValue(int32_t atomId, const HashableDimensionKey& key,
+ FieldValue* output) const {
std::lock_guard<std::mutex> lock(mMutex);
- if (mStateTrackers.find(atomId) != mStateTrackers.end()) {
- return mStateTrackers[atomId]->getStateValue(key);
- }
- return StateTracker::kStateUnknown;
+ auto it = mStateTrackers.find(atomId);
+ if (it != mStateTrackers.end()) {
+ return it->second->getStateValue(key, output);
+ }
+ return false;
}
} // namespace statsd
diff --git a/cmds/statsd/src/state/StateManager.h b/cmds/statsd/src/state/StateManager.h
index 89ee6c0..272724c 100644
--- a/cmds/statsd/src/state/StateManager.h
+++ b/cmds/statsd/src/state/StateManager.h
@@ -42,26 +42,30 @@
// Returns true if atomId is being tracked and is associated with a state
// atom. StateManager notifies the correct StateTracker to register listener.
// If the correct StateTracker does not exist, a new StateTracker is created.
- bool registerListener(int atomId, wp<StateListener> listener);
+ bool registerListener(int32_t atomId, wp<StateListener> listener);
// Notifies the correct StateTracker to unregister a listener
// and removes the tracker if it no longer has any listeners.
- void unregisterListener(int atomId, wp<StateListener> listener);
+ void unregisterListener(int32_t atomId, wp<StateListener> listener);
- // Queries the correct StateTracker for the original/un-mapped state value
- // that is mapped to the given query key.
- // If the StateTracker doesn't exist, returns StateTracker::kStateUnknown.
- int getStateValue(int atomId, const HashableDimensionKey& queryKey);
+ // Returns true if the StateTracker exists and queries for the
+ // original state value mapped to the given query key. The state value is
+ // stored and output in a FieldValue class.
+ // Returns false if the StateTracker doesn't exist.
+ bool getStateValue(int32_t atomId, const HashableDimensionKey& queryKey,
+ FieldValue* output) const;
- inline int getStateTrackersCount() {
+ inline int getStateTrackersCount() const {
std::lock_guard<std::mutex> lock(mMutex);
return mStateTrackers.size();
}
- inline int getListenersCount(int atomId) {
+ inline int getListenersCount(int32_t atomId) const {
std::lock_guard<std::mutex> lock(mMutex);
- if (mStateTrackers.find(atomId) != mStateTrackers.end()) {
- return mStateTrackers[atomId]->getListenersCount();
+
+ auto it = mStateTrackers.find(atomId);
+ if (it != mStateTrackers.end()) {
+ return it->second->getListenersCount();
}
return -1;
}
@@ -70,7 +74,7 @@
mutable std::mutex mMutex;
// Maps state atom ids to StateTrackers
- std::unordered_map<int, sp<StateTracker>> mStateTrackers;
+ std::unordered_map<int32_t, sp<StateTracker>> mStateTrackers;
};
} // namespace statsd
diff --git a/cmds/statsd/src/state/StateTracker.cpp b/cmds/statsd/src/state/StateTracker.cpp
index 323fc0e..e6f6122 100644
--- a/cmds/statsd/src/state/StateTracker.cpp
+++ b/cmds/statsd/src/state/StateTracker.cpp
@@ -25,10 +25,8 @@
namespace os {
namespace statsd {
-StateTracker::StateTracker(const int atomId,
- const util::StateAtomFieldOptions& stateAtomInfo)
- : mAtomId(atomId),
- mStateField(getSimpleMatcher(atomId, stateAtomInfo.exclusiveField)) {
+StateTracker::StateTracker(const int32_t atomId, const util::StateAtomFieldOptions& stateAtomInfo)
+ : mAtomId(atomId), mStateField(getSimpleMatcher(atomId, stateAtomInfo.exclusiveField)) {
// create matcher for each primary field
// TODO(tsaichristine): b/142108433 handle when primary field is first uid in chain
for (const auto& primary : stateAtomInfo.primaryFields) {
@@ -55,24 +53,26 @@
}
// parse event for state value
- Value state;
- int32_t stateValue;
- if (!filterValues(mStateField, event.getValues(), &state) || state.getType() != INT) {
- ALOGE("StateTracker error extracting state from log event. Type: %d", state.getType());
+ FieldValue stateValue;
+ int32_t state;
+ if (!filterValues(mStateField, event.getValues(), &stateValue) ||
+ stateValue.mValue.getType() != INT) {
+ ALOGE("StateTracker error extracting state from log event. Type: %d",
+ stateValue.mValue.getType());
handlePartialReset(primaryKey);
return;
}
- stateValue = state.int_value;
+ state = stateValue.mValue.int_value;
- if (stateValue == mResetState) {
- VLOG("StateTracker Reset state: %s", state.toString().c_str());
+ if (state == mResetState) {
+ VLOG("StateTracker Reset state: %s", stateValue.mValue.toString().c_str());
handleReset();
}
// track and update state
int32_t oldState = 0;
int32_t newState = 0;
- updateState(primaryKey, stateValue, &oldState, &newState);
+ updateState(primaryKey, state, &oldState, &newState);
// notify all listeners if state has changed
if (oldState != newState) {
@@ -96,18 +96,27 @@
mListeners.erase(listener);
}
-int StateTracker::getStateValue(const HashableDimensionKey& queryKey) const {
+bool StateTracker::getStateValue(const HashableDimensionKey& queryKey, FieldValue* output) const {
+ output->mField = mStateField.mMatcher;
+
+ // Check that the query key has the correct number of primary fields.
if (queryKey.getValues().size() == mPrimaryFields.size()) {
auto it = mStateMap.find(queryKey);
if (it != mStateMap.end()) {
- return it->second.state;
+ output->mValue = it->second.state;
+ return true;
}
} else if (queryKey.getValues().size() > mPrimaryFields.size()) {
ALOGE("StateTracker query key size > primary key size is illegal");
} else {
ALOGE("StateTracker query key size < primary key size is not supported");
}
- return mDefaultState;
+
+ // Set the state value to unknown if:
+ // - query key size is incorrect
+ // - query key is not found in state map
+ output->mValue = StateTracker::kStateUnknown;
+ return false;
}
void StateTracker::handleReset() {
diff --git a/cmds/statsd/src/state/StateTracker.h b/cmds/statsd/src/state/StateTracker.h
index cfa9fd8..450412d 100644
--- a/cmds/statsd/src/state/StateTracker.h
+++ b/cmds/statsd/src/state/StateTracker.h
@@ -30,7 +30,7 @@
class StateTracker : public virtual RefBase {
public:
- StateTracker(const int atomId, const util::StateAtomFieldOptions& stateAtomInfo);
+ StateTracker(const int32_t atomId, const util::StateAtomFieldOptions& stateAtomInfo);
virtual ~StateTracker(){};
@@ -45,10 +45,12 @@
void unregisterListener(wp<StateListener> listener);
- // Returns the state value mapped to the given query key.
+ // The output is a FieldValue object that has mStateField as the field and
+ // the original state value (found using the given query key) as the value.
+ //
// If the key isn't mapped to a state or the key size doesn't match the
- // primary key size, the default state is returned.
- int getStateValue(const HashableDimensionKey& queryKey) const;
+ // number of primary fields, the output value is set to kStateUnknown.
+ bool getStateValue(const HashableDimensionKey& queryKey, FieldValue* output) const;
inline int getListenersCount() const {
return mListeners.size();
diff --git a/cmds/statsd/src/stats_log_util.cpp b/cmds/statsd/src/stats_log_util.cpp
index c22e3cc..76c1936 100644
--- a/cmds/statsd/src/stats_log_util.cpp
+++ b/cmds/statsd/src/stats_log_util.cpp
@@ -53,6 +53,11 @@
const int DIMENSIONS_VALUE_TUPLE_VALUE = 1;
+// for StateValue Proto
+const int STATE_VALUE_ATOM_ID = 1;
+const int STATE_VALUE_CONTENTS_GROUP_ID = 2;
+const int STATE_VALUE_CONTENTS_VALUE = 3;
+
// for PulledAtomStats proto
const int FIELD_ID_PULLED_ATOM_STATS = 10;
const int FIELD_ID_PULL_ATOM_ID = 1;
@@ -416,6 +421,23 @@
protoOutput->end(atomToken);
}
+void writeStateToProto(const FieldValue& state, util::ProtoOutputStream* protoOutput) {
+ protoOutput->write(FIELD_TYPE_INT32 | STATE_VALUE_ATOM_ID, state.mField.getTag());
+
+ switch (state.mValue.getType()) {
+ case INT:
+ protoOutput->write(FIELD_TYPE_INT32 | STATE_VALUE_CONTENTS_VALUE,
+ state.mValue.int_value);
+ break;
+ case LONG:
+ protoOutput->write(FIELD_TYPE_INT64 | STATE_VALUE_CONTENTS_GROUP_ID,
+ state.mValue.long_value);
+ break;
+ default:
+ break;
+ }
+}
+
int64_t TimeUnitToBucketSizeInMillisGuardrailed(int uid, TimeUnit unit) {
int64_t bucketSizeMillis = TimeUnitToBucketSizeInMillis(unit);
if (bucketSizeMillis > 1000 && bucketSizeMillis < 5 * 60 * 1000LL && uid != AID_SHELL &&
diff --git a/cmds/statsd/src/stats_log_util.h b/cmds/statsd/src/stats_log_util.h
index bfb84cf..0a86363 100644
--- a/cmds/statsd/src/stats_log_util.h
+++ b/cmds/statsd/src/stats_log_util.h
@@ -40,6 +40,8 @@
void writeDimensionPathToProto(const std::vector<Matcher>& fieldMatchers,
util::ProtoOutputStream* protoOutput);
+void writeStateToProto(const FieldValue& state, util::ProtoOutputStream* protoOutput);
+
// Convert the TimeUnit enum to the bucket size in millis with a guardrail on
// bucket size.
int64_t TimeUnitToBucketSizeInMillisGuardrailed(int uid, TimeUnit unit);
diff --git a/cmds/statsd/src/statsd_config.proto b/cmds/statsd/src/statsd_config.proto
index 0664867..a22805b 100644
--- a/cmds/statsd/src/statsd_config.proto
+++ b/cmds/statsd/src/statsd_config.proto
@@ -178,7 +178,7 @@
}
message MetricStateLink {
- optional int64 state = 1;
+ optional int32 state_atom_id = 1;
optional FieldMatcher fields_in_what = 2;
diff --git a/cmds/statsd/src/subscriber/IncidentdReporter.cpp b/cmds/statsd/src/subscriber/IncidentdReporter.cpp
index f2c6f1a..f1320c2 100644
--- a/cmds/statsd/src/subscriber/IncidentdReporter.cpp
+++ b/cmds/statsd/src/subscriber/IncidentdReporter.cpp
@@ -52,7 +52,6 @@
const int FIELD_ID_TRIGGER_DETAILS_TRIGGER_METRIC = 1;
const int FIELD_ID_METRIC_VALUE_METRIC_ID = 1;
const int FIELD_ID_METRIC_VALUE_DIMENSION_IN_WHAT = 2;
-const int FIELD_ID_METRIC_VALUE_DIMENSION_IN_CONDITION = 3;
const int FIELD_ID_METRIC_VALUE_VALUE = 4;
const int FIELD_ID_PACKAGE_INFO = 3;
@@ -84,10 +83,8 @@
writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), nullptr, &headerProto);
headerProto.end(dimToken);
+ // deprecated field
// optional DimensionsValue dimension_in_condition = 3;
- dimToken = headerProto.start(FIELD_TYPE_MESSAGE | FIELD_ID_METRIC_VALUE_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(), nullptr, &headerProto);
- headerProto.end(dimToken);
// optional int64 value = 4;
headerProto.write(FIELD_TYPE_INT64 | FIELD_ID_METRIC_VALUE_VALUE, (long long)metricValue);
@@ -106,13 +103,6 @@
}
}
- for (const auto& dim : dimensionKey.getDimensionKeyInCondition().getValues()) {
- int uid = getUidIfExists(dim);
- if (uid > 2000) {
- uids.insert(uid);
- }
- }
-
if (!uids.empty()) {
uint64_t token = headerProto.start(FIELD_TYPE_MESSAGE | FIELD_ID_PACKAGE_INFO);
UidMap::getInstance()->writeUidMapSnapshot(getElapsedRealtimeNs(), true, true, uids,
diff --git a/cmds/statsd/tests/e2e/CountMetric_e2e_test.cpp b/cmds/statsd/tests/e2e/CountMetric_e2e_test.cpp
index 6591d69..0f51c1b 100644
--- a/cmds/statsd/tests/e2e/CountMetric_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/CountMetric_e2e_test.cpp
@@ -18,6 +18,7 @@
#include "src/StatsLogProcessor.h"
#include "src/state/StateManager.h"
+#include "src/state/StateTracker.h"
#include "tests/statsd_test_util.h"
namespace android {
@@ -26,8 +27,20 @@
#ifdef __ANDROID__
-TEST(CountMetricE2eTest, TestWithSimpleState) {
- // Initialize config
+const int SCREEN_STATE_ATOM_ID = android::util::SCREEN_STATE_CHANGED;
+const int UID_PROCESS_STATE_ATOM_ID = android::util::UID_PROCESS_STATE_CHANGED;
+
+/**
+ * Test a count metric that has one slice_by_state with no primary fields.
+ *
+ * Once the CountMetricProducer is initialized, it has one atom id in
+ * mSlicedStateAtoms and no entries in mStateGroupMap.
+
+ * One StateTracker tracks the state atom, and it has one listener which is the
+ * CountMetricProducer that was initialized.
+ */
+TEST(CountMetricE2eTest, TestSlicedState) {
+ // Initialize config.
StatsdConfig config;
config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
@@ -37,30 +50,22 @@
auto state = CreateScreenState();
*config.add_state() = state;
- // Create count metric that slices by screen state
+ // Create count metric that slices by screen state.
int64_t metricId = 123456;
auto countMetric = config.add_count_metric();
countMetric->set_id(metricId);
countMetric->set_what(syncStartMatcher.id());
- countMetric->set_bucket(TimeUnit::ONE_MINUTE);
+ countMetric->set_bucket(TimeUnit::FIVE_MINUTES);
countMetric->add_slice_by_state(state.id());
- // Initialize StatsLogProcessor
- const int64_t baseTimeNs = 0; // 0:00
- const int64_t configAddedTimeNs = baseTimeNs + 1 * NS_PER_SEC; // 0:01
- const int64_t bucketSizeNs =
- TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000LL * 1000LL;
-
+ // Initialize StatsLogProcessor.
+ const uint64_t bucketStartTimeNs = 10000000000; // 0:10
+ const uint64_t bucketSizeNs =
+ TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000000LL;
int uid = 12345;
int64_t cfgId = 98765;
ConfigKey cfgKey(uid, cfgId);
-
- auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey);
-
- // Check that StateTrackers were properly initialized.
- EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount());
- EXPECT_EQ(1,
- StateManager::getInstance().getListenersCount(android::util::SCREEN_STATE_CHANGED));
+ auto processor = CreateStatsLogProcessor(bucketStartTimeNs, bucketStartTimeNs, config, cfgKey);
// Check that CountMetricProducer was initialized correctly.
EXPECT_EQ(processor->mMetricsManagers.size(), 1u);
@@ -69,12 +74,118 @@
EXPECT_EQ(metricsManager->mAllMetricProducers.size(), 1);
sp<MetricProducer> metricProducer = metricsManager->mAllMetricProducers[0];
EXPECT_EQ(metricProducer->mSlicedStateAtoms.size(), 1);
- EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(0), android::util::SCREEN_STATE_CHANGED);
+ EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(0), SCREEN_STATE_ATOM_ID);
EXPECT_EQ(metricProducer->mStateGroupMap.size(), 0);
+
+ // Check that StateTrackers were initialized correctly.
+ EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount());
+ EXPECT_EQ(1, StateManager::getInstance().getListenersCount(SCREEN_STATE_ATOM_ID));
+
+ /*
+ bucket #1 bucket #2
+ | 1 2 3 4 5 6 7 8 9 10 (minutes)
+ |-----------------------------|-----------------------------|--
+ x x x x x x (syncStartEvents)
+ | | (ScreenIsOnEvent)
+ | | (ScreenIsOffEvent)
+ | (ScreenUnknownEvent)
+ */
+ // Initialize log events - first bucket.
+ int appUid = 123;
+ std::vector<AttributionNodeInternal> attributions1 = {CreateAttribution(appUid, "App1")};
+ std::vector<std::unique_ptr<LogEvent>> events;
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON,
+ bucketStartTimeNs + 50 * NS_PER_SEC)); // 1:00
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 75 * NS_PER_SEC)); // 1:25
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF,
+ bucketStartTimeNs + 150 * NS_PER_SEC)); // 2:40
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF,
+ bucketStartTimeNs + 200 * NS_PER_SEC)); // 3:30
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 250 * NS_PER_SEC)); // 4:20
+
+ // Initialize log events - second bucket.
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 350 * NS_PER_SEC)); // 6:00
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 400 * NS_PER_SEC)); // 6:50
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON,
+ bucketStartTimeNs + 450 * NS_PER_SEC)); // 7:40
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 475 * NS_PER_SEC)); // 8:05
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_UNKNOWN,
+ bucketStartTimeNs + 500 * NS_PER_SEC)); // 8:30
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 520 * NS_PER_SEC)); // 8:50
+
+ // Send log events to StatsLogProcessor.
+ for (auto& event : events) {
+ processor->OnLogEvent(event.get());
+ }
+
+ // Check dump report.
+ vector<uint8_t> buffer;
+ ConfigMetricsReportList reports;
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + bucketSizeNs * 2 + 1, false, true, ADB_DUMP,
+ FAST, &buffer);
+ EXPECT_GT(buffer.size(), 0);
+ EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
+
+ EXPECT_EQ(1, reports.reports_size());
+ EXPECT_EQ(1, reports.reports(0).metrics_size());
+ EXPECT_TRUE(reports.reports(0).metrics(0).has_count_metrics());
+ EXPECT_EQ(3, reports.reports(0).metrics(0).count_metrics().data_size());
+
+ // For each CountMetricData, check StateValue info is correct and buckets
+ // have correct counts.
+ auto data = reports.reports(0).metrics(0).count_metrics().data(0);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_ON, data.slice_by_state(0).value());
+ EXPECT_EQ(2, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+ EXPECT_EQ(1, data.bucket_info(1).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(1);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_UNKNOWN, data.slice_by_state(0).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(2);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_OFF, data.slice_by_state(0).value());
+ EXPECT_EQ(2, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+ EXPECT_EQ(2, data.bucket_info(1).count());
}
-TEST(CountMetricE2eTest, TestWithMappedState) {
- // Initialize config
+/**
+ * Test a count metric that has one slice_by_state with a mapping and no
+ * primary fields.
+ *
+ * Once the CountMetricProducer is initialized, it has one atom id in
+ * mSlicedStateAtoms and has one entry per state value in mStateGroupMap.
+ *
+ * One StateTracker tracks the state atom, and it has one listener which is the
+ * CountMetricProducer that was initialized.
+ */
+TEST(CountMetricE2eTest, TestSlicedStateWithMap) {
+ // Initialize config.
StatsdConfig config;
config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
@@ -84,30 +195,26 @@
auto state = CreateScreenStateWithOnOffMap();
*config.add_state() = state;
- // Create count metric that slices by screen state with on/off map
+ // Create count metric that slices by screen state with on/off map.
int64_t metricId = 123456;
auto countMetric = config.add_count_metric();
countMetric->set_id(metricId);
countMetric->set_what(syncStartMatcher.id());
- countMetric->set_bucket(TimeUnit::ONE_MINUTE);
+ countMetric->set_bucket(TimeUnit::FIVE_MINUTES);
countMetric->add_slice_by_state(state.id());
- // Initialize StatsLogProcessor
- const int64_t baseTimeNs = 0; // 0:00
- const int64_t configAddedTimeNs = baseTimeNs + 1 * NS_PER_SEC; // 0:01
- const int64_t bucketSizeNs =
- TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000LL * 1000LL;
-
+ // Initialize StatsLogProcessor.
+ const uint64_t bucketStartTimeNs = 10000000000; // 0:10
+ const uint64_t bucketSizeNs =
+ TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000000LL;
int uid = 12345;
int64_t cfgId = 98765;
ConfigKey cfgKey(uid, cfgId);
+ auto processor = CreateStatsLogProcessor(bucketStartTimeNs, bucketStartTimeNs, config, cfgKey);
- auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey);
-
- // Check that StateTrackers were properly initialized.
+ // Check that StateTrackers were initialized correctly.
EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount());
- EXPECT_EQ(1,
- StateManager::getInstance().getListenersCount(android::util::SCREEN_STATE_CHANGED));
+ EXPECT_EQ(1, StateManager::getInstance().getListenersCount(SCREEN_STATE_ATOM_ID));
// Check that CountMetricProducer was initialized correctly.
EXPECT_EQ(processor->mMetricsManagers.size(), 1u);
@@ -116,58 +223,371 @@
EXPECT_EQ(metricsManager->mAllMetricProducers.size(), 1);
sp<MetricProducer> metricProducer = metricsManager->mAllMetricProducers[0];
EXPECT_EQ(metricProducer->mSlicedStateAtoms.size(), 1);
- EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(0), android::util::SCREEN_STATE_CHANGED);
+ EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(0), SCREEN_STATE_ATOM_ID);
EXPECT_EQ(metricProducer->mStateGroupMap.size(), 1);
StateMap map = state.map();
for (auto group : map.group()) {
for (auto value : group.value()) {
- EXPECT_EQ(metricProducer->mStateGroupMap[android::util::SCREEN_STATE_CHANGED][value],
+ EXPECT_EQ(metricProducer->mStateGroupMap[SCREEN_STATE_ATOM_ID][value],
group.group_id());
}
}
+
+ /*
+ bucket #1 bucket #2
+ | 1 2 3 4 5 6 7 8 9 10 (minutes)
+ |-----------------------------|-----------------------------|--
+ x x x x x x x x x (syncStartEvents)
+ -----------------------------------------------------------SCREEN_OFF events
+ | (ScreenStateUnknownEvent = 0)
+ | | (ScreenStateOffEvent = 1)
+ | (ScreenStateDozeEvent = 3)
+ | (ScreenStateDozeSuspendEvent = 4)
+ -----------------------------------------------------------SCREEN_ON events
+ | | (ScreenStateOnEvent = 2)
+ | (ScreenStateVrEvent = 5)
+ | (ScreenStateOnSuspendEvent = 6)
+ */
+ // Initialize log events - first bucket.
+ int appUid = 123;
+ std::vector<AttributionNodeInternal> attributions1 = {CreateAttribution(appUid, "App1")};
+
+ std::vector<std::unique_ptr<LogEvent>> events;
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 20 * NS_PER_SEC)); // 0:30
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_UNKNOWN,
+ bucketStartTimeNs + 30 * NS_PER_SEC)); // 0:40
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 60 * NS_PER_SEC)); // 1:10
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF,
+ bucketStartTimeNs + 90 * NS_PER_SEC)); // 1:40
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 120 * NS_PER_SEC)); // 2:10
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON,
+ bucketStartTimeNs + 150 * NS_PER_SEC)); // 2:40
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_VR,
+ bucketStartTimeNs + 180 * NS_PER_SEC)); // 3:10
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 200 * NS_PER_SEC)); // 3:30
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_DOZE,
+ bucketStartTimeNs + 210 * NS_PER_SEC)); // 3:40
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 250 * NS_PER_SEC)); // 4:20
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF,
+ bucketStartTimeNs + 280 * NS_PER_SEC)); // 4:50
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 285 * NS_PER_SEC)); // 4:55
+
+ // Initialize log events - second bucket.
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 360 * NS_PER_SEC)); // 6:10
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON_SUSPEND,
+ bucketStartTimeNs + 390 * NS_PER_SEC)); // 6:40
+ events.push_back(CreateScreenStateChangedEvent(
+ android::view::DisplayStateEnum::DISPLAY_STATE_DOZE_SUSPEND,
+ bucketStartTimeNs + 430 * NS_PER_SEC)); // 7:20
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 440 * NS_PER_SEC)); // 7:30
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON,
+ bucketStartTimeNs + 540 * NS_PER_SEC)); // 9:10
+ events.push_back(CreateSyncStartEvent(attributions1, "sync_name",
+ bucketStartTimeNs + 570 * NS_PER_SEC)); // 9:40
+
+ // Send log events to StatsLogProcessor.
+ for (auto& event : events) {
+ processor->OnLogEvent(event.get());
+ }
+
+ // Check dump report.
+ vector<uint8_t> buffer;
+ ConfigMetricsReportList reports;
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + bucketSizeNs * 2 + 1, false, true, ADB_DUMP,
+ FAST, &buffer);
+ EXPECT_GT(buffer.size(), 0);
+ EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
+
+ EXPECT_EQ(1, reports.reports_size());
+ EXPECT_EQ(1, reports.reports(0).metrics_size());
+ EXPECT_TRUE(reports.reports(0).metrics(0).has_count_metrics());
+ EXPECT_EQ(3, reports.reports(0).metrics(0).count_metrics().data_size());
+
+ // For each CountMetricData, check StateValue info is correct and buckets
+ // have correct counts.
+ auto data = reports.reports(0).metrics(0).count_metrics().data(0);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(-1 /* StateTracker::kStateUnknown */, data.slice_by_state(0).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(1);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_group_id());
+ EXPECT_EQ(StringToId("SCREEN_OFF"), data.slice_by_state(0).group_id());
+ EXPECT_EQ(2, data.bucket_info_size());
+ EXPECT_EQ(4, data.bucket_info(0).count());
+ EXPECT_EQ(2, data.bucket_info(1).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(2);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_group_id());
+ EXPECT_EQ(StringToId("SCREEN_ON"), data.slice_by_state(0).group_id());
+ EXPECT_EQ(2, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+ EXPECT_EQ(1, data.bucket_info(1).count());
}
-TEST(CountMetricE2eTest, TestWithMultipleStates) {
- // Initialize config
+/**
+ * Test a count metric that has one slice_by_state with a primary field.
+
+ * Once the CountMetricProducer is initialized, it should have one
+ * MetricStateLink stored. State querying using a non-empty primary key
+ * should also work as intended.
+ */
+TEST(CountMetricE2eTest, TestSlicedStateWithPrimaryFields) {
+ // Initialize config.
StatsdConfig config;
config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
- auto syncStartMatcher = CreateSyncStartAtomMatcher();
- *config.add_atom_matcher() = syncStartMatcher;
+ auto appCrashMatcher =
+ CreateSimpleAtomMatcher("APP_CRASH_OCCURRED", android::util::APP_CRASH_OCCURRED);
+ *config.add_atom_matcher() = appCrashMatcher;
+
+ auto state = CreateUidProcessState();
+ *config.add_state() = state;
+
+ // Create count metric that slices by uid process state.
+ int64_t metricId = 123456;
+ auto countMetric = config.add_count_metric();
+ countMetric->set_id(metricId);
+ countMetric->set_what(appCrashMatcher.id());
+ countMetric->set_bucket(TimeUnit::FIVE_MINUTES);
+ countMetric->add_slice_by_state(state.id());
+ MetricStateLink* stateLink = countMetric->add_state_link();
+ stateLink->set_state_atom_id(UID_PROCESS_STATE_ATOM_ID);
+ auto fieldsInWhat = stateLink->mutable_fields_in_what();
+ *fieldsInWhat = CreateDimensions(android::util::APP_CRASH_OCCURRED, {1 /* uid */});
+ auto fieldsInState = stateLink->mutable_fields_in_state();
+ *fieldsInState = CreateDimensions(UID_PROCESS_STATE_ATOM_ID, {1 /* uid */});
+
+ // Initialize StatsLogProcessor.
+ const uint64_t bucketStartTimeNs = 10000000000; // 0:10
+ const uint64_t bucketSizeNs =
+ TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000000LL;
+ int uid = 12345;
+ int64_t cfgId = 98765;
+ ConfigKey cfgKey(uid, cfgId);
+ auto processor = CreateStatsLogProcessor(bucketStartTimeNs, bucketStartTimeNs, config, cfgKey);
+
+ // Check that StateTrackers were initialized correctly.
+ EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount());
+ EXPECT_EQ(1, StateManager::getInstance().getListenersCount(UID_PROCESS_STATE_ATOM_ID));
+
+ // Check that CountMetricProducer was initialized correctly.
+ EXPECT_EQ(processor->mMetricsManagers.size(), 1u);
+ sp<MetricsManager> metricsManager = processor->mMetricsManagers.begin()->second;
+ EXPECT_TRUE(metricsManager->isConfigValid());
+ EXPECT_EQ(metricsManager->mAllMetricProducers.size(), 1);
+ sp<MetricProducer> metricProducer = metricsManager->mAllMetricProducers[0];
+ EXPECT_EQ(metricProducer->mSlicedStateAtoms.size(), 1);
+ EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(0), UID_PROCESS_STATE_ATOM_ID);
+ EXPECT_EQ(metricProducer->mStateGroupMap.size(), 0);
+ EXPECT_EQ(metricProducer->mMetric2StateLinks.size(), 1);
+
+ /*
+ NOTE: "1" or "2" represents the uid associated with the state/app crash event
+ bucket #1 bucket #2
+ | 1 2 3 4 5 6 7 8 9 10
+ |-----------------------------|-----------------------------|--
+ 1 1 1 1 1 2 1 1 2 (AppCrashEvents)
+ -----------------------------------------------------------PROCESS STATE events
+ 1 2 (ProcessStateTopEvent = 1002)
+ 1 1 (ProcessStateForegroundServiceEvent = 1003)
+ 2 (ProcessStateImportantBackgroundEvent = 1006)
+ 1 1 1 (ProcessStateImportantForegroundEvent = 1005)
+
+ Based on the diagram above, an AppCrashEvent querying for process state value would return:
+ - StateTracker::kStateUnknown
+ - Important foreground
+ - Top
+ - Important foreground
+ - Foreground service
+ - Top (both the app crash and state still have matching uid = 2)
+
+ - Foreground service
+ - Foreground service
+ - Important background
+ */
+ // Initialize log events - first bucket.
+ std::vector<std::unique_ptr<LogEvent>> events;
+ events.push_back(
+ CreateAppCrashOccurredEvent(1 /* uid */, bucketStartTimeNs + 20 * NS_PER_SEC)); // 0:30
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND,
+ bucketStartTimeNs + 30 * NS_PER_SEC)); // 0:40
+ events.push_back(
+ CreateAppCrashOccurredEvent(1 /* uid */, bucketStartTimeNs + 60 * NS_PER_SEC)); // 1:10
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_TOP,
+ bucketStartTimeNs + 90 * NS_PER_SEC)); // 1:40
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 120 * NS_PER_SEC)); // 2:10
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND,
+ bucketStartTimeNs + 150 * NS_PER_SEC)); // 2:40
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 200 * NS_PER_SEC)); // 3:30
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_FOREGROUND_SERVICE,
+ bucketStartTimeNs + 210 * NS_PER_SEC)); // 3:40
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 250 * NS_PER_SEC)); // 4:20
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 2 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_TOP,
+ bucketStartTimeNs + 280 * NS_PER_SEC)); // 4:50
+ events.push_back(CreateAppCrashOccurredEvent(2 /* uid */,
+ bucketStartTimeNs + 285 * NS_PER_SEC)); // 4:55
+
+ // Initialize log events - second bucket.
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 360 * NS_PER_SEC)); // 6:10
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_FOREGROUND_SERVICE,
+ bucketStartTimeNs + 390 * NS_PER_SEC)); // 6:40
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 2 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_BACKGROUND,
+ bucketStartTimeNs + 430 * NS_PER_SEC)); // 7:20
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 440 * NS_PER_SEC)); // 7:30
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND,
+ bucketStartTimeNs + 540 * NS_PER_SEC)); // 9:10
+ events.push_back(CreateAppCrashOccurredEvent(2 /* uid */,
+ bucketStartTimeNs + 570 * NS_PER_SEC)); // 9:40
+
+ // Send log events to StatsLogProcessor.
+ for (auto& event : events) {
+ processor->OnLogEvent(event.get());
+ }
+
+ // Check dump report.
+ vector<uint8_t> buffer;
+ ConfigMetricsReportList reports;
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + bucketSizeNs * 2 + 1, false, true, ADB_DUMP,
+ FAST, &buffer);
+ EXPECT_GT(buffer.size(), 0);
+ EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
+
+ EXPECT_EQ(1, reports.reports_size());
+ EXPECT_EQ(1, reports.reports(0).metrics_size());
+ EXPECT_TRUE(reports.reports(0).metrics(0).has_count_metrics());
+ EXPECT_EQ(5, reports.reports(0).metrics(0).count_metrics().data_size());
+
+ // For each CountMetricData, check StateValue info is correct and buckets
+ // have correct counts.
+ auto data = reports.reports(0).metrics(0).count_metrics().data(0);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_IMPORTANT_BACKGROUND, data.slice_by_state(0).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(1);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(-1 /* StateTracker::kStateUnknown */, data.slice_by_state(0).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(2);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_IMPORTANT_FOREGROUND, data.slice_by_state(0).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(2, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(3);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_TOP, data.slice_by_state(0).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(2, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(4);
+ EXPECT_EQ(1, data.slice_by_state_size());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_FOREGROUND_SERVICE, data.slice_by_state(0).value());
+ EXPECT_EQ(2, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+ EXPECT_EQ(2, data.bucket_info(1).count());
+}
+
+TEST(CountMetricE2eTest, TestMultipleSlicedStates) {
+ // Initialize config.
+ StatsdConfig config;
+ config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
+
+ auto appCrashMatcher =
+ CreateSimpleAtomMatcher("APP_CRASH_OCCURRED", android::util::APP_CRASH_OCCURRED);
+ *config.add_atom_matcher() = appCrashMatcher;
auto state1 = CreateScreenStateWithOnOffMap();
*config.add_state() = state1;
auto state2 = CreateUidProcessState();
*config.add_state() = state2;
- // Create count metric that slices by screen state with on/off map
+ // Create count metric that slices by screen state with on/off map and
+ // slices by uid process state.
int64_t metricId = 123456;
auto countMetric = config.add_count_metric();
countMetric->set_id(metricId);
- countMetric->set_what(syncStartMatcher.id());
- countMetric->set_bucket(TimeUnit::ONE_MINUTE);
+ countMetric->set_what(appCrashMatcher.id());
+ countMetric->set_bucket(TimeUnit::FIVE_MINUTES);
countMetric->add_slice_by_state(state1.id());
countMetric->add_slice_by_state(state2.id());
+ MetricStateLink* stateLink = countMetric->add_state_link();
+ stateLink->set_state_atom_id(UID_PROCESS_STATE_ATOM_ID);
+ auto fieldsInWhat = stateLink->mutable_fields_in_what();
+ *fieldsInWhat = CreateDimensions(android::util::APP_CRASH_OCCURRED, {1 /* uid */});
+ auto fieldsInState = stateLink->mutable_fields_in_state();
+ *fieldsInState = CreateDimensions(UID_PROCESS_STATE_ATOM_ID, {1 /* uid */});
- // Initialize StatsLogProcessor
- const int64_t baseTimeNs = 0; // 0:00
- const int64_t configAddedTimeNs = baseTimeNs + 1 * NS_PER_SEC; // 0:01
- const int64_t bucketSizeNs =
- TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000LL * 1000LL;
-
+ // Initialize StatsLogProcessor.
+ const uint64_t bucketStartTimeNs = 10000000000; // 0:10
+ const uint64_t bucketSizeNs =
+ TimeUnitToBucketSizeInMillis(config.count_metric(0).bucket()) * 1000000LL;
int uid = 12345;
int64_t cfgId = 98765;
ConfigKey cfgKey(uid, cfgId);
-
- auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey);
+ auto processor = CreateStatsLogProcessor(bucketStartTimeNs, bucketStartTimeNs, config, cfgKey);
// Check that StateTrackers were properly initialized.
EXPECT_EQ(2, StateManager::getInstance().getStateTrackersCount());
- EXPECT_EQ(1,
- StateManager::getInstance().getListenersCount(android::util::SCREEN_STATE_CHANGED));
- EXPECT_EQ(1, StateManager::getInstance().getListenersCount(
- android::util::UID_PROCESS_STATE_CHANGED));
+ EXPECT_EQ(1, StateManager::getInstance().getListenersCount(SCREEN_STATE_ATOM_ID));
+ EXPECT_EQ(1, StateManager::getInstance().getListenersCount(UID_PROCESS_STATE_ATOM_ID));
// Check that CountMetricProducer was initialized correctly.
EXPECT_EQ(processor->mMetricsManagers.size(), 1u);
@@ -176,17 +596,205 @@
EXPECT_EQ(metricsManager->mAllMetricProducers.size(), 1);
sp<MetricProducer> metricProducer = metricsManager->mAllMetricProducers[0];
EXPECT_EQ(metricProducer->mSlicedStateAtoms.size(), 2);
- EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(0), android::util::SCREEN_STATE_CHANGED);
- EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(1), android::util::UID_PROCESS_STATE_CHANGED);
+ EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(0), SCREEN_STATE_ATOM_ID);
+ EXPECT_EQ(metricProducer->mSlicedStateAtoms.at(1), UID_PROCESS_STATE_ATOM_ID);
EXPECT_EQ(metricProducer->mStateGroupMap.size(), 1);
+ EXPECT_EQ(metricProducer->mMetric2StateLinks.size(), 1);
StateMap map = state1.map();
for (auto group : map.group()) {
for (auto value : group.value()) {
- EXPECT_EQ(metricProducer->mStateGroupMap[android::util::SCREEN_STATE_CHANGED][value],
+ EXPECT_EQ(metricProducer->mStateGroupMap[SCREEN_STATE_ATOM_ID][value],
group.group_id());
}
}
+
+ /*
+ bucket #1 bucket #2
+ | 1 2 3 4 5 6 7 8 9 10 (minutes)
+ |-----------------------------|-----------------------------|--
+ 1 1 1 1 1 2 1 1 2 (AppCrashEvents)
+ -----------------------------------------------------------SCREEN_OFF events
+ | (ScreenStateUnknownEvent = 0)
+ | | (ScreenStateOffEvent = 1)
+ | (ScreenStateDozeEvent = 3)
+ -----------------------------------------------------------SCREEN_ON events
+ | | (ScreenStateOnEvent = 2)
+ | (ScreenStateOnSuspendEvent = 6)
+ -----------------------------------------------------------PROCESS STATE events
+ 1 2 (ProcessStateTopEvent = 1002)
+ 1 (ProcessStateForegroundServiceEvent = 1003)
+ 2 (ProcessStateImportantBackgroundEvent = 1006)
+ 1 1 1 (ProcessStateImportantForegroundEvent = 1005)
+
+ Based on the diagram above, Screen State / Process State pairs for each
+ AppCrashEvent are:
+ - StateTracker::kStateUnknown / important foreground
+ - off / important foreground
+ - off / Top
+ - on / important foreground
+ - off / important foreground
+ - off / top
+
+ - off / important foreground
+ - off / foreground service
+ - on / important background
+
+ */
+ // Initialize log events - first bucket.
+ std::vector<std::unique_ptr<LogEvent>> events;
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND,
+ bucketStartTimeNs + 5 * NS_PER_SEC)); // 0:15
+ events.push_back(
+ CreateAppCrashOccurredEvent(1 /* uid */, bucketStartTimeNs + 20 * NS_PER_SEC)); // 0:30
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_UNKNOWN,
+ bucketStartTimeNs + 30 * NS_PER_SEC)); // 0:40
+ events.push_back(
+ CreateAppCrashOccurredEvent(1 /* uid */, bucketStartTimeNs + 60 * NS_PER_SEC)); // 1:10
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_TOP,
+ bucketStartTimeNs + 90 * NS_PER_SEC)); // 1:40
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF,
+ bucketStartTimeNs + 90 * NS_PER_SEC)); // 1:40
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 120 * NS_PER_SEC)); // 2:10
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND,
+ bucketStartTimeNs + 150 * NS_PER_SEC)); // 2:40
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON,
+ bucketStartTimeNs + 160 * NS_PER_SEC)); // 2:50
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 200 * NS_PER_SEC)); // 3:30
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_DOZE,
+ bucketStartTimeNs + 210 * NS_PER_SEC)); // 3:40
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 250 * NS_PER_SEC)); // 4:20
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 2 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_TOP,
+ bucketStartTimeNs + 280 * NS_PER_SEC)); // 4:50
+ events.push_back(CreateAppCrashOccurredEvent(2 /* uid */,
+ bucketStartTimeNs + 285 * NS_PER_SEC)); // 4:55
+
+ // Initialize log events - second bucket.
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 360 * NS_PER_SEC)); // 6:10
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_FOREGROUND_SERVICE,
+ bucketStartTimeNs + 380 * NS_PER_SEC)); // 6:30
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON_SUSPEND,
+ bucketStartTimeNs + 390 * NS_PER_SEC)); // 6:40
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 2 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_BACKGROUND,
+ bucketStartTimeNs + 420 * NS_PER_SEC)); // 7:10
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF,
+ bucketStartTimeNs + 440 * NS_PER_SEC)); // 7:30
+ events.push_back(CreateAppCrashOccurredEvent(1 /* uid */,
+ bucketStartTimeNs + 450 * NS_PER_SEC)); // 7:40
+ events.push_back(
+ CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON,
+ bucketStartTimeNs + 520 * NS_PER_SEC)); // 8:50
+ events.push_back(CreateUidProcessStateChangedEvent(
+ 1 /* uid */, android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND,
+ bucketStartTimeNs + 540 * NS_PER_SEC)); // 9:10
+ events.push_back(CreateAppCrashOccurredEvent(2 /* uid */,
+ bucketStartTimeNs + 570 * NS_PER_SEC)); // 9:40
+
+ // Send log events to StatsLogProcessor.
+ for (auto& event : events) {
+ processor->OnLogEvent(event.get());
+ }
+
+ // Check dump report.
+ vector<uint8_t> buffer;
+ ConfigMetricsReportList reports;
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + bucketSizeNs * 2 + 1, false, true, ADB_DUMP,
+ FAST, &buffer);
+ EXPECT_GT(buffer.size(), 0);
+ EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
+
+ EXPECT_EQ(1, reports.reports_size());
+ EXPECT_EQ(1, reports.reports(0).metrics_size());
+ EXPECT_TRUE(reports.reports(0).metrics(0).has_count_metrics());
+ EXPECT_EQ(6, reports.reports(0).metrics(0).count_metrics().data_size());
+
+ // For each CountMetricData, check StateValue info is correct and buckets
+ // have correct counts.
+ auto data = reports.reports(0).metrics(0).count_metrics().data(0);
+ EXPECT_EQ(2, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_group_id());
+ EXPECT_EQ(StringToId("SCREEN_OFF"), data.slice_by_state(0).group_id());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(1).atom_id());
+ EXPECT_TRUE(data.slice_by_state(1).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_FOREGROUND_SERVICE, data.slice_by_state(1).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(1);
+ EXPECT_EQ(2, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_value());
+ EXPECT_EQ(-1, data.slice_by_state(0).value());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(1).atom_id());
+ EXPECT_TRUE(data.slice_by_state(1).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_IMPORTANT_FOREGROUND, data.slice_by_state(1).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(2);
+ EXPECT_EQ(2, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_group_id());
+ EXPECT_EQ(StringToId("SCREEN_OFF"), data.slice_by_state(0).group_id());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(1).atom_id());
+ EXPECT_TRUE(data.slice_by_state(1).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_IMPORTANT_FOREGROUND, data.slice_by_state(1).value());
+ EXPECT_EQ(2, data.bucket_info_size());
+ EXPECT_EQ(2, data.bucket_info(0).count());
+ EXPECT_EQ(1, data.bucket_info(1).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(3);
+ EXPECT_EQ(2, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_group_id());
+ EXPECT_EQ(StringToId("SCREEN_ON"), data.slice_by_state(0).group_id());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(1).atom_id());
+ EXPECT_TRUE(data.slice_by_state(1).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_IMPORTANT_FOREGROUND, data.slice_by_state(1).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(4);
+ EXPECT_EQ(2, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_group_id());
+ EXPECT_EQ(StringToId("SCREEN_ON"), data.slice_by_state(0).group_id());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(1).atom_id());
+ EXPECT_TRUE(data.slice_by_state(1).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_IMPORTANT_BACKGROUND, data.slice_by_state(1).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(1, data.bucket_info(0).count());
+
+ data = reports.reports(0).metrics(0).count_metrics().data(5);
+ EXPECT_EQ(2, data.slice_by_state_size());
+ EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id());
+ EXPECT_TRUE(data.slice_by_state(0).has_group_id());
+ EXPECT_EQ(StringToId("SCREEN_OFF"), data.slice_by_state(0).group_id());
+ EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(1).atom_id());
+ EXPECT_TRUE(data.slice_by_state(1).has_value());
+ EXPECT_EQ(android::app::PROCESS_STATE_TOP, data.slice_by_state(1).value());
+ EXPECT_EQ(1, data.bucket_info_size());
+ EXPECT_EQ(2, data.bucket_info(0).count());
}
} // namespace statsd
diff --git a/cmds/statsd/tests/metrics/metrics_test_helper.cpp b/cmds/statsd/tests/metrics/metrics_test_helper.cpp
index 7b9c0d6..108df04 100644
--- a/cmds/statsd/tests/metrics/metrics_test_helper.cpp
+++ b/cmds/statsd/tests/metrics/metrics_test_helper.cpp
@@ -26,10 +26,23 @@
return dimension;
}
+HashableDimensionKey getMockedDimensionKeyLongValue(int tagId, int key, int64_t value) {
+ HashableDimensionKey dimension;
+ int pos[] = {key, 0, 0};
+ dimension.addValue(FieldValue(Field(tagId, pos, 0), Value(value)));
+
+ return dimension;
+}
+
MetricDimensionKey getMockedMetricDimensionKey(int tagId, int key, string value) {
return MetricDimensionKey(getMockedDimensionKey(tagId, key, value), DEFAULT_DIMENSION_KEY);
}
+MetricDimensionKey getMockedStateDimensionKey(int tagId, int key, int64_t value) {
+ return MetricDimensionKey(DEFAULT_DIMENSION_KEY,
+ getMockedDimensionKeyLongValue(tagId, key, value));
+}
+
void buildSimpleAtomFieldMatcher(const int tagId, FieldMatcher* matcher) {
matcher->set_field(tagId);
}
@@ -41,4 +54,4 @@
} // namespace statsd
} // namespace os
-} // namespace android
\ No newline at end of file
+} // namespace android
diff --git a/cmds/statsd/tests/metrics/metrics_test_helper.h b/cmds/statsd/tests/metrics/metrics_test_helper.h
index 329e39f..09c4d9e 100644
--- a/cmds/statsd/tests/metrics/metrics_test_helper.h
+++ b/cmds/statsd/tests/metrics/metrics_test_helper.h
@@ -47,6 +47,9 @@
HashableDimensionKey getMockedDimensionKey(int tagId, int key, std::string value);
MetricDimensionKey getMockedMetricDimensionKey(int tagId, int key, std::string value);
+HashableDimensionKey getMockedDimensionKeyLongValue(int tagId, int key, int64_t value);
+MetricDimensionKey getMockedStateDimensionKey(int tagId, int key, int64_t value);
+
// Utils to build FieldMatcher proto for simple one-depth atoms.
void buildSimpleAtomFieldMatcher(const int tagId, const int atomFieldNum, FieldMatcher* matcher);
void buildSimpleAtomFieldMatcher(const int tagId, FieldMatcher* matcher);
diff --git a/cmds/statsd/tests/state/StateTracker_test.cpp b/cmds/statsd/tests/state/StateTracker_test.cpp
index 8d38000..4208fef 100644
--- a/cmds/statsd/tests/state/StateTracker_test.cpp
+++ b/cmds/statsd/tests/state/StateTracker_test.cpp
@@ -50,6 +50,12 @@
}
};
+int getStateInt(StateManager& mgr, int atomId, const HashableDimensionKey& queryKey) {
+ FieldValue output;
+ mgr.getStateValue(atomId, queryKey, &output);
+ return output.mValue.int_value;
+}
+
// START: build event functions.
// State with no primary fields - ScreenStateChanged
std::shared_ptr<LogEvent> buildScreenEvent(int state) {
@@ -240,7 +246,7 @@
// check StateTracker was updated by querying for state
HashableDimensionKey queryKey = DEFAULT_DIMENSION_KEY;
- EXPECT_EQ(2, mgr.getStateValue(android::util::SCREEN_STATE_CHANGED, queryKey));
+ EXPECT_EQ(2, getStateInt(mgr, android::util::SCREEN_STATE_CHANGED, queryKey));
}
/**
@@ -265,7 +271,7 @@
// check StateTracker was updated by querying for state
HashableDimensionKey queryKey;
getUidProcessKey(1000 /* uid */, &queryKey);
- EXPECT_EQ(1002, mgr.getStateValue(android::util::UID_PROCESS_STATE_CHANGED, queryKey));
+ EXPECT_EQ(1002, getStateInt(mgr, android::util::UID_PROCESS_STATE_CHANGED, queryKey));
}
/**
@@ -290,7 +296,7 @@
// check StateTracker was updated by querying for state
HashableDimensionKey queryKey;
getOverlayKey(1000 /* uid */, "package1", &queryKey);
- EXPECT_EQ(1, mgr.getStateValue(android::util::OVERLAY_STATE_CHANGED, queryKey));
+ EXPECT_EQ(1, getStateInt(mgr, android::util::OVERLAY_STATE_CHANGED, queryKey));
}
/**
@@ -353,25 +359,25 @@
// Query for UidProcessState of uid 1001
HashableDimensionKey queryKey1;
getUidProcessKey(1001, &queryKey1);
- EXPECT_EQ(1003, mgr.getStateValue(android::util::UID_PROCESS_STATE_CHANGED, queryKey1));
+ EXPECT_EQ(1003, getStateInt(mgr, android::util::UID_PROCESS_STATE_CHANGED, queryKey1));
// Query for UidProcessState of uid 1004 - not in state map
HashableDimensionKey queryKey2;
getUidProcessKey(1004, &queryKey2);
- EXPECT_EQ(-1, mgr.getStateValue(android::util::UID_PROCESS_STATE_CHANGED,
- queryKey2)); // default state
+ EXPECT_EQ(-1, getStateInt(mgr, android::util::UID_PROCESS_STATE_CHANGED,
+ queryKey2)); // default state
// Query for UidProcessState of uid 1001 - after change in state
mgr.onLogEvent(*event4);
- EXPECT_EQ(1002, mgr.getStateValue(android::util::UID_PROCESS_STATE_CHANGED, queryKey1));
+ EXPECT_EQ(1002, getStateInt(mgr, android::util::UID_PROCESS_STATE_CHANGED, queryKey1));
// Query for ScreenState
- EXPECT_EQ(2, mgr.getStateValue(android::util::SCREEN_STATE_CHANGED, DEFAULT_DIMENSION_KEY));
+ EXPECT_EQ(2, getStateInt(mgr, android::util::SCREEN_STATE_CHANGED, DEFAULT_DIMENSION_KEY));
// Query for OverlayState of uid 1000, package name "package2"
HashableDimensionKey queryKey3;
getOverlayKey(1000, "package2", &queryKey3);
- EXPECT_EQ(2, mgr.getStateValue(android::util::OVERLAY_STATE_CHANGED, queryKey3));
+ EXPECT_EQ(2, getStateInt(mgr, android::util::OVERLAY_STATE_CHANGED, queryKey3));
}
} // namespace statsd
diff --git a/cmds/statsd/tests/statsd_test_util.cpp b/cmds/statsd/tests/statsd_test_util.cpp
index 38c22ab..d154b1b 100644
--- a/cmds/statsd/tests/statsd_test_util.cpp
+++ b/cmds/statsd/tests/statsd_test_util.cpp
@@ -254,28 +254,28 @@
State CreateScreenState() {
State state;
state.set_id(StringToId("ScreenState"));
- state.set_atom_id(29);
+ state.set_atom_id(android::util::SCREEN_STATE_CHANGED);
return state;
}
State CreateUidProcessState() {
State state;
state.set_id(StringToId("UidProcessState"));
- state.set_atom_id(27);
+ state.set_atom_id(android::util::UID_PROCESS_STATE_CHANGED);
return state;
}
State CreateOverlayState() {
State state;
state.set_id(StringToId("OverlayState"));
- state.set_atom_id(59);
+ state.set_atom_id(android::util::OVERLAY_STATE_CHANGED);
return state;
}
State CreateScreenStateWithOnOffMap() {
State state;
state.set_id(StringToId("ScreenStateOnOff"));
- state.set_atom_id(29);
+ state.set_atom_id(android::util::SCREEN_STATE_CHANGED);
auto map = CreateScreenStateOnOffMap();
*state.mutable_map() = map;
@@ -286,7 +286,7 @@
State CreateScreenStateWithInDozeMap() {
State state;
state.set_id(StringToId("ScreenStateInDoze"));
- state.set_atom_id(29);
+ state.set_atom_id(android::util::SCREEN_STATE_CHANGED);
auto map = CreateScreenStateInDozeMap();
*state.mutable_map() = map;
@@ -533,6 +533,15 @@
uid, ProcessLifeCycleStateChanged::CRASHED, timestampNs);
}
+std::unique_ptr<LogEvent> CreateAppCrashOccurredEvent(const int uid, uint64_t timestampNs) {
+ auto event = std::make_unique<LogEvent>(android::util::APP_CRASH_OCCURRED, timestampNs);
+ event->write(uid);
+ event->write("eventType");
+ event->write("processName");
+ event->init();
+ return event;
+}
+
std::unique_ptr<LogEvent> CreateIsolatedUidChangedEvent(
int isolatedUid, int hostUid, bool is_create, uint64_t timestampNs) {
auto logEvent = std::make_unique<LogEvent>(
@@ -544,6 +553,15 @@
return logEvent;
}
+std::unique_ptr<LogEvent> CreateUidProcessStateChangedEvent(
+ int uid, const android::app::ProcessStateEnum state, uint64_t timestampNs) {
+ auto event = std::make_unique<LogEvent>(android::util::UID_PROCESS_STATE_CHANGED, timestampNs);
+ event->write(uid);
+ event->write(state);
+ event->init();
+ return event;
+}
+
sp<StatsLogProcessor> CreateStatsLogProcessor(const int64_t timeBaseNs, const int64_t currentTimeNs,
const StatsdConfig& config, const ConfigKey& key) {
sp<UidMap> uidMap = new UidMap();
diff --git a/cmds/statsd/tests/statsd_test_util.h b/cmds/statsd/tests/statsd_test_util.h
index c026105..e1e134b 100644
--- a/cmds/statsd/tests/statsd_test_util.h
+++ b/cmds/statsd/tests/statsd_test_util.h
@@ -192,6 +192,9 @@
std::unique_ptr<LogEvent> CreateAppCrashEvent(
const int uid, uint64_t timestampNs);
+// Create log event for an app crash.
+std::unique_ptr<LogEvent> CreateAppCrashOccurredEvent(const int uid, uint64_t timestampNs);
+
// Create log event for acquiring wakelock.
std::unique_ptr<LogEvent> CreateAcquireWakelockEvent(
const std::vector<AttributionNodeInternal>& attributions, const string& wakelockName,
@@ -206,6 +209,10 @@
std::unique_ptr<LogEvent> CreateIsolatedUidChangedEvent(
int isolatedUid, int hostUid, bool is_create, uint64_t timestampNs);
+// Create log event for uid process state change.
+std::unique_ptr<LogEvent> CreateUidProcessStateChangedEvent(
+ int uid, const android::app::ProcessStateEnum state, uint64_t timestampNs);
+
// Helper function to create an AttributionNodeInternal proto.
AttributionNodeInternal CreateAttribution(const int& uid, const string& tag);
diff --git a/cmds/telecom/src/com/android/commands/telecom/Telecom.java b/cmds/telecom/src/com/android/commands/telecom/Telecom.java
index db0bca0..a4b3058 100644
--- a/cmds/telecom/src/com/android/commands/telecom/Telecom.java
+++ b/cmds/telecom/src/com/android/commands/telecom/Telecom.java
@@ -376,7 +376,7 @@
private void runGetMaxPhones() throws RemoteException {
// This assumes the max number of SIMs is 2, which it currently is
if (TelephonyManager.MULTISIM_ALLOWED
- == mTelephonyService.isMultiSimSupported("com.android.commands.telecom")) {
+ == mTelephonyService.isMultiSimSupported("com.android.commands.telecom", null)) {
System.out.println("2");
} else {
System.out.println("1");
diff --git a/core/java/Android.bp b/core/java/Android.bp
index fb27f74..9a8e130 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -7,3 +7,8 @@
name: "IDropBoxManagerService.aidl",
srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],
}
+
+filegroup {
+ name: "ICarStatsService.aidl",
+ srcs: ["com/android/internal/car/ICarStatsService.aidl"],
+}
diff --git a/core/java/android/accessibilityservice/AccessibilityGestureEvent.java b/core/java/android/accessibilityservice/AccessibilityGestureEvent.java
index b540175..8b62e2f 100644
--- a/core/java/android/accessibilityservice/AccessibilityGestureEvent.java
+++ b/core/java/android/accessibilityservice/AccessibilityGestureEvent.java
@@ -76,9 +76,9 @@
GESTURE_SWIPE_RIGHT_AND_DOWN
})
@Retention(RetentionPolicy.SOURCE)
- public @interface GestureType {}
+ public @interface GestureId {}
- @GestureType
+ @GestureId
private final int mGestureId;
private final int mDisplayId;
@@ -110,7 +110,7 @@
* @return the performed gesture id.
*
*/
- @GestureType public int getGestureId() {
+ @GestureId public int getGestureId() {
return mGestureId;
}
diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java
index ebb03e7..764e599 100644
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -296,6 +296,7 @@
/**
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static void setDurationScale(float durationScale) {
sDurationScale = durationScale;
@@ -304,6 +305,7 @@
/**
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static float getDurationScale() {
return sDurationScale;
diff --git a/core/java/android/annotation/UserHandleAware.java b/core/java/android/annotation/UserHandleAware.java
new file mode 100644
index 0000000..7d3d20b
--- /dev/null
+++ b/core/java/android/annotation/UserHandleAware.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.annotation;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates an API that uses {@code context.getUser} or {@code context.getUserId}
+ * to operate across users (as the user associated with the context)
+ * <p>
+ * To create a {@link android.content.Context} associated with a different user,
+ * use {@link android.content.Context#createContextAsUser} or
+ * {@link android.content.Context#createPackageContextAsUser}
+ * <p>
+ * Example:
+ * <pre>{@code
+ * {@literal @}UserHandleAware
+ * public abstract PackageInfo getPackageInfo({@literal @}NonNull String packageName,
+ * {@literal @}PackageInfoFlags int flags) throws NameNotFoundException;
+ * }</pre>
+ *
+ * @memberDoc This method uses {@linkplain android.content.Context#getUser}
+ * or {@linkplain android.content.Context#getUserId} to execute across users.
+ * @hide
+ */
+@Retention(SOURCE)
+@Target({TYPE, METHOD, CONSTRUCTOR, PACKAGE})
+public @interface UserHandleAware {
+}
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 6182def..f54e841 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2797,6 +2797,7 @@
* @see View#onMovedToDisplay(int, Configuration)
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public void onMovedToDisplay(int displayId, Configuration config) {
}
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 2e9b2af..590b3db 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -70,6 +70,7 @@
import android.util.DisplayMetrics;
import android.util.Singleton;
import android.util.Size;
+import android.view.IWindowContainer;
import com.android.internal.app.LocalePicker;
import com.android.internal.app.procstats.ProcessStats;
@@ -155,6 +156,12 @@
*/
public static final int INSTR_FLAG_MOUNT_EXTERNAL_STORAGE_FULL = 1 << 1;
+ /**
+ * Disable test API access for the newly started instrumentation.
+ * @hide
+ */
+ public static final int INSTR_FLAG_DISABLE_TEST_API_CHECKS = 1 << 2;
+
static final class UidObserver extends IUidObserver.Stub {
final OnUidImportanceListener mListener;
final Context mContext;
@@ -2520,6 +2527,7 @@
// Index of the stack in the display's stack list, can be used for comparison of stack order
@UnsupportedAppUsage
public int position;
+ public IWindowContainer stackToken;
/**
* The full configuration the stack is currently running in.
* @hide
@@ -2553,6 +2561,7 @@
dest.writeInt(userId);
dest.writeInt(visible ? 1 : 0);
dest.writeInt(position);
+ dest.writeStrongInterface(stackToken);
if (topActivity != null) {
dest.writeInt(1);
topActivity.writeToParcel(dest, 0);
@@ -2584,6 +2593,7 @@
userId = source.readInt();
visible = source.readInt() > 0;
position = source.readInt();
+ stackToken = IWindowContainer.Stub.asInterface(source.readStrongBinder());
if (source.readInt() > 0) {
topActivity = ComponentName.readFromParcel(source);
}
@@ -2976,6 +2986,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170;
diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index 79ab67a..91f8a3c 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -412,8 +412,8 @@
return;
}
mSurfaceView.getHolder().removeCallback(mSurfaceCallback);
- mTaskEmbedder.setListener(null);
mTaskEmbedder.release();
+ mTaskEmbedder.setListener(null);
mGuard.close();
mOpened = false;
diff --git a/core/java/android/app/AliasActivity.java b/core/java/android/app/AliasActivity.java
index 3756529..37be901 100644
--- a/core/java/android/app/AliasActivity.java
+++ b/core/java/android/app/AliasActivity.java
@@ -39,7 +39,10 @@
* To use this activity, you should include in the manifest for the associated
* component an entry named "android.app.alias". It is a reference to an XML
* resource describing an intent that launches the real application.
+ *
+ * @deprecated Use {@code <activity-alias>} or subclass Activity directly.
*/
+@Deprecated
public class AliasActivity extends Activity {
/**
* This is the name under which you should store in your component the
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 765c358..afb7871 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -581,6 +581,7 @@
@UnsupportedAppUsage
public static final int OP_NONE = -1;
/** @hide Access to coarse location information. */
+ @UnsupportedAppUsage
@TestApi
public static final int OP_COARSE_LOCATION = 0;
/** @hide Access to fine location information. */
@@ -653,6 +654,7 @@
@UnsupportedAppUsage
public static final int OP_WRITE_SETTINGS = 23;
/** @hide Required to draw on top of other apps. */
+ @UnsupportedAppUsage
@TestApi
public static final int OP_SYSTEM_ALERT_WINDOW = 24;
/** @hide */
@@ -662,6 +664,7 @@
@UnsupportedAppUsage
public static final int OP_CAMERA = 26;
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public static final int OP_RECORD_AUDIO = 27;
/** @hide */
@@ -809,6 +812,7 @@
@UnsupportedAppUsage
public static final int OP_MANAGE_IPSEC_TUNNELS = 75;
/** @hide Any app start foreground service. */
+ @UnsupportedAppUsage
@TestApi
public static final int OP_START_FOREGROUND = 76;
/** @hide */
@@ -2147,6 +2151,7 @@
* Retrieve the permission associated with an operation, or null if there is not one.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static String opToPermission(int op) {
return sOpPerms[op];
@@ -2179,6 +2184,7 @@
* to the corresponding app op.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static int permissionToOpCode(String permission) {
Integer boxedOpCode = sPermToOp.get(permission);
@@ -5281,6 +5287,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
public void setMode(int code, int uid, String packageName, @Mode int mode) {
@@ -5627,6 +5634,7 @@
/**
* {@hide}
*/
+ @UnsupportedAppUsage
@TestApi
public static int strOpToOp(@NonNull String op) {
Integer val = sOpStrToOp.get(op);
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 5661347..0113f69 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -92,7 +92,6 @@
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.DebugUtils;
-import android.util.IconDrawableFactory;
import android.util.LauncherIcons;
import android.util.Log;
import android.view.Display;
@@ -1474,11 +1473,11 @@
@Override
public Drawable getUserBadgedIcon(Drawable icon, UserHandle user) {
- if (!isManagedProfile(user.getIdentifier())) {
+ if (!hasUserBadge(user.getIdentifier())) {
return icon;
}
Drawable badge = new LauncherIcons(mContext).getBadgeDrawable(
- com.android.internal.R.drawable.ic_corp_icon_badge_case,
+ getUserManager().getUserIconBadgeResId(user.getIdentifier()),
getUserBadgeColor(user));
return getBadgedDrawable(icon, badge, null, true);
}
@@ -1493,26 +1492,21 @@
return getBadgedDrawable(drawable, badgeDrawable, badgeLocation, true);
}
- @VisibleForTesting
- public static final int[] CORP_BADGE_LABEL_RES_ID = new int[] {
- com.android.internal.R.string.managed_profile_label_badge,
- com.android.internal.R.string.managed_profile_label_badge_2,
- com.android.internal.R.string.managed_profile_label_badge_3
- };
-
+ /** Returns the color of the user's actual badge (not the badge's shadow). */
private int getUserBadgeColor(UserHandle user) {
- return IconDrawableFactory.getUserBadgeColor(getUserManager(), user.getIdentifier());
+ return getUserManager().getUserBadgeColor(user.getIdentifier());
}
@Override
public Drawable getUserBadgeForDensity(UserHandle user, int density) {
- Drawable badgeColor = getManagedProfileIconForDensity(user,
+ // This is part of the shadow, not the main color, and is not actually corp-specific.
+ Drawable badgeColor = getProfileIconForDensity(user,
com.android.internal.R.drawable.ic_corp_badge_color, density);
if (badgeColor == null) {
return null;
}
Drawable badgeForeground = getDrawableForDensity(
- com.android.internal.R.drawable.ic_corp_badge_case, density);
+ getUserManager().getUserBadgeResId(user.getIdentifier()), density);
badgeForeground.setTint(getUserBadgeColor(user));
Drawable badge = new LayerDrawable(new Drawable[] {badgeColor, badgeForeground });
return badge;
@@ -1520,8 +1514,8 @@
@Override
public Drawable getUserBadgeForDensityNoBackground(UserHandle user, int density) {
- Drawable badge = getManagedProfileIconForDensity(user,
- com.android.internal.R.drawable.ic_corp_badge_no_background, density);
+ Drawable badge = getProfileIconForDensity(user,
+ getUserManager().getUserBadgeNoBackgroundResId(user.getIdentifier()), density);
if (badge != null) {
badge.setTint(getUserBadgeColor(user));
}
@@ -1535,8 +1529,8 @@
return mContext.getResources().getDrawableForDensity(drawableId, density);
}
- private Drawable getManagedProfileIconForDensity(UserHandle user, int drawableId, int density) {
- if (isManagedProfile(user.getIdentifier())) {
+ private Drawable getProfileIconForDensity(UserHandle user, int drawableId, int density) {
+ if (hasUserBadge(user.getIdentifier())) {
return getDrawableForDensity(drawableId, density);
}
return null;
@@ -1544,12 +1538,7 @@
@Override
public CharSequence getUserBadgedLabel(CharSequence label, UserHandle user) {
- if (isManagedProfile(user.getIdentifier())) {
- int badge = getUserManager().getManagedProfileBadge(user.getIdentifier());
- int resourceId = CORP_BADGE_LABEL_RES_ID[badge % CORP_BADGE_LABEL_RES_ID.length];
- return Resources.getSystem().getString(resourceId, label);
- }
- return label;
+ return getUserManager().getBadgedLabelForUser(label, user);
}
@Override
@@ -2865,8 +2854,8 @@
return drawable;
}
- private boolean isManagedProfile(int userId) {
- return getUserManager().isManagedProfile(userId);
+ private boolean hasUserBadge(int userId) {
+ return getUserManager().hasBadge(userId);
}
/**
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 75a1546..1c8f494 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2361,6 +2361,7 @@
return (mFlags & Context.CONTEXT_IGNORE_SECURITY) != 0;
}
+ @UnsupportedAppUsage
@TestApi
@Override
public Display getDisplay() {
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index f0b3546..e858e6a 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -1215,7 +1215,8 @@
}
// Rewrite the R 'constants' for all library apks.
- SparseArray<String> packageIdentifiers = getAssets().getAssignedPackageIdentifiers();
+ SparseArray<String> packageIdentifiers = getAssets().getAssignedPackageIdentifiers(
+ false, false);
final int N = packageIdentifiers.size();
for (int i = 0; i < N; i++) {
final int id = packageIdentifiers.keyAt(i);
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 2931f33..fce7449 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3204,6 +3204,14 @@
}
/**
+ * Sets the {@link BubbleMetadata} for this notification.
+ * @hide
+ */
+ public void setBubbleMetadata(BubbleMetadata data) {
+ mBubbleMetadata = data;
+ }
+
+ /**
* Returns whether the platform is allowed (by the app developer) to generate contextual actions
* for this notification.
*/
diff --git a/core/java/android/app/StatsManager.java b/core/java/android/app/StatsManager.java
index e6682d6..92bfee2 100644
--- a/core/java/android/app/StatsManager.java
+++ b/core/java/android/app/StatsManager.java
@@ -24,12 +24,22 @@
import android.annotation.SystemApi;
import android.content.Context;
import android.os.IBinder;
+import android.os.IPullAtomCallback;
+import android.os.IPullAtomResultReceiver;
+import android.os.IStatsCompanionService;
import android.os.IStatsManager;
import android.os.IStatsPullerCallback;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.AndroidException;
import android.util.Slog;
+import android.util.StatsEvent;
+
+import com.android.internal.annotations.GuardedBy;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executor;
/**
* API for statsd clients to send configurations and retrieve data.
@@ -43,8 +53,12 @@
private final Context mContext;
+ @GuardedBy("this")
private IStatsManager mService;
+ @GuardedBy("this")
+ private IStatsCompanionService mStatsCompanion;
+
/**
* Long extra of uid that added the relevant stats config.
*/
@@ -449,7 +463,9 @@
* @throws StatsUnavailableException if unsuccessful due to failing to connect to stats service
*
* @hide
+ * @deprecated Please use registerPullAtomCallback
*/
+ @Deprecated
@RequiresPermission(allOf = { DUMP, PACKAGE_USAGE_STATS })
public void setPullerCallback(int atomTag, IStatsPullerCallback callback)
throws StatsUnavailableException {
@@ -472,6 +488,75 @@
}
}
+
+ /**
+ * Registers a callback for an atom when that atom is to be pulled. The stats service will
+ * invoke pullData in the callback when the stats service determines that this atom needs to be
+ * pulled.
+ *
+ * @param atomTag The tag of the atom for this puller callback.
+ * @param coolDownNs The minimum time between successive pulls. A cache of the previous
+ * pull will be used if the time between pulls is less than coolDownNs.
+ * @param timeoutNs The maximum time a pull should take. Statsd will wait timeoutNs for
+ * the pull to complete before timing out and marking the pull as
+ * failed.
+ * @param additiveFields Fields that are added when mapping isolated uids to host uids.
+ * @param callback The callback to be invoked when the stats service pulls the atom.
+ * @throws RemoteException if unsuccessful due to failing to connect to system server.
+ *
+ * @hide
+ */
+ public void registerPullAtomCallback(int atomTag, long coolDownNs, long timeoutNs,
+ int[] additiveFields, @NonNull StatsPullAtomCallback callback,
+ @NonNull Executor executor) throws RemoteException, SecurityException {
+ synchronized (this) {
+ IStatsCompanionService service = getIStatsCompanionServiceLocked();
+ PullAtomCallbackInternal rec =
+ new PullAtomCallbackInternal(atomTag, callback, executor);
+ service.registerPullAtomCallback(atomTag, coolDownNs, timeoutNs, additiveFields, rec);
+ }
+ }
+
+ private static class PullAtomCallbackInternal extends IPullAtomCallback.Stub {
+ public final int mAtomId;
+ public final StatsPullAtomCallback mCallback;
+ public final Executor mExecutor;
+
+ PullAtomCallbackInternal(int atomId, StatsPullAtomCallback callback, Executor executor) {
+ mAtomId = atomId;
+ mCallback = callback;
+ mExecutor = executor;
+ }
+
+ @Override
+ public void onPullAtom(int atomTag, IPullAtomResultReceiver resultReceiver) {
+ mExecutor.execute(() -> {
+ List<StatsEvent> data = new ArrayList<>();
+ boolean success = mCallback.onPullAtom(atomTag, data);
+ StatsEvent[] arr = new StatsEvent[data.size()];
+ arr = data.toArray(arr);
+ try {
+ resultReceiver.pullFinished(atomTag, success, arr);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "StatsPullResultReceiver failed for tag " + mAtomId);
+ }
+ });
+ }
+ }
+
+ /**
+ * Callback interface for pulling atoms requested by the stats service.
+ *
+ * @hide
+ */
+ public interface StatsPullAtomCallback {
+ /**
+ * Pull data for the specified atom tag, filling in the provided list of StatsEvent data.
+ * @return if the pull was successful
+ */
+ boolean onPullAtom(int atomTag, List<StatsEvent> data);
+ }
+
private class StatsdDeathRecipient implements IBinder.DeathRecipient {
@Override
public void binderDied() {
@@ -481,6 +566,7 @@
}
}
+ @GuardedBy("this")
private IStatsManager getIStatsManagerLocked() throws StatsUnavailableException {
if (mService != null) {
return mService;
@@ -497,6 +583,16 @@
return mService;
}
+ @GuardedBy("this")
+ private IStatsCompanionService getIStatsCompanionServiceLocked() {
+ if (mStatsCompanion != null) {
+ return mStatsCompanion;
+ }
+ mStatsCompanion = IStatsCompanionService.Stub.asInterface(
+ ServiceManager.getService("statscompanion"));
+ return mStatsCompanion;
+ }
+
/**
* Exception thrown when communication with the stats service fails (eg if it is not available).
* This might be thrown early during boot before the stats service has started or if it crashed.
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 1e87ab1..4fb2196 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -171,8 +171,6 @@
import android.telephony.TelephonyRegistryManager;
import android.telephony.euicc.EuiccCardManager;
import android.telephony.euicc.EuiccManager;
-import android.telephony.ims.ImsManager;
-import android.telephony.ims.RcsMessageManager;
import android.util.ArrayMap;
import android.util.Log;
import android.view.ContextThemeWrapper;
@@ -625,22 +623,6 @@
return new SubscriptionManager(ctx.getOuterContext());
}});
- registerService(Context.TELEPHONY_RCS_MESSAGE_SERVICE, RcsMessageManager.class,
- new CachedServiceFetcher<RcsMessageManager>() {
- @Override
- public RcsMessageManager createService(ContextImpl ctx) {
- return new RcsMessageManager(ctx.getOuterContext());
- }
- });
-
- registerService(Context.TELEPHONY_IMS_SERVICE, ImsManager.class,
- new CachedServiceFetcher<ImsManager>() {
- @Override
- public ImsManager createService(ContextImpl ctx) {
- return new ImsManager(ctx.getOuterContext());
- }
- });
-
registerService(Context.CARRIER_CONFIG_SERVICE, CarrierConfigManager.class,
new CachedServiceFetcher<CarrierConfigManager>() {
@Override
diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java
index f4c6b50..8cb094f 100644
--- a/core/java/android/app/WindowConfiguration.java
+++ b/core/java/android/app/WindowConfiguration.java
@@ -35,6 +35,8 @@
import android.util.proto.WireTypeMismatchException;
import android.view.DisplayInfo;
+import dalvik.annotation.compat.UnsupportedAppUsage;
+
import java.io.IOException;
/**
@@ -199,6 +201,7 @@
/** @hide */
public static final int PINNED_WINDOWING_MODE_ELEVATION_IN_DIP = 5;
+ @UnsupportedAppUsage
public WindowConfiguration() {
unset();
}
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index ad671df..9eff4b0 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3499,24 +3499,25 @@
* Returns how complex the current user's screen lock is.
*
* <p>Note that when called from a profile which uses an unified challenge with its parent, the
- * screen lock complexity of the parent will be returned. However, this API does not support
- * explicitly querying the parent profile screen lock complexity via {@link
- * #getParentProfileInstance}.
+ * screen lock complexity of the parent will be returned.
+ *
+ * <p>This method can be called on the {@link DevicePolicyManager} instance
+ * returned by {@link #getParentProfileInstance(ComponentName)} in order to retrieve
+ * restrictions on the parent profile.
*
* @throws IllegalStateException if the user is not unlocked.
- * @throws SecurityException if the calling application does not have the permission
- * {@link permission#REQUEST_PASSWORD_COMPLEXITY}
+ * @throws SecurityException if the calling application does not have the permission
+ * {@link permission#REQUEST_PASSWORD_COMPLEXITY}
*/
@PasswordComplexity
@RequiresPermission(android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY)
public int getPasswordComplexity() {
- throwIfParentInstance("getPasswordComplexity");
if (mService == null) {
return PASSWORD_COMPLEXITY_NONE;
}
try {
- return mService.getPasswordComplexity();
+ return mService.getPasswordComplexity(mParentInstance);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -9254,6 +9255,7 @@
* <li>{@link #setPasswordExpirationTimeout}</li>
* <li>{@link #getPasswordExpiration}</li>
* <li>{@link #getPasswordMaximumLength}</li>
+ * <li>{@link #getPasswordComplexity}</li>
* <li>{@link #isActivePasswordSufficient}</li>
* <li>{@link #getCurrentFailedPasswordAttempts}</li>
* <li>{@link #getMaximumFailedPasswordsForWipe}</li>
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index 6b50522..4894751 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -84,7 +84,7 @@
boolean isActivePasswordSufficient(int userHandle, boolean parent);
boolean isProfileActivePasswordSufficientForParent(int userHandle);
- int getPasswordComplexity();
+ int getPasswordComplexity(boolean parent);
boolean isUsingUnifiedPassword(in ComponentName admin);
int getCurrentFailedPasswordAttempts(int userHandle, boolean parent);
int getProfileWithMinimumFailedPasswordsForWipe(int userHandle, boolean parent);
diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java
index 8e40449..6bade90 100644
--- a/core/java/android/app/usage/NetworkStatsManager.java
+++ b/core/java/android/app/usage/NetworkStatsManager.java
@@ -146,6 +146,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public void setPollForce(boolean pollForce) {
if (pollForce) {
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index c616044..0be3eca 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -173,13 +173,10 @@
* changed.
* <p>Always contains the extra field {@link #EXTRA_DEVICE}.
* <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
- *
- * @hide
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
- @UnsupportedAppUsage
public static final String ACTION_ALIAS_CHANGED =
- "android.bluetooth.device.action.ALIAS_CHANGED";
+ "android.bluetooth.action.ALIAS_CHANGED";
/**
* Broadcast Action: Indicates a change in the bond state of a remote
@@ -1048,10 +1045,11 @@
* Get the Bluetooth alias of the remote device.
* <p>Alias is the locally modified name of a remote device.
*
- * @return the Bluetooth alias, or null if no alias or there was a problem
- * @hide
+ * @return the Bluetooth alias, the friendly device name if no alias, or
+ * null if there was a problem
*/
- @UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")
+ @Nullable
+ @RequiresPermission(Manifest.permission.BLUETOOTH)
public String getAlias() {
final IBluetooth service = sService;
if (service == null) {
@@ -1059,7 +1057,11 @@
return null;
}
try {
- return service.getRemoteAlias(this);
+ String alias = service.getRemoteAlias(this);
+ if (alias == null) {
+ return getName();
+ }
+ return alias;
} catch (RemoteException e) {
Log.e(TAG, "", e);
}
@@ -1076,8 +1078,9 @@
* @return true on success, false on error
* @hide
*/
- @UnsupportedAppUsage
- public boolean setAlias(String alias) {
+ @SystemApi
+ @RequiresPermission(Manifest.permission.BLUETOOTH)
+ public boolean setAlias(@NonNull String alias) {
final IBluetooth service = sService;
if (service == null) {
Log.e(TAG, "BT not enabled. Cannot set Remote Device name");
@@ -1092,24 +1095,6 @@
}
/**
- * Get the Bluetooth alias of the remote device.
- * If Alias is null, get the Bluetooth name instead.
- *
- * @return the Bluetooth alias, or null if no alias or there was a problem
- * @hide
- * @see #getAlias()
- * @see #getName()
- */
- @UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")
- public String getAliasName() {
- String name = getAlias();
- if (name == null) {
- name = getName();
- }
- return name;
- }
-
- /**
* Get the most recent identified battery level of this Bluetooth device
* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
*
diff --git a/core/java/android/companion/BluetoothDeviceFilterUtils.java b/core/java/android/companion/BluetoothDeviceFilterUtils.java
index 75e726b..0f67f6b 100644
--- a/core/java/android/companion/BluetoothDeviceFilterUtils.java
+++ b/core/java/android/companion/BluetoothDeviceFilterUtils.java
@@ -129,7 +129,7 @@
@UnsupportedAppUsage
public static String getDeviceDisplayNameInternal(@NonNull BluetoothDevice device) {
- return firstNotEmpty(device.getAliasName(), device.getAddress());
+ return firstNotEmpty(device.getAlias(), device.getAddress());
}
@UnsupportedAppUsage
diff --git a/core/java/android/content/ContentInterface.java b/core/java/android/content/ContentInterface.java
index 197de97..5988dd3 100644
--- a/core/java/android/content/ContentInterface.java
+++ b/core/java/android/content/ContentInterface.java
@@ -53,23 +53,22 @@
public @Nullable Uri uncanonicalize(@NonNull Uri uri) throws RemoteException;
- public boolean refresh(@NonNull Uri uri, @Nullable Bundle args,
+ public boolean refresh(@NonNull Uri uri, @Nullable Bundle extras,
@Nullable CancellationSignal cancellationSignal) throws RemoteException;
public int checkUriPermission(@NonNull Uri uri, int uid, @Intent.AccessUriMode int modeFlags)
throws RemoteException;
- public @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues initialValues)
- throws RemoteException;
+ public @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues initialValues,
+ @Nullable Bundle extras) throws RemoteException;
public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] initialValues)
throws RemoteException;
- public int delete(@NonNull Uri uri, @Nullable String selection,
- @Nullable String[] selectionArgs) throws RemoteException;
+ public int delete(@NonNull Uri uri, @Nullable Bundle extras) throws RemoteException;
- public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection,
- @Nullable String[] selectionArgs) throws RemoteException;
+ public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable Bundle extras)
+ throws RemoteException;
public @Nullable ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode,
@Nullable CancellationSignal signal) throws RemoteException, FileNotFoundException;
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 17f1a07..2240823 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -299,7 +299,7 @@
@Override
public Uri insert(String callingPkg, @Nullable String featureId, Uri uri,
- ContentValues initialValues) {
+ ContentValues initialValues, Bundle extras) {
uri = validateIncomingUri(uri);
int userId = getUserIdFromUri(uri);
uri = maybeGetUriWithoutUserId(uri);
@@ -317,7 +317,7 @@
final Pair<String, String> original = setCallingPackage(
new Pair<>(callingPkg, featureId));
try {
- return maybeAddUserId(mInterface.insert(uri, initialValues), userId);
+ return maybeAddUserId(mInterface.insert(uri, initialValues, extras), userId);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
} finally {
@@ -403,8 +403,7 @@
}
@Override
- public int delete(String callingPkg, @Nullable String featureId, Uri uri, String selection,
- String[] selectionArgs) {
+ public int delete(String callingPkg, @Nullable String featureId, Uri uri, Bundle extras) {
uri = validateIncomingUri(uri);
uri = maybeGetUriWithoutUserId(uri);
if (enforceWritePermission(callingPkg, featureId, uri, null)
@@ -415,7 +414,7 @@
final Pair<String, String> original = setCallingPackage(
new Pair<>(callingPkg, featureId));
try {
- return mInterface.delete(uri, selection, selectionArgs);
+ return mInterface.delete(uri, extras);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
} finally {
@@ -426,7 +425,7 @@
@Override
public int update(String callingPkg, @Nullable String featureId, Uri uri,
- ContentValues values, String selection, String[] selectionArgs) {
+ ContentValues values, Bundle extras) {
uri = validateIncomingUri(uri);
uri = maybeGetUriWithoutUserId(uri);
if (enforceWritePermission(callingPkg, featureId, uri, null)
@@ -437,7 +436,7 @@
final Pair<String, String> original = setCallingPackage(
new Pair<>(callingPkg, featureId));
try {
- return mInterface.update(uri, values, selection, selectionArgs);
+ return mInterface.update(uri, values, extras);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
} finally {
@@ -593,7 +592,7 @@
}
@Override
- public boolean refresh(String callingPkg, String featureId, Uri uri, Bundle args,
+ public boolean refresh(String callingPkg, String featureId, Uri uri, Bundle extras,
ICancellationSignal cancellationSignal) throws RemoteException {
uri = validateIncomingUri(uri);
uri = getUriWithoutUserId(uri);
@@ -605,7 +604,7 @@
final Pair<String, String> original = setCallingPackage(
new Pair<>(callingPkg, featureId));
try {
- return mInterface.refresh(uri, args,
+ return mInterface.refresh(uri, extras,
CancellationSignal.fromTransport(cancellationSignal));
} finally {
setCallingPackage(original);
@@ -1494,29 +1493,34 @@
}
/**
- * Implement this to support refresh of content identified by {@code uri}. By default, this
- * method returns false; providers who wish to implement this should return true to signal the
- * client that the provider has tried refreshing with its own implementation.
+ * Implement this to support refresh of content identified by {@code uri}.
+ * By default, this method returns false; providers who wish to implement
+ * this should return true to signal the client that the provider has tried
+ * refreshing with its own implementation.
* <p>
- * This allows clients to request an explicit refresh of content identified by {@code uri}.
+ * This allows clients to request an explicit refresh of content identified
+ * by {@code uri}.
* <p>
- * Client code should only invoke this method when there is a strong indication (such as a user
- * initiated pull to refresh gesture) that the content is stale.
+ * Client code should only invoke this method when there is a strong
+ * indication (such as a user initiated pull to refresh gesture) that the
+ * content is stale.
* <p>
- * Remember to send {@link ContentResolver#notifyChange(Uri, android.database.ContentObserver)}
+ * Remember to send
+ * {@link ContentResolver#notifyChange(Uri, android.database.ContentObserver)}
* notifications when content changes.
*
* @param uri The Uri identifying the data to refresh.
- * @param args Additional options from the client. The definitions of these are specific to the
- * content provider being called.
- * @param cancellationSignal A signal to cancel the operation in progress, or {@code null} if
- * none. For example, if you called refresh on a particular uri, you should call
- * {@link CancellationSignal#throwIfCanceled()} to check whether the client has
- * canceled the refresh request.
+ * @param extras Additional options from the client. The definitions of
+ * these are specific to the content provider being called.
+ * @param cancellationSignal A signal to cancel the operation in progress,
+ * or {@code null} if none. For example, if you called refresh on
+ * a particular uri, you should call
+ * {@link CancellationSignal#throwIfCanceled()} to check whether
+ * the client has canceled the refresh request.
* @return true if the provider actually tried refreshing.
*/
@Override
- public boolean refresh(Uri uri, @Nullable Bundle args,
+ public boolean refresh(Uri uri, @Nullable Bundle extras,
@Nullable CancellationSignal cancellationSignal) {
return false;
}
@@ -1545,20 +1549,42 @@
}
/**
- * Implement this to handle requests to insert a new row.
- * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyChange()}
- * after inserting.
- * This method can be called from multiple threads, as described in
- * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
+ * Implement this to handle requests to insert a new row. As a courtesy,
+ * call
+ * {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver)
+ * notifyChange()} after inserting. This method can be called from multiple
+ * threads, as described in <a href="
+ * {@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
* and Threads</a>.
+ *
* @param uri The content:// URI of the insertion request.
* @param values A set of column_name/value pairs to add to the database.
* @return The URI for the newly inserted item.
*/
- @Override
public abstract @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues values);
/**
+ * Implement this to handle requests to insert a new row. As a courtesy,
+ * call
+ * {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver)
+ * notifyChange()} after inserting. This method can be called from multiple
+ * threads, as described in <a href="
+ * {@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
+ * and Threads</a>.
+ *
+ * @param uri The content:// URI of the insertion request.
+ * @param values A set of column_name/value pairs to add to the database.
+ * @param extras A Bundle containing all additional information necessary
+ * for the insert.
+ * @return The URI for the newly inserted item.
+ */
+ @Override
+ public @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues values,
+ @Nullable Bundle extras) {
+ return insert(uri, values);
+ }
+
+ /**
* Override this to handle requests to insert a set of new rows, or the
* default implementation will iterate over the values and call
* {@link #insert} on each of them.
@@ -1583,50 +1609,111 @@
}
/**
- * Implement this to handle requests to delete one or more rows.
- * The implementation should apply the selection clause when performing
+ * Implement this to handle requests to delete one or more rows. The
+ * implementation should apply the selection clause when performing
* deletion, allowing the operation to affect multiple rows in a directory.
- * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyChange()}
- * after deleting.
- * This method can be called from multiple threads, as described in
- * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
+ * As a courtesy, call
+ * {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver)
+ * notifyChange()} after deleting. This method can be called from multiple
+ * threads, as described in <a href="
+ * {@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
* and Threads</a>.
+ * <p>
+ * The implementation is responsible for parsing out a row ID at the end of
+ * the URI, if a specific row is being deleted. That is, the client would
+ * pass in <code>content://contacts/people/22</code> and the implementation
+ * is responsible for parsing the record number (22) when creating a SQL
+ * statement.
*
- * <p>The implementation is responsible for parsing out a row ID at the end
- * of the URI, if a specific row is being deleted. That is, the client would
- * pass in <code>content://contacts/people/22</code> and the implementation is
- * responsible for parsing the record number (22) when creating a SQL statement.
- *
- * @param uri The full URI to query, including a row ID (if a specific record is requested).
+ * @param uri The full URI to query, including a row ID (if a specific
+ * record is requested).
* @param selection An optional restriction to apply to rows when deleting.
* @return The number of rows affected.
* @throws SQLException
*/
- @Override
public abstract int delete(@NonNull Uri uri, @Nullable String selection,
@Nullable String[] selectionArgs);
/**
- * Implement this to handle requests to update one or more rows.
- * The implementation should update all rows matching the selection
- * to set the columns according to the provided values map.
- * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyChange()}
- * after updating.
- * This method can be called from multiple threads, as described in
- * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
+ * Implement this to handle requests to delete one or more rows. The
+ * implementation should apply the selection clause when performing
+ * deletion, allowing the operation to affect multiple rows in a directory.
+ * As a courtesy, call
+ * {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver)
+ * notifyChange()} after deleting. This method can be called from multiple
+ * threads, as described in <a href="
+ * {@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
+ * and Threads</a>.
+ * <p>
+ * The implementation is responsible for parsing out a row ID at the end of
+ * the URI, if a specific row is being deleted. That is, the client would
+ * pass in <code>content://contacts/people/22</code> and the implementation
+ * is responsible for parsing the record number (22) when creating a SQL
+ * statement.
+ *
+ * @param uri The full URI to query, including a row ID (if a specific
+ * record is requested).
+ * @param extras A Bundle containing all additional information necessary
+ * for the delete. Values in the Bundle may include SQL style
+ * arguments.
+ * @return The number of rows affected.
+ * @throws SQLException
+ */
+ @Override
+ public int delete(@NonNull Uri uri, @Nullable Bundle extras) {
+ extras = (extras != null) ? extras : Bundle.EMPTY;
+ return delete(uri,
+ extras.getString(ContentResolver.QUERY_ARG_SQL_SELECTION),
+ extras.getStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS));
+ }
+
+ /**
+ * Implement this to handle requests to update one or more rows. The
+ * implementation should update all rows matching the selection to set the
+ * columns according to the provided values map. As a courtesy, call
+ * {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver)
+ * notifyChange()} after updating. This method can be called from multiple
+ * threads, as described in <a href="
+ * {@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
* and Threads</a>.
*
- * @param uri The URI to query. This can potentially have a record ID if this
- * is an update request for a specific record.
+ * @param uri The URI to query. This can potentially have a record ID if
+ * this is an update request for a specific record.
* @param values A set of column_name/value pairs to update in the database.
* @param selection An optional filter to match rows to update.
* @return the number of rows affected.
*/
- @Override
public abstract int update(@NonNull Uri uri, @Nullable ContentValues values,
@Nullable String selection, @Nullable String[] selectionArgs);
/**
+ * Implement this to handle requests to update one or more rows. The
+ * implementation should update all rows matching the selection to set the
+ * columns according to the provided values map. As a courtesy, call
+ * {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver)
+ * notifyChange()} after updating. This method can be called from multiple
+ * threads, as described in <a href="
+ * {@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
+ * and Threads</a>.
+ *
+ * @param uri The URI to query. This can potentially have a record ID if
+ * this is an update request for a specific record.
+ * @param values A set of column_name/value pairs to update in the database.
+ * @param extras A Bundle containing all additional information necessary
+ * for the update. Values in the Bundle may include SQL style
+ * arguments.
+ * @return the number of rows affected.
+ */
+ @Override
+ public int update(@NonNull Uri uri, @Nullable ContentValues values,
+ @Nullable Bundle extras) {
+ extras = (extras != null) ? extras : Bundle.EMPTY;
+ return update(uri, values,
+ extras.getString(ContentResolver.QUERY_ARG_SQL_SELECTION),
+ extras.getStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS));
+ }
+
+ /**
* Override this to handle requests to open a file blob.
* The default implementation always throws {@link FileNotFoundException}.
* This method can be called from multiple threads, as described in
diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index d2632e7..bb65aa0 100644
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -286,7 +286,7 @@
/** See {@link ContentProvider#refresh} */
@Override
- public boolean refresh(Uri url, @Nullable Bundle args,
+ public boolean refresh(Uri url, @Nullable Bundle extras,
@Nullable CancellationSignal cancellationSignal) throws RemoteException {
Preconditions.checkNotNull(url, "url");
@@ -298,7 +298,7 @@
remoteCancellationSignal = mContentProvider.createCancellationSignal();
cancellationSignal.setRemote(remoteCancellationSignal);
}
- return mContentProvider.refresh(mPackageName, mFeatureId, url, args,
+ return mContentProvider.refresh(mPackageName, mFeatureId, url, extras,
remoteCancellationSignal);
} catch (DeadObjectException e) {
if (!mStable) {
@@ -331,14 +331,20 @@
}
/** See {@link ContentProvider#insert ContentProvider.insert} */
- @Override
public @Nullable Uri insert(@NonNull Uri url, @Nullable ContentValues initialValues)
throws RemoteException {
+ return insert(url, initialValues, null);
+ }
+
+ /** See {@link ContentProvider#insert ContentProvider.insert} */
+ @Override
+ public @Nullable Uri insert(@NonNull Uri url, @Nullable ContentValues initialValues,
+ @Nullable Bundle extras) throws RemoteException {
Preconditions.checkNotNull(url, "url");
beforeRemote();
try {
- return mContentProvider.insert(mPackageName, mFeatureId, url, initialValues);
+ return mContentProvider.insert(mPackageName, mFeatureId, url, initialValues, extras);
} catch (DeadObjectException e) {
if (!mStable) {
mContentResolver.unstableProviderDied(mContentProvider);
@@ -370,15 +376,19 @@
}
/** See {@link ContentProvider#delete ContentProvider.delete} */
- @Override
public int delete(@NonNull Uri url, @Nullable String selection,
@Nullable String[] selectionArgs) throws RemoteException {
+ return delete(url, ContentResolver.createSqlQueryBundle(selection, selectionArgs));
+ }
+
+ /** See {@link ContentProvider#delete ContentProvider.delete} */
+ @Override
+ public int delete(@NonNull Uri url, @Nullable Bundle extras) throws RemoteException {
Preconditions.checkNotNull(url, "url");
beforeRemote();
try {
- return mContentProvider.delete(mPackageName, mFeatureId, url, selection,
- selectionArgs);
+ return mContentProvider.delete(mPackageName, mFeatureId, url, extras);
} catch (DeadObjectException e) {
if (!mStable) {
mContentResolver.unstableProviderDied(mContentProvider);
@@ -390,15 +400,20 @@
}
/** See {@link ContentProvider#update ContentProvider.update} */
- @Override
public int update(@NonNull Uri url, @Nullable ContentValues values, @Nullable String selection,
@Nullable String[] selectionArgs) throws RemoteException {
+ return update(url, values, ContentResolver.createSqlQueryBundle(selection, selectionArgs));
+ }
+
+ /** See {@link ContentProvider#update ContentProvider.update} */
+ @Override
+ public int update(@NonNull Uri url, @Nullable ContentValues values, @Nullable Bundle extras)
+ throws RemoteException {
Preconditions.checkNotNull(url, "url");
beforeRemote();
try {
- return mContentProvider.update(mPackageName, mFeatureId, url, values, selection,
- selectionArgs);
+ return mContentProvider.update(mPackageName, mFeatureId, url, values, extras);
} catch (DeadObjectException e) {
if (!mStable) {
mContentResolver.unstableProviderDied(mContentProvider);
diff --git a/core/java/android/content/ContentProviderNative.java b/core/java/android/content/ContentProviderNative.java
index f082690..dfa71f8 100644
--- a/core/java/android/content/ContentProviderNative.java
+++ b/core/java/android/content/ContentProviderNative.java
@@ -153,8 +153,9 @@
String featureId = data.readString();
Uri url = Uri.CREATOR.createFromParcel(data);
ContentValues values = ContentValues.CREATOR.createFromParcel(data);
+ Bundle extras = data.readBundle();
- Uri out = insert(callingPkg, featureId, url, values);
+ Uri out = insert(callingPkg, featureId, url, values, extras);
reply.writeNoException();
Uri.writeToParcel(reply, out);
return true;
@@ -199,10 +200,9 @@
String callingPkg = data.readString();
String featureId = data.readString();
Uri url = Uri.CREATOR.createFromParcel(data);
- String selection = data.readString();
- String[] selectionArgs = data.readStringArray();
+ Bundle extras = data.readBundle();
- int count = delete(callingPkg, featureId, url, selection, selectionArgs);
+ int count = delete(callingPkg, featureId, url, extras);
reply.writeNoException();
reply.writeInt(count);
@@ -216,11 +216,9 @@
String featureId = data.readString();
Uri url = Uri.CREATOR.createFromParcel(data);
ContentValues values = ContentValues.CREATOR.createFromParcel(data);
- String selection = data.readString();
- String[] selectionArgs = data.readStringArray();
+ Bundle extras = data.readBundle();
- int count = update(callingPkg, featureId, url, values, selection,
- selectionArgs);
+ int count = update(callingPkg, featureId, url, values, extras);
reply.writeNoException();
reply.writeInt(count);
@@ -283,10 +281,10 @@
String authority = data.readString();
String method = data.readString();
String stringArg = data.readString();
- Bundle args = data.readBundle();
+ Bundle extras = data.readBundle();
Bundle responseBundle = call(callingPkg, featureId, authority, method,
- stringArg, args);
+ stringArg, extras);
reply.writeNoException();
reply.writeBundle(responseBundle);
@@ -370,11 +368,11 @@
String callingPkg = data.readString();
String featureId = data.readString();
Uri url = Uri.CREATOR.createFromParcel(data);
- Bundle args = data.readBundle();
+ Bundle extras = data.readBundle();
ICancellationSignal signal = ICancellationSignal.Stub.asInterface(
data.readStrongBinder());
- boolean out = refresh(callingPkg, featureId, url, args, signal);
+ boolean out = refresh(callingPkg, featureId, url, extras, signal);
reply.writeNoException();
reply.writeInt(out ? 0 : -1);
return true;
@@ -498,7 +496,7 @@
@Override
public Uri insert(String callingPkg, @Nullable String featureId, Uri url,
- ContentValues values) throws RemoteException
+ ContentValues values, Bundle extras) throws RemoteException
{
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -509,6 +507,7 @@
data.writeString(featureId);
url.writeToParcel(data, 0);
values.writeToParcel(data, 0);
+ data.writeBundle(extras);
mRemote.transact(IContentProvider.INSERT_TRANSACTION, data, reply, 0);
@@ -573,8 +572,8 @@
}
@Override
- public int delete(String callingPkg, @Nullable String featureId, Uri url, String selection,
- String[] selectionArgs) throws RemoteException {
+ public int delete(String callingPkg, @Nullable String featureId, Uri url, Bundle extras)
+ throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
try {
@@ -583,8 +582,7 @@
data.writeString(callingPkg);
data.writeString(featureId);
url.writeToParcel(data, 0);
- data.writeString(selection);
- data.writeStringArray(selectionArgs);
+ data.writeBundle(extras);
mRemote.transact(IContentProvider.DELETE_TRANSACTION, data, reply, 0);
@@ -599,7 +597,7 @@
@Override
public int update(String callingPkg, @Nullable String featureId, Uri url,
- ContentValues values, String selection, String[] selectionArgs) throws RemoteException {
+ ContentValues values, Bundle extras) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
try {
@@ -609,8 +607,7 @@
data.writeString(featureId);
url.writeToParcel(data, 0);
values.writeToParcel(data, 0);
- data.writeString(selection);
- data.writeStringArray(selectionArgs);
+ data.writeBundle(extras);
mRemote.transact(IContentProvider.UPDATE_TRANSACTION, data, reply, 0);
@@ -682,7 +679,7 @@
@Override
public Bundle call(String callingPkg, @Nullable String featureId, String authority,
- String method, String request, Bundle args) throws RemoteException {
+ String method, String request, Bundle extras) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
try {
@@ -693,7 +690,7 @@
data.writeString(authority);
data.writeString(method);
data.writeString(request);
- data.writeBundle(args);
+ data.writeBundle(extras);
mRemote.transact(IContentProvider.CALL_TRANSACTION, data, reply, 0);
@@ -824,7 +821,7 @@
}
@Override
- public boolean refresh(String callingPkg, @Nullable String featureId, Uri url, Bundle args,
+ public boolean refresh(String callingPkg, @Nullable String featureId, Uri url, Bundle extras,
ICancellationSignal signal) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -834,7 +831,7 @@
data.writeString(callingPkg);
data.writeString(featureId);
url.writeToParcel(data, 0);
- data.writeBundle(args);
+ data.writeBundle(extras);
data.writeStrongBinder(signal != null ? signal.asBinder() : null);
mRemote.transact(IContentProvider.REFRESH_TRANSACTION, data, reply, 0);
diff --git a/core/java/android/content/ContentProviderOperation.java b/core/java/android/content/ContentProviderOperation.java
index 5c2de57..93f4287 100644
--- a/core/java/android/content/ContentProviderOperation.java
+++ b/core/java/android/content/ContentProviderOperation.java
@@ -357,11 +357,22 @@
ContentProviderResult[] backRefs, int numBackRefs)
throws OperationApplicationException {
final ContentValues values = resolveValueBackReferences(backRefs, numBackRefs);
- final Bundle extras = resolveExtrasBackReferences(backRefs, numBackRefs);
- final String[] selectionArgs = resolveSelectionArgsBackReferences(backRefs, numBackRefs);
+
+ // If the creator requested explicit selection or selectionArgs, it
+ // should take precedence over similar values they defined in extras
+ Bundle extras = resolveExtrasBackReferences(backRefs, numBackRefs);
+ if (mSelection != null) {
+ extras = (extras != null) ? extras : new Bundle();
+ extras.putString(ContentResolver.QUERY_ARG_SQL_SELECTION, mSelection);
+ }
+ if (mSelectionArgs != null) {
+ extras = (extras != null) ? extras : new Bundle();
+ extras.putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS,
+ resolveSelectionArgsBackReferences(backRefs, numBackRefs));
+ }
if (mType == TYPE_INSERT) {
- final Uri newUri = provider.insert(mUri, values);
+ final Uri newUri = provider.insert(mUri, values, extras);
if (newUri != null) {
return new ContentProviderResult(newUri);
} else {
@@ -375,9 +386,9 @@
final int numRows;
if (mType == TYPE_DELETE) {
- numRows = provider.delete(mUri, mSelection, selectionArgs);
+ numRows = provider.delete(mUri, extras);
} else if (mType == TYPE_UPDATE) {
- numRows = provider.update(mUri, values, mSelection, selectionArgs);
+ numRows = provider.update(mUri, values, extras);
} else if (mType == TYPE_ASSERT) {
// Assert that all rows match expected values
String[] projection = null;
@@ -389,7 +400,7 @@
}
projection = projectionList.toArray(new String[projectionList.size()]);
}
- final Cursor cursor = provider.query(mUri, projection, mSelection, selectionArgs, null);
+ final Cursor cursor = provider.query(mUri, projection, extras, null);
try {
numRows = cursor.getCount();
if (projection != null) {
@@ -1013,6 +1024,10 @@
private void assertExtrasAllowed() {
switch (mType) {
+ case TYPE_INSERT:
+ case TYPE_UPDATE:
+ case TYPE_DELETE:
+ case TYPE_ASSERT:
case TYPE_CALL:
break;
default:
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 2657cc5..d4280f8 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -65,6 +65,7 @@
import android.util.EventLog;
import android.util.Log;
import android.util.Size;
+import android.util.SparseArray;
import com.android.internal.util.MimeIconUtils;
import com.android.internal.util.Preconditions;
@@ -303,31 +304,61 @@
*/
public static final String QUERY_ARG_SQL_SORT_ORDER = "android:query-arg-sql-sort-order";
- /** {@hide} */
+ /**
+ * Key for an SQL style {@code GROUP BY} string that may be present in the
+ * query Bundle argument passed to
+ * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}.
+ *
+ * <p><b>Apps targeting {@link android.os.Build.VERSION_CODES#O} or higher are strongly
+ * encourage to use structured query arguments in lieu of opaque SQL query clauses.</b>
+ *
+ * @see #QUERY_ARG_GROUP_COLUMNS
+ */
public static final String QUERY_ARG_SQL_GROUP_BY = "android:query-arg-sql-group-by";
- /** {@hide} */
+
+ /**
+ * Key for an SQL style {@code HAVING} string that may be present in the
+ * query Bundle argument passed to
+ * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}.
+ *
+ * <p><b>Apps targeting {@link android.os.Build.VERSION_CODES#O} or higher are strongly
+ * encourage to use structured query arguments in lieu of opaque SQL query clauses.</b>
+ */
public static final String QUERY_ARG_SQL_HAVING = "android:query-arg-sql-having";
- /** {@hide} */
+
+ /**
+ * Key for an SQL style {@code LIMIT} string that may be present in the
+ * query Bundle argument passed to
+ * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}.
+ *
+ * <p><b>Apps targeting {@link android.os.Build.VERSION_CODES#O} or higher are strongly
+ * encourage to use structured query arguments in lieu of opaque SQL query clauses.</b>
+ *
+ * @see #QUERY_ARG_LIMIT
+ * @see #QUERY_ARG_OFFSET
+ */
public static final String QUERY_ARG_SQL_LIMIT = "android:query-arg-sql-limit";
/**
- * Specifies the list of columns against which to sort results. When first column values
- * are identical, records are then sorted based on second column values, and so on.
- *
- * <p>Columns present in this list must also be included in the projection
- * supplied to {@link ContentResolver#query(Uri, String[], Bundle, CancellationSignal)}.
- *
- * <p>Apps targeting {@link android.os.Build.VERSION_CODES#O} or higher:
- *
+ * Specifies the list of columns (stored as a {@code String[]}) against
+ * which to sort results. When first column values are identical, records
+ * are then sorted based on second column values, and so on.
+ * <p>
+ * Columns present in this list must also be included in the projection
+ * supplied to
+ * {@link ContentResolver#query(Uri, String[], Bundle, CancellationSignal)}.
+ * <p>
+ * Apps targeting {@link android.os.Build.VERSION_CODES#O} or higher:
* <li>{@link ContentProvider} implementations: When preparing data in
- * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}, if sort columns
- * is reflected in the returned Cursor, it is strongly recommended that
- * {@link #QUERY_ARG_SORT_COLUMNS} then be included in the array of honored arguments
- * reflected in {@link Cursor} extras {@link Bundle} under {@link #EXTRA_HONORED_ARGS}.
- *
- * <li>When querying a provider, where no QUERY_ARG_SQL* otherwise exists in the
- * arguments {@link Bundle}, the Content framework will attempt to synthesize
- * an QUERY_ARG_SQL* argument using the corresponding QUERY_ARG_SORT* values.
+ * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)},
+ * if sort columns is reflected in the returned Cursor, it is strongly
+ * recommended that {@link #QUERY_ARG_SORT_COLUMNS} then be included in the
+ * array of honored arguments reflected in {@link Cursor} extras
+ * {@link Bundle} under {@link #EXTRA_HONORED_ARGS}.
+ * <li>When querying a provider, where no QUERY_ARG_SQL* otherwise exists in
+ * the arguments {@link Bundle}, the Content framework will attempt to
+ * synthesize an QUERY_ARG_SQL* argument using the corresponding
+ * QUERY_ARG_SORT* values.
*/
public static final String QUERY_ARG_SORT_COLUMNS = "android:query-arg-sort-columns";
@@ -401,6 +432,29 @@
public static final String QUERY_ARG_SORT_LOCALE = "android:query-arg-sort-locale";
/**
+ * Specifies the list of columns (stored as a {@code String[]}) against
+ * which to group results. When column values are identical, multiple
+ * records are collapsed together into a single record.
+ * <p>
+ * Columns present in this list must also be included in the projection
+ * supplied to
+ * {@link ContentResolver#query(Uri, String[], Bundle, CancellationSignal)}.
+ * <p>
+ * Apps targeting {@link android.os.Build.VERSION_CODES#R} or higher:
+ * <li>{@link ContentProvider} implementations: When preparing data in
+ * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)},
+ * if group columns is reflected in the returned Cursor, it is strongly
+ * recommended that {@link #QUERY_ARG_SORT_COLUMNS} then be included in the
+ * array of honored arguments reflected in {@link Cursor} extras
+ * {@link Bundle} under {@link #EXTRA_HONORED_ARGS}.
+ * <li>When querying a provider, where no QUERY_ARG_SQL* otherwise exists in
+ * the arguments {@link Bundle}, the Content framework will attempt to
+ * synthesize an QUERY_ARG_SQL* argument using the corresponding
+ * QUERY_ARG_SORT* values.
+ */
+ public static final String QUERY_ARG_GROUP_COLUMNS = "android:query-arg-group-columns";
+
+ /**
* Allows provider to report back to client which query keys are honored in a Cursor.
*
* <p>Key identifying a {@code String[]} containing all QUERY_ARG_SORT* arguments
@@ -414,6 +468,7 @@
* @see #QUERY_ARG_SORT_DIRECTION
* @see #QUERY_ARG_SORT_COLLATION
* @see #QUERY_ARG_SORT_LOCALE
+ * @see #QUERY_ARG_GROUP_COLUMNS
*/
public static final String EXTRA_HONORED_ARGS = "android.content.extra.HONORED_ARGS";
@@ -1126,28 +1181,31 @@
}
/**
- * This allows clients to request an explicit refresh of content identified by {@code uri}.
+ * This allows clients to request an explicit refresh of content identified
+ * by {@code uri}.
* <p>
- * Client code should only invoke this method when there is a strong indication (such as a user
- * initiated pull to refresh gesture) that the content is stale.
+ * Client code should only invoke this method when there is a strong
+ * indication (such as a user initiated pull to refresh gesture) that the
+ * content is stale.
* <p>
*
* @param url The Uri identifying the data to refresh.
- * @param args Additional options from the client. The definitions of these are specific to the
- * content provider being called.
- * @param cancellationSignal A signal to cancel the operation in progress, or {@code null} if
- * none. For example, if you called refresh on a particular uri, you should call
- * {@link CancellationSignal#throwIfCanceled()} to check whether the client has
- * canceled the refresh request.
+ * @param extras Additional options from the client. The definitions of
+ * these are specific to the content provider being called.
+ * @param cancellationSignal A signal to cancel the operation in progress,
+ * or {@code null} if none. For example, if you called refresh on
+ * a particular uri, you should call
+ * {@link CancellationSignal#throwIfCanceled()} to check whether
+ * the client has canceled the refresh request.
* @return true if the provider actually tried refreshing.
*/
@Override
- public final boolean refresh(@NonNull Uri url, @Nullable Bundle args,
+ public final boolean refresh(@NonNull Uri url, @Nullable Bundle extras,
@Nullable CancellationSignal cancellationSignal) {
Preconditions.checkNotNull(url, "url");
try {
- if (mWrapped != null) return mWrapped.refresh(url, args, cancellationSignal);
+ if (mWrapped != null) return mWrapped.refresh(url, extras, cancellationSignal);
} catch (RemoteException e) {
return false;
}
@@ -1164,7 +1222,7 @@
remoteCancellationSignal = provider.createCancellationSignal();
cancellationSignal.setRemote(remoteCancellationSignal);
}
- return provider.refresh(mPackageName, mFeatureId, url, args,
+ return provider.refresh(mPackageName, mFeatureId, url, extras,
remoteCancellationSignal);
} catch (RemoteException e) {
// Arbitrary and not worth documenting, as Activity
@@ -1855,13 +1913,30 @@
* @return the URL of the newly created row. May return <code>null</code> if the underlying
* content provider returns <code>null</code>, or if it crashes.
*/
- @Override
public final @Nullable Uri insert(@RequiresPermission.Write @NonNull Uri url,
@Nullable ContentValues values) {
+ return insert(url, values, null);
+ }
+
+ /**
+ * Inserts a row into a table at the given URL.
+ *
+ * If the content provider supports transactions the insertion will be atomic.
+ *
+ * @param url The URL of the table to insert into.
+ * @param values The initial values for the newly inserted row. The key is the column name for
+ * the field. Passing an empty ContentValues will create an empty row.
+ * @param extras A Bundle containing all additional information necessary for the insert.
+ * @return the URL of the newly created row. May return <code>null</code> if the underlying
+ * content provider returns <code>null</code>, or if it crashes.
+ */
+ @Override
+ public final @Nullable Uri insert(@RequiresPermission.Write @NonNull Uri url,
+ @Nullable ContentValues values, @Nullable Bundle extras) {
Preconditions.checkNotNull(url, "url");
try {
- if (mWrapped != null) return mWrapped.insert(url, values);
+ if (mWrapped != null) return mWrapped.insert(url, values, extras);
} catch (RemoteException e) {
return null;
}
@@ -1872,7 +1947,7 @@
}
try {
long startTime = SystemClock.uptimeMillis();
- Uri createdRow = provider.insert(mPackageName, mFeatureId, url, values);
+ Uri createdRow = provider.insert(mPackageName, mFeatureId, url, values, extras);
long durationMillis = SystemClock.uptimeMillis() - startTime;
maybeLogUpdateToEventLog(durationMillis, url, "insert", null /* where */);
return createdRow;
@@ -1976,13 +2051,27 @@
(excluding the WHERE itself).
* @return The number of rows deleted.
*/
- @Override
public final int delete(@RequiresPermission.Write @NonNull Uri url, @Nullable String where,
@Nullable String[] selectionArgs) {
+ return delete(url, createSqlQueryBundle(where, selectionArgs));
+ }
+
+ /**
+ * Deletes row(s) specified by a content URI.
+ *
+ * If the content provider supports transactions, the deletion will be atomic.
+ *
+ * @param url The URL of the row to delete.
+ * @param extras A Bundle containing all additional information necessary for the delete.
+ * Values in the Bundle may include SQL style arguments.
+ * @return The number of rows deleted.
+ */
+ @Override
+ public final int delete(@RequiresPermission.Write @NonNull Uri url, @Nullable Bundle extras) {
Preconditions.checkNotNull(url, "url");
try {
- if (mWrapped != null) return mWrapped.delete(url, where, selectionArgs);
+ if (mWrapped != null) return mWrapped.delete(url, extras);
} catch (RemoteException e) {
return 0;
}
@@ -1993,10 +2082,9 @@
}
try {
long startTime = SystemClock.uptimeMillis();
- int rowsDeleted = provider.delete(mPackageName, mFeatureId, url, where,
- selectionArgs);
+ int rowsDeleted = provider.delete(mPackageName, mFeatureId, url, extras);
long durationMillis = SystemClock.uptimeMillis() - startTime;
- maybeLogUpdateToEventLog(durationMillis, url, "delete", where);
+ maybeLogUpdateToEventLog(durationMillis, url, "delete", null);
return rowsDeleted;
} catch (RemoteException e) {
// Arbitrary and not worth documenting, as Activity
@@ -2020,14 +2108,32 @@
* @return the number of rows updated.
* @throws NullPointerException if uri or values are null
*/
- @Override
public final int update(@RequiresPermission.Write @NonNull Uri uri,
@Nullable ContentValues values, @Nullable String where,
@Nullable String[] selectionArgs) {
+ return update(uri, values, createSqlQueryBundle(where, selectionArgs));
+ }
+
+ /**
+ * Update row(s) in a content URI.
+ *
+ * If the content provider supports transactions the update will be atomic.
+ *
+ * @param uri The URI to modify.
+ * @param values The new field values. The key is the column name for the field.
+ A null value will remove an existing field value.
+ * @param extras A Bundle containing all additional information necessary for the update.
+ * Values in the Bundle may include SQL style arguments.
+ * @return the number of rows updated.
+ * @throws NullPointerException if uri or values are null
+ */
+ @Override
+ public final int update(@RequiresPermission.Write @NonNull Uri uri,
+ @Nullable ContentValues values, @Nullable Bundle extras) {
Preconditions.checkNotNull(uri, "uri");
try {
- if (mWrapped != null) return mWrapped.update(uri, values, where, selectionArgs);
+ if (mWrapped != null) return mWrapped.update(uri, values, extras);
} catch (RemoteException e) {
return 0;
}
@@ -2038,10 +2144,9 @@
}
try {
long startTime = SystemClock.uptimeMillis();
- int rowsUpdated = provider.update(mPackageName, mFeatureId, uri, values, where,
- selectionArgs);
+ int rowsUpdated = provider.update(mPackageName, mFeatureId, uri, values, extras);
long durationMillis = SystemClock.uptimeMillis() - startTime;
- maybeLogUpdateToEventLog(durationMillis, uri, "update", where);
+ maybeLogUpdateToEventLog(durationMillis, uri, "update", null);
return rowsUpdated;
} catch (RemoteException e) {
// Arbitrary and not worth documenting, as Activity
@@ -2381,15 +2486,15 @@
* true.
* @param syncToNetwork If true, same as {@link #NOTIFY_SYNC_TO_NETWORK}.
* @see #requestSync(android.accounts.Account, String, android.os.Bundle)
+ * @deprecated callers should consider migrating to
+ * {@link #notifyChange(Uri, ContentObserver, int)}, as it
+ * offers support for many more options than just
+ * {@link #NOTIFY_SYNC_TO_NETWORK}.
*/
+ @Deprecated
public void notifyChange(@NonNull Uri uri, @Nullable ContentObserver observer,
boolean syncToNetwork) {
- Preconditions.checkNotNull(uri, "uri");
- notifyChange(
- ContentProvider.getUriWithoutUserId(uri),
- observer,
- syncToNetwork,
- ContentProvider.getUserIdFromUri(uri, mContext.getUserId()));
+ notifyChange(uri, observer, syncToNetwork ? NOTIFY_SYNC_TO_NETWORK : 0);
}
/**
@@ -2398,10 +2503,10 @@
* To observe events sent through this call, use
* {@link #registerContentObserver(Uri, boolean, ContentObserver)}.
* <p>
- * If syncToNetwork is true, this will attempt to schedule a local sync
- * using the sync adapter that's registered for the authority of the
- * provided uri. No account will be passed to the sync adapter, so all
- * matching accounts will be synchronized.
+ * If {@link #NOTIFY_SYNC_TO_NETWORK} is set, this will attempt to schedule
+ * a local sync using the sync adapter that's registered for the authority
+ * of the provided uri. No account will be passed to the sync adapter, so
+ * all matching accounts will be synchronized.
* <p>
* Starting in {@link android.os.Build.VERSION_CODES#O}, all content
* notifications must be backed by a valid {@link ContentProvider}.
@@ -2427,21 +2532,71 @@
}
/**
+ * Notify registered observers that several rows have been updated.
+ * <p>
+ * To observe events sent through this call, use
+ * {@link #registerContentObserver(Uri, boolean, ContentObserver)}.
+ * <p>
+ * If {@link #NOTIFY_SYNC_TO_NETWORK} is set, this will attempt to schedule
+ * a local sync using the sync adapter that's registered for the authority
+ * of the provided uri. No account will be passed to the sync adapter, so
+ * all matching accounts will be synchronized.
+ * <p>
+ * Starting in {@link android.os.Build.VERSION_CODES#O}, all content
+ * notifications must be backed by a valid {@link ContentProvider}.
+ *
+ * @param uris The uris of the content that was changed.
+ * @param observer The observer that originated the change, may be
+ * <code>null</null>. The observer that originated the change
+ * will only receive the notification if it has requested to
+ * receive self-change notifications by implementing
+ * {@link ContentObserver#deliverSelfNotifications()} to return
+ * true.
+ * @param flags Flags such as {@link #NOTIFY_SYNC_TO_NETWORK} or
+ * {@link #NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS}.
+ */
+ public void notifyChange(@NonNull Iterable<Uri> uris, @Nullable ContentObserver observer,
+ @NotifyFlags int flags) {
+ Preconditions.checkNotNull(uris, "uris");
+
+ // Cluster based on user ID
+ final SparseArray<ArrayList<Uri>> clusteredByUser = new SparseArray<>();
+ for (Uri uri : uris) {
+ final int userId = ContentProvider.getUserIdFromUri(uri, mContext.getUserId());
+ ArrayList<Uri> list = clusteredByUser.get(userId);
+ if (list == null) {
+ list = new ArrayList<>();
+ clusteredByUser.put(userId, list);
+ }
+ list.add(ContentProvider.getUriWithoutUserId(uri));
+ }
+
+ for (int i = 0; i < clusteredByUser.size(); i++) {
+ final int userId = clusteredByUser.keyAt(i);
+ final ArrayList<Uri> list = clusteredByUser.valueAt(i);
+ notifyChange(list.toArray(new Uri[list.size()]), observer, flags, userId);
+ }
+ }
+
+ /**
* Notify registered observers within the designated user(s) that a row was updated.
*
+ * @deprecated callers should consider migrating to
+ * {@link #notifyChange(Uri, ContentObserver, int)}, as it
+ * offers support for many more options than just
+ * {@link #NOTIFY_SYNC_TO_NETWORK}.
* @hide
*/
+ @Deprecated
public void notifyChange(@NonNull Uri uri, ContentObserver observer, boolean syncToNetwork,
@UserIdInt int userHandle) {
- try {
- getContentService().notifyChange(
- uri, observer == null ? null : observer.getContentObserver(),
- observer != null && observer.deliverSelfNotifications(),
- syncToNetwork ? NOTIFY_SYNC_TO_NETWORK : 0,
- userHandle, mTargetSdkVersion, mContext.getPackageName());
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
- }
+ notifyChange(uri, observer, syncToNetwork ? NOTIFY_SYNC_TO_NETWORK : 0, userHandle);
+ }
+
+ /** {@hide} */
+ public void notifyChange(@NonNull Uri uri, ContentObserver observer, @NotifyFlags int flags,
+ @UserIdInt int userHandle) {
+ notifyChange(new Uri[] { uri }, observer, flags, userHandle);
}
/**
@@ -2449,11 +2604,11 @@
*
* @hide
*/
- public void notifyChange(@NonNull Uri uri, ContentObserver observer, @NotifyFlags int flags,
+ public void notifyChange(@NonNull Uri[] uris, ContentObserver observer, @NotifyFlags int flags,
@UserIdInt int userHandle) {
try {
getContentService().notifyChange(
- uri, observer == null ? null : observer.getContentObserver(),
+ uris, observer == null ? null : observer.getContentObserver(),
observer != null && observer.deliverSelfNotifications(), flags,
userHandle, mTargetSdkVersion, mContext.getPackageName());
} catch (RemoteException e) {
@@ -3538,6 +3693,15 @@
*/
public static @Nullable Bundle createSqlQueryBundle(
@Nullable String selection,
+ @Nullable String[] selectionArgs) {
+ return createSqlQueryBundle(selection, selectionArgs, null);
+ }
+
+ /**
+ * @hide
+ */
+ public static @Nullable Bundle createSqlQueryBundle(
+ @Nullable String selection,
@Nullable String[] selectionArgs,
@Nullable String sortOrder) {
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 7672266..03b4913 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2072,7 +2072,7 @@
* Intent will receive the broadcast.
* @param receiverPermissions Array of names of permissions that a receiver must hold
* in order to receive your broadcast.
- * If null or empty, no permissions are required.
+ * If empty, no permissions are required.
*
* @see android.content.BroadcastReceiver
* @see #registerReceiver
@@ -2081,8 +2081,11 @@
* @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)
* @hide
*/
- public abstract void sendBroadcastMultiplePermissions(Intent intent,
- String[] receiverPermissions);
+ @SystemApi
+ public void sendBroadcastMultiplePermissions(@NonNull Intent intent,
+ @NonNull String[] receiverPermissions) {
+ throw new RuntimeException("Not implemented. Must override in a subclass.");
+ }
/**
* Broadcast the given intent to all interested BroadcastReceivers, allowing
@@ -5407,6 +5410,7 @@
* Get the user associated with this context
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public @UserIdInt int getUserId() {
return android.os.UserHandle.myUserId();
@@ -5537,6 +5541,7 @@
* @return Returns the {@link Display} object this context is associated with.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public abstract Display getDisplay();
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 79c3669..b04f781 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -464,7 +464,8 @@
/** @hide */
@Override
- public void sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions) {
+ public void sendBroadcastMultiplePermissions(@NonNull Intent intent,
+ @NonNull String[] receiverPermissions) {
mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions);
}
@@ -973,6 +974,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
@Override
public Display getDisplay() {
diff --git a/core/java/android/content/IContentProvider.java b/core/java/android/content/IContentProvider.java
index d2c97c4..1fb2958 100644
--- a/core/java/android/content/IContentProvider.java
+++ b/core/java/android/content/IContentProvider.java
@@ -48,10 +48,10 @@
+ "instead")
public default Uri insert(String callingPkg, Uri url, ContentValues initialValues)
throws RemoteException {
- return insert(callingPkg, null, url, initialValues);
+ return insert(callingPkg, null, url, initialValues, null);
}
- public Uri insert(String callingPkg, String featureId, Uri url, ContentValues initialValues)
- throws RemoteException;
+ public Uri insert(String callingPkg, String featureId, Uri url, ContentValues initialValues,
+ Bundle extras) throws RemoteException;
@Deprecated
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Use {@link "
+ "ContentProviderClient#bulkInsert(android.net.Uri, android.content.ContentValues[])"
@@ -68,20 +68,22 @@
+ ".String[])} instead")
public default int delete(String callingPkg, Uri url, String selection, String[] selectionArgs)
throws RemoteException {
- return delete(callingPkg, null, url, selection, selectionArgs);
+ return delete(callingPkg, null, url,
+ ContentResolver.createSqlQueryBundle(selection, selectionArgs));
}
- public int delete(String callingPkg, String featureId, Uri url, String selection,
- String[] selectionArgs) throws RemoteException;
+ public int delete(String callingPkg, String featureId, Uri url, Bundle extras)
+ throws RemoteException;
@Deprecated
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Use {@link "
+ "ContentProviderClient#update(android.net.Uri, android.content.ContentValues, java"
+ ".lang.String, java.lang.String[])} instead")
public default int update(String callingPkg, Uri url, ContentValues values, String selection,
String[] selectionArgs) throws RemoteException {
- return update(callingPkg, null, url, values, selection, selectionArgs);
+ return update(callingPkg, null, url, values,
+ ContentResolver.createSqlQueryBundle(selection, selectionArgs));
}
public int update(String callingPkg, String featureId, Uri url, ContentValues values,
- String selection, String[] selectionArgs) throws RemoteException;
+ Bundle extras) throws RemoteException;
public ParcelFileDescriptor openFile(String callingPkg, @Nullable String featureId, Uri url,
String mode, ICancellationSignal signal, IBinder callerToken)
@@ -119,7 +121,7 @@
throws RemoteException;
public boolean refresh(String callingPkg, @Nullable String featureId, Uri url,
- @Nullable Bundle args, ICancellationSignal cancellationSignal) throws RemoteException;
+ @Nullable Bundle extras, ICancellationSignal cancellationSignal) throws RemoteException;
// Data interchange.
public String[] getStreamTypes(Uri url, String mimeTypeFilter) throws RemoteException;
diff --git a/core/java/android/content/IContentService.aidl b/core/java/android/content/IContentService.aidl
index a34a995..03c99e1 100644
--- a/core/java/android/content/IContentService.aidl
+++ b/core/java/android/content/IContentService.aidl
@@ -51,7 +51,7 @@
* hold the INTERACT_ACROSS_USERS_FULL permission. Pseudousers USER_ALL
* USER_CURRENT are properly interpreted.
*/
- void notifyChange(in Uri uri, IContentObserver observer,
+ void notifyChange(in Uri[] uris, IContentObserver observer,
boolean observerWantsSelfNotifications, int flags,
int userHandle, int targetSdkVersion, String callingPackage);
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 4e7e713..ca374f93 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1940,6 +1940,7 @@
@RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS)
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
@SystemApi
+ @TestApi
public static final String ACTION_MANAGE_DEFAULT_APP =
"android.intent.action.MANAGE_DEFAULT_APP";
diff --git a/core/java/android/content/LoggingContentInterface.java b/core/java/android/content/LoggingContentInterface.java
index 1df1c4f..3bd0832 100644
--- a/core/java/android/content/LoggingContentInterface.java
+++ b/core/java/android/content/LoggingContentInterface.java
@@ -178,11 +178,11 @@
}
@Override
- public @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues initialValues)
- throws RemoteException {
- try (Logger l = new Logger("insert", uri, initialValues)) {
+ public @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues initialValues,
+ @Nullable Bundle extras) throws RemoteException {
+ try (Logger l = new Logger("insert", uri, initialValues, extras)) {
try {
- return l.setResult(delegate.insert(uri, initialValues));
+ return l.setResult(delegate.insert(uri, initialValues, extras));
} catch (Exception res) {
l.setResult(res);
throw res;
@@ -204,11 +204,10 @@
}
@Override
- public int delete(@NonNull Uri uri, @Nullable String selection,
- @Nullable String[] selectionArgs) throws RemoteException {
- try (Logger l = new Logger("delete", uri, selection, selectionArgs)) {
+ public int delete(@NonNull Uri uri, @Nullable Bundle extras) throws RemoteException {
+ try (Logger l = new Logger("delete", uri, extras)) {
try {
- return l.setResult(delegate.delete(uri, selection, selectionArgs));
+ return l.setResult(delegate.delete(uri, extras));
} catch (Exception res) {
l.setResult(res);
throw res;
@@ -217,11 +216,11 @@
}
@Override
- public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection,
- @Nullable String[] selectionArgs) throws RemoteException {
- try (Logger l = new Logger("update", uri, values, selection, selectionArgs)) {
+ public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable Bundle extras)
+ throws RemoteException {
+ try (Logger l = new Logger("update", uri, values, extras)) {
try {
- return l.setResult(delegate.update(uri, values, selection, selectionArgs));
+ return l.setResult(delegate.update(uri, values, extras));
} catch (Exception res) {
l.setResult(res);
throw res;
diff --git a/core/java/android/content/SyncStatusInfo.java b/core/java/android/content/SyncStatusInfo.java
index 3f64515..0eea47a 100644
--- a/core/java/android/content/SyncStatusInfo.java
+++ b/core/java/android/content/SyncStatusInfo.java
@@ -20,6 +20,9 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.util.Log;
+import android.util.Pair;
+
+import com.android.internal.util.ArrayUtils;
import java.util.ArrayList;
import java.util.Calendar;
@@ -139,10 +142,10 @@
public final long[] perSourceLastSuccessTimes = new long[SOURCE_COUNT];
public final long[] perSourceLastFailureTimes = new long[SOURCE_COUNT];
- // Warning: It is up to the external caller to ensure there are
- // no race conditions when accessing this list
- @UnsupportedAppUsage
- private ArrayList<Long> periodicSyncTimes;
+ // Warning: It is up to the external caller to ensure there are
+ // no race conditions when accessing this list
+ @UnsupportedAppUsage
+ private ArrayList<Long> periodicSyncTimes;
private final ArrayList<Long> mLastEventTimes = new ArrayList<>();
private final ArrayList<String> mLastEvents = new ArrayList<>();
@@ -292,9 +295,28 @@
}
}
+ /**
+ * Copies all data from the given SyncStatusInfo object.
+ *
+ * @param other the SyncStatusInfo object to copy data from
+ */
public SyncStatusInfo(SyncStatusInfo other) {
authorityId = other.authorityId;
+ copyFrom(other);
+ }
+ /**
+ * Copies all data from the given SyncStatusInfo object except for its authority id.
+ *
+ * @param authorityId the new authority id
+ * @param other the SyncStatusInfo object to copy data from
+ */
+ public SyncStatusInfo(int authorityId, SyncStatusInfo other) {
+ this.authorityId = authorityId;
+ copyFrom(other);
+ }
+
+ private void copyFrom(SyncStatusInfo other) {
other.totalStats.copyTo(totalStats);
other.todayStats.copyTo(todayStats);
other.yesterdayStats.copyTo(yesterdayStats);
@@ -323,6 +345,14 @@
System.arraycopy(from, 0, to, 0, to.length);
}
+ public int getPeriodicSyncTimesSize() {
+ return periodicSyncTimes == null ? 0 : periodicSyncTimes.size();
+ }
+
+ public void addPeriodicSyncTime(long time) {
+ periodicSyncTimes = ArrayUtils.add(periodicSyncTimes, time);
+ }
+
@UnsupportedAppUsage
public void setPeriodicSyncTime(int index, long when) {
// The list is initialized lazily when scheduling occurs so we need to make sure
@@ -347,6 +377,24 @@
}
}
+ /**
+ * Populates {@code mLastEventTimes} and {@code mLastEvents} with the given list. <br>
+ * <i>Note: This method is mainly used to repopulate the event info from disk and it will clear
+ * both {@code mLastEventTimes} and {@code mLastEvents} before populating.</i>
+ *
+ * @param lastEventInformation the list to populate with
+ */
+ public void populateLastEventsInformation(ArrayList<Pair<Long, String>> lastEventInformation) {
+ mLastEventTimes.clear();
+ mLastEvents.clear();
+ final int size = lastEventInformation.size();
+ for (int i = 0; i < size; i++) {
+ final Pair<Long, String> lastEventInfo = lastEventInformation.get(i);
+ mLastEventTimes.add(lastEventInfo.first);
+ mLastEvents.add(lastEventInfo.second);
+ }
+ }
+
/** */
public void addEvent(String message) {
if (mLastEventTimes.size() >= MAX_EVENT_COUNT) {
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index 1e4cc38..e724443 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -1237,6 +1237,7 @@
* Determines whether the {@link Activity} is considered translucent or floating.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static boolean isTranslucentOrFloating(TypedArray attributes) {
final boolean isTranslucent =
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index d0a61eb..37c6f57 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -470,6 +470,7 @@
*
* {@hide}
*/
+ @UnsupportedAppUsage
@TestApi
public static final int PRIVATE_FLAG_PRIVILEGED = 1<<3;
@@ -733,6 +734,7 @@
* Private/hidden flags. See {@code PRIVATE_FLAG_...} constants.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public @ApplicationInfoPrivateFlags int privateFlags;
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index e0d6260..c56c307 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -3332,6 +3332,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String SYSTEM_SHARED_LIBRARY_SERVICES = "android.ext.services";
@@ -3344,6 +3345,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared";
@@ -3977,6 +3979,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@NonNull
@TestApi
public abstract String getPermissionControllerPackageName();
@@ -4684,6 +4687,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public abstract @NonNull String getServicesSystemSharedLibraryPackageName();
@@ -4694,6 +4698,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public abstract @NonNull String getSharedSystemSharedLibraryPackageName();
diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java
index 1e88ce7..42d64d8 100644
--- a/core/java/android/content/pm/UserInfo.java
+++ b/core/java/android/content/pm/UserInfo.java
@@ -17,6 +17,7 @@
package android.content.pm;
import android.annotation.IntDef;
+import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.annotation.UserIdInt;
import android.os.Parcel;
@@ -25,6 +26,8 @@
import android.os.UserManager;
import android.util.DebugUtils;
+import com.android.server.pm.UserTypeDetails;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -32,13 +35,13 @@
* Per-user information.
*
* <p>There are 3 base properties of users: {@link #FLAG_SYSTEM}, {@link #FLAG_FULL}, and
- * {@link #FLAG_MANAGED_PROFILE}. Every user must have one of the following combination of these
+ * {@link #FLAG_PROFILE}. Every user must have one of the following combination of these
* flags:
* <ul>
* <li>FLAG_SYSTEM (user {@link UserHandle#USER_SYSTEM} on a headless-user-0 device)</li>
* <li>FLAG_SYSTEM and FLAG_FULL (user {@link UserHandle#USER_SYSTEM} on a regular device)</li>
* <li>FLAG_FULL (non-profile secondary user)</li>
- * <li>FLAG_MANAGED_PROFILE (profile users)</li>
+ * <li>FLAG_PROFILE (profile users)</li>
* </ul>
* Users can have also have additional flags (such as FLAG_GUEST) as appropriate.
*
@@ -70,13 +73,17 @@
/**
* Indicates a guest user that may be transient.
+ * @deprecated Use {@link UserManager#USER_TYPE_FULL_GUEST} instead.
*/
+ @Deprecated
public static final int FLAG_GUEST = 0x00000004;
/**
* Indicates the user has restrictions in privileges, in addition to those for normal users.
* Exact meaning TBD. For instance, maybe they can't install apps or administer WiFi access pts.
+ * @deprecated Use {@link UserManager#USER_TYPE_FULL_RESTRICTED} instead.
*/
+ @Deprecated
public static final int FLAG_RESTRICTED = 0x00000008;
/**
@@ -87,7 +94,9 @@
/**
* Indicates that this user is a profile of another user, for example holding a users
* corporate data.
+ * @deprecated Use {@link UserManager#USER_TYPE_PROFILE_MANAGED} instead.
*/
+ @Deprecated
public static final int FLAG_MANAGED_PROFILE = 0x00000020;
/**
@@ -108,14 +117,16 @@
/**
* User is for demo purposes only and can be removed at any time.
+ * @deprecated Use {@link UserManager#USER_TYPE_FULL_DEMO} instead.
*/
+ @Deprecated
public static final int FLAG_DEMO = 0x00000200;
/**
* Indicates that this user is a non-profile human user.
*
* <p>When creating a new (non-system) user, this flag will always be forced true unless the
- * user is a {@link #FLAG_MANAGED_PROFILE}. If user {@link UserHandle#USER_SYSTEM} is also a
+ * user is a {@link #FLAG_PROFILE}. If user {@link UserHandle#USER_SYSTEM} is also a
* human user, it must also be flagged as FULL.
*/
public static final int FLAG_FULL = 0x00000400;
@@ -126,11 +137,10 @@
public static final int FLAG_SYSTEM = 0x00000800;
/**
- * Indicates that this user is some sort of profile. Right now, the only profile type is
- * {@link #FLAG_MANAGED_PROFILE}, but this can include other types of profiles too if any
- * are created in the future. This is therefore not a flag, but an OR of several flags.
+ * Indicates that this user is a profile human user, such as a managed profile.
+ * Mutually exclusive with {@link #FLAG_FULL}.
*/
- public static final int PROFILE_FLAGS_MASK = FLAG_MANAGED_PROFILE;
+ public static final int FLAG_PROFILE = 0x00001000;
/**
* @hide
@@ -147,7 +157,8 @@
FLAG_EPHEMERAL,
FLAG_DEMO,
FLAG_FULL,
- FLAG_SYSTEM
+ FLAG_SYSTEM,
+ FLAG_PROFILE
})
@Retention(RetentionPolicy.SOURCE)
public @interface UserInfoFlag {
@@ -170,6 +181,13 @@
@UnsupportedAppUsage
public long lastLoggedInTime;
public String lastLoggedInFingerprint;
+
+ /**
+ * Type of user, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}, corresponding to
+ * {@link UserTypeDetails#getName()}.
+ */
+ public String userType;
+
/**
* If this user is a parent user, it would be its own user id.
* If this user is a child user, it would be its parent user id.
@@ -178,7 +196,12 @@
@UnsupportedAppUsage
public int profileGroupId;
public int restrictedProfileParentId;
- /** Which profile badge color/label to use. */
+
+ /**
+ * Which badge color/label to use within a particular {@link UserTypeDetails}, i.e.
+ * the badgeIndex.
+ * This is an index for distinguishing different profiles with the same parent and user type.
+ */
public int profileBadge;
/** User is only partially created. */
@@ -199,21 +222,68 @@
*/
public boolean preCreated;
+ /**
+ * Creates a UserInfo whose user type is determined automatically by the flags according to
+ * {@link #getDefaultUserType}; can only be used for user types handled there.
+ */
@UnsupportedAppUsage
public UserInfo(int id, String name, int flags) {
this(id, name, null, flags);
}
+ /**
+ * Creates a UserInfo whose user type is determined automatically by the flags according to
+ * {@link #getDefaultUserType}; can only be used for user types handled there.
+ */
@UnsupportedAppUsage
public UserInfo(int id, String name, String iconPath, int flags) {
+ this(id, name, iconPath, flags, getDefaultUserType(flags));
+ }
+
+ public UserInfo(int id, String name, String iconPath, int flags, String userType) {
this.id = id;
this.name = name;
this.flags = flags;
+ this.userType = userType;
this.iconPath = iconPath;
this.profileGroupId = NO_PROFILE_GROUP_ID;
this.restrictedProfileParentId = NO_PROFILE_GROUP_ID;
}
+ /**
+ * Get the user type (such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}) that corresponds to
+ * the given {@link UserInfoFlag}s.
+
+ * <p>The userInfoFlag can contain GUEST, RESTRICTED, MANAGED_PROFILE, DEMO, or else be
+ * interpreted as a regular "secondary" user. It cannot contain more than one of these.
+ * It can contain other UserInfoFlag properties (like EPHEMERAL), which will be ignored here.
+ *
+ * @throws IllegalArgumentException if userInfoFlag is more than one type of user or if it
+ * is a SYSTEM user.
+ *
+ * @hide
+ */
+ public static @NonNull String getDefaultUserType(@UserInfoFlag int userInfoFlag) {
+ if ((userInfoFlag & FLAG_SYSTEM) != 0) {
+ throw new IllegalArgumentException("Cannot getDefaultUserType for flags "
+ + Integer.toHexString(userInfoFlag) + " because it corresponds to a "
+ + "SYSTEM user type.");
+ }
+ final int supportedFlagTypes =
+ FLAG_GUEST | FLAG_RESTRICTED | FLAG_MANAGED_PROFILE | FLAG_DEMO;
+ switch (userInfoFlag & supportedFlagTypes) {
+ case 0 : return UserManager.USER_TYPE_FULL_SECONDARY;
+ case FLAG_GUEST: return UserManager.USER_TYPE_FULL_GUEST;
+ case FLAG_RESTRICTED: return UserManager.USER_TYPE_FULL_RESTRICTED;
+ case FLAG_MANAGED_PROFILE: return UserManager.USER_TYPE_PROFILE_MANAGED;
+ case FLAG_DEMO: return UserManager.USER_TYPE_FULL_DEMO;
+ default:
+ throw new IllegalArgumentException("Cannot getDefaultUserType for flags "
+ + Integer.toHexString(userInfoFlag) + " because it doesn't correspond to a "
+ + "valid user type.");
+ }
+ }
+
@UnsupportedAppUsage
public boolean isPrimary() {
return (flags & FLAG_PRIMARY) == FLAG_PRIMARY;
@@ -226,31 +296,21 @@
@UnsupportedAppUsage
public boolean isGuest() {
- return isGuest(flags);
- }
-
- /**
- * Checks if the flag denotes a guest user.
- */
- public static boolean isGuest(@UserInfoFlag int flags) {
- return (flags & FLAG_GUEST) == FLAG_GUEST;
+ return UserManager.isUserTypeGuest(userType);
}
@UnsupportedAppUsage
public boolean isRestricted() {
- return (flags & FLAG_RESTRICTED) == FLAG_RESTRICTED;
+ return UserManager.isUserTypeRestricted(userType);
+ }
+
+ public boolean isProfile() {
+ return (flags & FLAG_PROFILE) != 0;
}
@UnsupportedAppUsage
public boolean isManagedProfile() {
- return isManagedProfile(flags);
- }
-
- /**
- * Checks if the flag denotes a managed profile.
- */
- public static boolean isManagedProfile(@UserInfoFlag int flags) {
- return (flags & FLAG_MANAGED_PROFILE) == FLAG_MANAGED_PROFILE;
+ return UserManager.isUserTypeManagedProfile(userType);
}
@UnsupportedAppUsage
@@ -271,7 +331,7 @@
}
public boolean isDemo() {
- return (flags & FLAG_DEMO) == FLAG_DEMO;
+ return UserManager.isUserTypeDemo(userType);
}
public boolean isFull() {
@@ -304,7 +364,7 @@
// Don't support switching to an ephemeral user with removal in progress.
return false;
}
- return !isManagedProfile();
+ return !isProfile();
}
/**
@@ -316,9 +376,10 @@
return (!hideSystemUser || id != UserHandle.USER_SYSTEM) && supportsSwitchTo();
}
+ // TODO(b/142482943): Make this logic more specific and customizable. (canHaveProfile(userType))
/* @hide */
public boolean canHaveProfile() {
- if (isManagedProfile() || isGuest() || isRestricted()) {
+ if (isProfile() || isGuest() || isRestricted()) {
return false;
}
if (UserManager.isSplitSystemUser() || UserManager.isHeadlessSystemUserMode()) {
@@ -336,6 +397,7 @@
iconPath = orig.iconPath;
id = orig.id;
flags = orig.flags;
+ userType = orig.userType;
serialNumber = orig.serialNumber;
creationTime = orig.creationTime;
lastLoggedInTime = orig.lastLoggedInTime;
@@ -353,6 +415,7 @@
return UserHandle.of(id);
}
+ // TODO(b/142482943): Probably include mUserType here, which means updating TestDevice, etc.
@Override
public String toString() {
// NOTE: do not change this string, it's used by 'pm list users', which in turn is
@@ -365,6 +428,7 @@
public String toFullString() {
return "UserInfo[id=" + id
+ ", name=" + name
+ + ", type=" + userType
+ ", flags=" + flagsToString(flags)
+ (preCreated ? " (pre-created)" : "")
+ (partial ? " (partial)" : "")
@@ -387,6 +451,7 @@
dest.writeString(name);
dest.writeString(iconPath);
dest.writeInt(flags);
+ dest.writeString(userType);
dest.writeInt(serialNumber);
dest.writeLong(creationTime);
dest.writeLong(lastLoggedInTime);
@@ -415,6 +480,7 @@
name = source.readString();
iconPath = source.readString();
flags = source.readInt();
+ userType = source.readString();
serialNumber = source.readInt();
creationTime = source.readLong();
lastLoggedInTime = source.readLong();
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index 23e7720..070e282 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -1491,9 +1491,17 @@
*/
@UnsupportedAppUsage
public SparseArray<String> getAssignedPackageIdentifiers() {
+ return getAssignedPackageIdentifiers(true, true);
+ }
+
+ /**
+ * @hide
+ */
+ public SparseArray<String> getAssignedPackageIdentifiers(boolean includeOverlays,
+ boolean includeLoaders) {
synchronized (this) {
ensureValidLocked();
- return nativeGetAssignedPackageIdentifiers(mObject);
+ return nativeGetAssignedPackageIdentifiers(mObject, includeOverlays, includeLoaders);
}
}
@@ -1557,7 +1565,7 @@
int smallestScreenWidthDp, int screenWidthDp, int screenHeightDp, int screenLayout,
int uiMode, int colorMode, int majorVersion);
private static native @NonNull SparseArray<String> nativeGetAssignedPackageIdentifiers(
- long ptr);
+ long ptr, boolean includeOverlays, boolean includeLoaders);
// File native methods.
private static native @Nullable String[] nativeList(long ptr, @NonNull String path)
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index 053444b..5a45d9f 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -613,6 +613,16 @@
*/
public int navigationHidden;
+ /** @hide **/
+ @IntDef(prefix = {"ORIENTATION_"}, value = {
+ ORIENTATION_UNDEFINED,
+ ORIENTATION_PORTRAIT,
+ ORIENTATION_LANDSCAPE,
+ ORIENTATION_SQUARE
+ })
+ public @interface Orientation {
+ }
+
/** Constant for {@link #orientation}: a value indicating that no value has been set. */
public static final int ORIENTATION_UNDEFINED = 0;
/** Constant for {@link #orientation}, value corresponding to the
@@ -630,6 +640,7 @@
* Overall orientation of the screen. May be one of
* {@link #ORIENTATION_LANDSCAPE}, {@link #ORIENTATION_PORTRAIT}.
*/
+ @Orientation
public int orientation;
/** Constant for {@link #uiMode}: bits that encode the mode type. */
@@ -798,6 +809,7 @@
* {@link ActivityInfo#CONFIG_ASSETS_PATHS}.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public int assetsSeq;
diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java
index a231a92..3d0ac61 100644
--- a/core/java/android/database/sqlite/SQLiteDebug.java
+++ b/core/java/android/database/sqlite/SQLiteDebug.java
@@ -23,6 +23,8 @@
import android.util.Log;
import android.util.Printer;
+import dalvik.annotation.compat.UnsupportedAppUsage;
+
import java.util.ArrayList;
/**
@@ -116,9 +118,15 @@
* @see #nativeGetPagerStats(PagerStats)
*/
public static class PagerStats {
+
+ @UnsupportedAppUsage
+ public PagerStats() {
+ }
+
/** the current amount of memory checked out by sqlite using sqlite3_malloc().
* documented at http://www.sqlite.org/c3ref/c_status_malloc_size.html
*/
+ @UnsupportedAppUsage
public int memoryUsed;
/** the number of bytes of page cache allocation which could not be sattisfied by the
@@ -128,16 +136,19 @@
* that overflowed because no space was left in the page cache.
* documented at http://www.sqlite.org/c3ref/c_status_malloc_size.html
*/
+ @UnsupportedAppUsage
public int pageCacheOverflow;
/** records the largest memory allocation request handed to sqlite3.
* documented at http://www.sqlite.org/c3ref/c_status_malloc_size.html
*/
+ @UnsupportedAppUsage
public int largestMemAlloc;
/** a list of {@link DbStats} - one for each main database opened by the applications
* running on the android device
*/
+ @UnsupportedAppUsage
public ArrayList<DbStats> dbStats;
}
@@ -146,16 +157,20 @@
*/
public static class DbStats {
/** name of the database */
+ @UnsupportedAppUsage
public String dbName;
/** the page size for the database */
+ @UnsupportedAppUsage
public long pageSize;
/** the database size */
+ @UnsupportedAppUsage
public long dbSize;
/**
* Number of lookaside slots: http://www.sqlite.org/c3ref/c_dbstatus_lookaside_used.html */
+ @UnsupportedAppUsage
public int lookaside;
/** statement cache stats: hits/misses/cachesize */
@@ -175,6 +190,7 @@
* return all pager and database stats for the current process.
* @return {@link PagerStats}
*/
+ @UnsupportedAppUsage
public static PagerStats getDatabaseInfo() {
PagerStats stats = new PagerStats();
nativeGetPagerStats(stats);
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index fc90096..b61b1ef 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -404,7 +404,7 @@
"Camera service is currently unavailable");
}
cameraUser = cameraService.connectDevice(callbacks, cameraId,
- mContext.getOpPackageName(), uid);
+ mContext.getOpPackageName(), mContext.getFeatureId(), uid);
} else {
// Use legacy camera implementation for HAL1 devices
int id;
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index e3259ff..88877e2 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -478,6 +478,7 @@
* @return an array of capability values for this instance.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public @NetCapability int[] getCapabilities() {
return BitUtils.unpackBits(mNetworkCapabilities);
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java
index 95d66bb..39cb323 100644
--- a/core/java/android/net/SSLCertificateSocketFactory.java
+++ b/core/java/android/net/SSLCertificateSocketFactory.java
@@ -304,7 +304,8 @@
}
/**
- * Sets the <a href="http://technotes.googlecode.com/git/nextprotoneg.html">Next
+ * Sets the
+ * <a class="external" href="https://tools.ietf.org/id/draft-agl-tls-nextprotoneg-03.html">Next
* Protocol Negotiation (NPN)</a> protocols that this peer is interested in.
*
* <p>For servers this is the sequence of protocols to advertise as
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index fda1539..ec39199 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -932,9 +932,14 @@
}
int result = -1;
- try {
- result = handleShellCommand(new ParcelFileDescriptor(in),
- new ParcelFileDescriptor(out), new ParcelFileDescriptor(err), args);
+ try (ParcelFileDescriptor inPfd = ParcelFileDescriptor.dup(in);
+ ParcelFileDescriptor outPfd = ParcelFileDescriptor.dup(out);
+ ParcelFileDescriptor errPfd = ParcelFileDescriptor.dup(err)) {
+ result = handleShellCommand(inPfd, outPfd, errPfd, args);
+ } catch (IOException e) {
+ PrintWriter pw = new FastPrintWriter(new FileOutputStream(err));
+ pw.println("dup() failed: " + e.getMessage());
+ pw.flush();
} finally {
resultReceiver.send(result, null);
}
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 123ed6f..89ccef6 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -109,6 +109,7 @@
* Whether this build was for an emulator device.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final boolean IS_EMULATOR = getString("ro.kernel.qemu").equals("1");
@@ -160,7 +161,7 @@
try {
Application application = ActivityThread.currentApplication();
String callingPackage = application != null ? application.getPackageName() : null;
- return service.getSerialForPackage(callingPackage);
+ return service.getSerialForPackage(callingPackage, null);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
@@ -337,8 +338,8 @@
/**
* @hide
*/
- @TestApi
@UnsupportedAppUsage
+ @TestApi
public static final String[] ACTIVE_CODENAMES = "REL".equals(ALL_CODENAMES[0])
? new String[0] : ALL_CODENAMES;
diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java
index 947b0a1..034e6a7 100644
--- a/core/java/android/os/GraphicsEnvironment.java
+++ b/core/java/android/os/GraphicsEnvironment.java
@@ -177,13 +177,6 @@
}
/**
- * Check whether application is debuggable
- */
- private static boolean isDebuggable(Context context) {
- return (context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) > 0;
- }
-
- /**
* Check whether application is has set the manifest metadata for layer injection.
*/
private static boolean canInjectLayers(ApplicationInfo ai) {
@@ -246,7 +239,7 @@
// 2. ENABLE_GPU_DEBUG_LAYERS is true
// 3. Package name is equal to GPU_DEBUG_APP
- if (isDebuggable(context) || (getCanLoadSystemLibraries() == 1) || canInjectLayers(ai)) {
+ if (isDebuggable() || canInjectLayers(ai)) {
final int enable = coreSettings.getInt(Settings.Global.ENABLE_GPU_DEBUG_LAYERS, 0);
@@ -441,9 +434,7 @@
* Check for ANGLE debug package, but only for apps that can load them (dumpable)
*/
private String getAngleDebugPackage(Context context, Bundle coreSettings) {
- final boolean appIsDebuggable = isDebuggable(context);
- final boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1;
- if (appIsDebuggable || deviceIsDebuggable) {
+ if (isDebuggable()) {
String debugPackage;
if (coreSettings != null) {
@@ -478,12 +469,8 @@
* - devices that are running a userdebug build (ro.debuggable) or can inject libraries for
* debugging (PR_SET_DUMPABLE).
*/
- final boolean appIsDebuggable = isDebuggable(context);
- final boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1;
- if (!(appIsDebuggable || deviceIsDebuggable)) {
- Log.v(TAG, "Skipping loading temporary rules file: "
- + "appIsDebuggable = " + appIsDebuggable + ", "
- + "adbRootEnabled = " + deviceIsDebuggable);
+ if (!isDebuggable()) {
+ Log.v(TAG, "Skipping loading temporary rules file");
return false;
}
@@ -742,7 +729,7 @@
final boolean enablePrereleaseDriver =
(ai.metaData != null && ai.metaData.getBoolean(METADATA_DEVELOPER_DRIVER_ENABLE))
- || getCanLoadSystemLibraries() == 1;
+ || isDebuggable();
// Priority for Game Driver settings global on confliction (Higher priority comes first):
// 1. GAME_DRIVER_ALL_APPS
@@ -918,7 +905,7 @@
return "";
}
- private static native int getCanLoadSystemLibraries();
+ private static native boolean isDebuggable();
private static native void setLayerPaths(ClassLoader classLoader, String layerPaths);
private static native void setDebugLayers(String layers);
private static native void setDebugLayersGLES(String layers);
diff --git a/core/java/android/os/IDeviceIdentifiersPolicyService.aidl b/core/java/android/os/IDeviceIdentifiersPolicyService.aidl
index 87d358f..d11aa0c 100644
--- a/core/java/android/os/IDeviceIdentifiersPolicyService.aidl
+++ b/core/java/android/os/IDeviceIdentifiersPolicyService.aidl
@@ -21,5 +21,5 @@
*/
interface IDeviceIdentifiersPolicyService {
String getSerial();
- String getSerialForPackage(in String callingPackage);
-}
\ No newline at end of file
+ String getSerialForPackage(in String callingPackage, String callingFeatureId);
+}
diff --git a/core/java/android/os/IPullAtomCallback.aidl b/core/java/android/os/IPullAtomCallback.aidl
new file mode 100644
index 0000000..88d3c3e
--- /dev/null
+++ b/core/java/android/os/IPullAtomCallback.aidl
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os;
+
+import android.os.IPullAtomResultReceiver;
+
+/**
+ * Binder interface to pull atoms for the stats service.
+ * {@hide}
+ */
+interface IPullAtomCallback {
+ /**
+ * Initiate a request for a pull for an atom.
+ */
+ void onPullAtom(int atomTag, IPullAtomResultReceiver resultReceiver);
+
+}
diff --git a/core/java/android/os/IPullAtomResultReceiver.aidl b/core/java/android/os/IPullAtomResultReceiver.aidl
new file mode 100644
index 0000000..bfb35ff
--- /dev/null
+++ b/core/java/android/os/IPullAtomResultReceiver.aidl
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os;
+
+import android.util.StatsEvent;
+
+/**
+ * Binder interface to pull atoms for the stats service.
+ * {@hide}
+ */
+interface IPullAtomResultReceiver {
+
+ /**
+ * Indicate that a pull request for an atom is complete.
+ */
+ oneway void pullFinished(int atomTag, boolean success, in StatsEvent[] output);
+
+}
diff --git a/core/java/android/os/IStatsCompanionService.aidl b/core/java/android/os/IStatsCompanionService.aidl
index 0751b96..22a2537 100644
--- a/core/java/android/os/IStatsCompanionService.aidl
+++ b/core/java/android/os/IStatsCompanionService.aidl
@@ -16,6 +16,7 @@
package android.os;
+import android.os.IPullAtomCallback;
import android.os.StatsDimensionsValue;
import android.os.StatsLogEventWrapper;
@@ -85,4 +86,8 @@
/** Tells StatsCompaionService to grab the uid map snapshot and send it to statsd. */
oneway void triggerUidSnapshot();
+
+ /** Tells StatsCompanionService to tell statsd to register a puller for the given atom id */
+ oneway void registerPullAtomCallback(int atomTag, long coolDownNs, long timeoutNs,
+ in int[] additiveFields, IPullAtomCallback pullerCallback);
}
diff --git a/core/java/android/os/IStatsManager.aidl b/core/java/android/os/IStatsManager.aidl
index e3f9326..29871b6 100644
--- a/core/java/android/os/IStatsManager.aidl
+++ b/core/java/android/os/IStatsManager.aidl
@@ -17,6 +17,7 @@
package android.os;
import android.os.IStatsPullerCallback;
+import android.os.IPullAtomCallback;
import android.os.ParcelFileDescriptor;
/**
@@ -188,11 +189,19 @@
* for the specified vendor atom tag.
*
* Requires Manifest.permission.DUMP and Manifest.permission.PACKAGE_USAGE_STATS
+ * @deprecated please use registerPullAtomCallback.
*/
oneway void registerPullerCallback(int atomTag, IStatsPullerCallback pullerCallback,
String packageName);
/**
+ * Registers a puller callback function that, when invoked, pulls the data
+ * for the specified atom tag.
+ */
+ oneway void registerPullAtomCallback(int uid, int atomTag, long coolDownNs, long timeoutNs,
+ in int[] additiveFields, IPullAtomCallback pullerCallback);
+
+ /**
* Unregisters a puller callback function for the given vendor atom.
*
* Requires Manifest.permission.DUMP and Manifest.permission.PACKAGE_USAGE_STATS
diff --git a/core/java/android/os/IStatsPullerCallback.aidl b/core/java/android/os/IStatsPullerCallback.aidl
index 1684aeb..c3e1e55 100644
--- a/core/java/android/os/IStatsPullerCallback.aidl
+++ b/core/java/android/os/IStatsPullerCallback.aidl
@@ -19,6 +19,7 @@
import android.os.StatsLogEventWrapper;
/**
+ * DEPRECATED
* Binder interface to pull atoms for the stats service.
* {@hide}
*/
diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl
index e8cc73f..40048d9 100644
--- a/core/java/android/os/IUserManager.aidl
+++ b/core/java/android/os/IUserManager.aidl
@@ -35,77 +35,84 @@
/*
* DO NOT MOVE - UserManager.h depends on the ordering of this function.
*/
- int getCredentialOwnerProfile(int userHandle);
- int getProfileParentId(int userHandle);
+ int getCredentialOwnerProfile(int userId);
+ int getProfileParentId(int userId);
/*
* END OF DO NOT MOVE
*/
- UserInfo createUser(in String name, int flags);
- UserInfo preCreateUser(int flags);
- UserInfo createProfileForUser(in String name, int flags, int userHandle,
+ UserInfo createUser(in String name, in String userType, int flags);
+ UserInfo preCreateUser(in String userType);
+ UserInfo createProfileForUser(in String name, in String userType, int flags, int userId,
in String[] disallowedPackages);
UserInfo createRestrictedProfile(String name, int parentUserHandle);
- void setUserEnabled(int userHandle);
+ void setUserEnabled(int userId);
void setUserAdmin(int userId);
- void evictCredentialEncryptionKey(int userHandle);
- boolean removeUser(int userHandle);
- boolean removeUserEvenWhenDisallowed(int userHandle);
- void setUserName(int userHandle, String name);
- void setUserIcon(int userHandle, in Bitmap icon);
- ParcelFileDescriptor getUserIcon(int userHandle);
+ void evictCredentialEncryptionKey(int userId);
+ boolean removeUser(int userId);
+ boolean removeUserEvenWhenDisallowed(int userId);
+ void setUserName(int userId, String name);
+ void setUserIcon(int userId, in Bitmap icon);
+ ParcelFileDescriptor getUserIcon(int userId);
UserInfo getPrimaryUser();
List<UserInfo> getUsers(boolean excludePartial, boolean excludeDying, boolean excludePreCreated);
- List<UserInfo> getProfiles(int userHandle, boolean enabledOnly);
+ List<UserInfo> getProfiles(int userId, boolean enabledOnly);
int[] getProfileIds(int userId, boolean enabledOnly);
- boolean canAddMoreManagedProfiles(int userHandle, boolean allowedToRemoveOne);
- UserInfo getProfileParent(int userHandle);
- boolean isSameProfileGroup(int userHandle, int otherUserHandle);
+ boolean canAddMoreProfilesToUser(in String userType, int userId, boolean allowedToRemoveOne);
+ boolean canAddMoreManagedProfiles(int userId, boolean allowedToRemoveOne);
+ UserInfo getProfileParent(int userId);
+ boolean isSameProfileGroup(int userId, int otherUserHandle);
+ String getUserTypeForUser(int userId);
@UnsupportedAppUsage
- UserInfo getUserInfo(int userHandle);
- String getUserAccount(int userHandle);
- void setUserAccount(int userHandle, String accountName);
- long getUserCreationTime(int userHandle);
+ UserInfo getUserInfo(int userId);
+ String getUserAccount(int userId);
+ void setUserAccount(int userId, String accountName);
+ long getUserCreationTime(int userId);
boolean isRestricted();
- boolean canHaveRestrictedProfile(int userHandle);
- int getUserSerialNumber(int userHandle);
+ boolean canHaveRestrictedProfile(int userId);
+ int getUserSerialNumber(int userId);
int getUserHandle(int userSerialNumber);
- int getUserRestrictionSource(String restrictionKey, int userHandle);
- List<UserManager.EnforcingUser> getUserRestrictionSources(String restrictionKey, int userHandle);
- Bundle getUserRestrictions(int userHandle);
- boolean hasBaseUserRestriction(String restrictionKey, int userHandle);
- boolean hasUserRestriction(in String restrictionKey, int userHandle);
+ int getUserRestrictionSource(String restrictionKey, int userId);
+ List<UserManager.EnforcingUser> getUserRestrictionSources(String restrictionKey, int userId);
+ Bundle getUserRestrictions(int userId);
+ boolean hasBaseUserRestriction(String restrictionKey, int userId);
+ boolean hasUserRestriction(in String restrictionKey, int userId);
boolean hasUserRestrictionOnAnyUser(in String restrictionKey);
boolean isSettingRestrictedForUser(in String setting, int userId, in String value, int callingUid);
void addUserRestrictionsListener(IUserRestrictionsListener listener);
- void setUserRestriction(String key, boolean value, int userHandle);
- void setApplicationRestrictions(in String packageName, in Bundle restrictions,
- int userHandle);
+ void setUserRestriction(String key, boolean value, int userId);
+ void setApplicationRestrictions(in String packageName, in Bundle restrictions, int userId);
Bundle getApplicationRestrictions(in String packageName);
- Bundle getApplicationRestrictionsForUser(in String packageName, int userHandle);
+ Bundle getApplicationRestrictionsForUser(in String packageName, int userId);
void setDefaultGuestRestrictions(in Bundle restrictions);
Bundle getDefaultGuestRestrictions();
- boolean markGuestForDeletion(int userHandle);
- boolean isQuietModeEnabled(int userHandle);
- void setSeedAccountData(int userHandle, in String accountName,
+ boolean markGuestForDeletion(int userId);
+ boolean isQuietModeEnabled(int userId);
+ void setSeedAccountData(int userId, in String accountName,
in String accountType, in PersistableBundle accountOptions, boolean persist);
String getSeedAccountName();
String getSeedAccountType();
PersistableBundle getSeedAccountOptions();
void clearSeedAccountData();
boolean someUserHasSeedAccount(in String accountName, in String accountType);
+ boolean isProfile(int userId);
boolean isManagedProfile(int userId);
boolean isDemoUser(int userId);
boolean isPreCreated(int userId);
- UserInfo createProfileForUserEvenWhenDisallowed(in String name, int flags, int userHandle,
- in String[] disallowedPackages);
+ UserInfo createProfileForUserEvenWhenDisallowed(in String name, in String userType, int flags,
+ int userId, in String[] disallowedPackages);
boolean isUserUnlockingOrUnlocked(int userId);
- int getManagedProfileBadge(int userId);
+ int getUserIconBadgeResId(int userId);
+ int getUserBadgeResId(int userId);
+ int getUserBadgeNoBackgroundResId(int userId);
+ int getUserBadgeLabelResId(int userId);
+ int getUserBadgeColorResId(int userId);
+ boolean hasBadge(int userId);
boolean isUserUnlocked(int userId);
boolean isUserRunning(int userId);
- boolean isUserNameSet(int userHandle);
+ boolean isUserNameSet(int userId);
boolean hasRestrictedProfiles();
- boolean requestQuietModeEnabled(String callingPackage, boolean enableQuietMode, int userHandle, in IntentSender target);
+ boolean requestQuietModeEnabled(String callingPackage, boolean enableQuietMode, int userId, in IntentSender target);
String getUserName();
long getUserStartRealtime();
long getUserUnlockRealtime();
diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java
index c5f1698..f98fdc3 100644
--- a/core/java/android/os/MessageQueue.java
+++ b/core/java/android/os/MessageQueue.java
@@ -468,6 +468,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public int postSyncBarrier() {
return postSyncBarrier(SystemClock.uptimeMillis());
@@ -512,6 +513,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public void removeSyncBarrier(int token) {
// Remove a sync barrier token from the queue.
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index dd1f8c3..f18b4db 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -426,9 +426,15 @@
public static final int GO_TO_SLEEP_REASON_FORCE_SUSPEND = 8;
/**
+ * Go to sleep reason code: Going to sleep due to user inattentiveness.
* @hide
*/
- public static final int GO_TO_SLEEP_REASON_MAX = GO_TO_SLEEP_REASON_FORCE_SUSPEND;
+ public static final int GO_TO_SLEEP_REASON_INATTENTIVE = 9;
+
+ /**
+ * @hide
+ */
+ public static final int GO_TO_SLEEP_REASON_MAX = GO_TO_SLEEP_REASON_INATTENTIVE;
/**
* @hide
@@ -444,6 +450,7 @@
case GO_TO_SLEEP_REASON_SLEEP_BUTTON: return "sleep_button";
case GO_TO_SLEEP_REASON_ACCESSIBILITY: return "accessibility";
case GO_TO_SLEEP_REASON_FORCE_SUSPEND: return "force_suspend";
+ case GO_TO_SLEEP_REASON_INATTENTIVE: return "inattentive";
default: return Integer.toString(sleepReason);
}
}
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 43b9c67..6408f61 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -229,6 +229,7 @@
* First uid used for fully isolated sandboxed processes (with no permissions of their own)
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final int FIRST_ISOLATED_UID = 99000;
@@ -236,6 +237,7 @@
* Last uid used for fully isolated sandboxed processes (with no permissions of their own)
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final int LAST_ISOLATED_UID = 99999;
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 48fc2a6..e3f6e12 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -888,7 +888,7 @@
}
List<SubscriptionInfo> invisibleSubs = new ArrayList<>();
for (SubscriptionInfo sub : availableSubs) {
- if (sub.isEmbedded() && !subscriptionManager.isSubscriptionVisible(sub)) {
+ if (sub.isEmbedded() && sub.getGroupUuid() != null && sub.isOpportunistic()) {
invisibleSubs.add(sub);
}
}
diff --git a/core/java/android/os/RemoteException.java b/core/java/android/os/RemoteException.java
index 2e673a8..10ef279 100644
--- a/core/java/android/os/RemoteException.java
+++ b/core/java/android/os/RemoteException.java
@@ -16,7 +16,7 @@
package android.os;
-import android.annotation.UnsupportedAppUsage;
+import android.annotation.NonNull;
import android.util.AndroidException;
/**
@@ -37,7 +37,15 @@
super(message, cause, enableSuppression, writableStackTrace);
}
- /** {@hide} */
+ /**
+ * Rethrow this as an unchecked runtime exception.
+ * <p>
+ * Apps making calls into other processes may end up persisting internal
+ * state or making security decisions based on the perceived success or
+ * failure of a call, or any default values returned. For this reason, we
+ * want to strongly throw when there was trouble with the transaction.
+ */
+ @NonNull
public RuntimeException rethrowAsRuntimeException() {
throw new RuntimeException(this);
}
@@ -52,10 +60,8 @@
* state or making security decisions based on the perceived success or
* failure of a call, or any default values returned. For this reason, we
* want to strongly throw when there was trouble with the transaction.
- *
- * @hide
*/
- @UnsupportedAppUsage
+ @NonNull
public RuntimeException rethrowFromSystemServer() {
if (this instanceof DeadObjectException) {
throw new RuntimeException(new DeadSystemException());
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index c707ba8..0bf634e 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -1892,6 +1892,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public static void conditionallyCheckInstanceCounts() {
VmPolicy policy = getVmPolicy();
@@ -2751,6 +2752,7 @@
}
/** Create an instance of ViolationInfo initialized from a Parcel. */
+ @UnsupportedAppUsage
public ViolationInfo(Parcel in) {
this(in, false);
}
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index 3558fcd..537cb98 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -198,6 +198,7 @@
* "it's system", because of isolated UIDs. Use {@link #isCore} for that.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static boolean isApp(int uid) {
if (uid > 0) {
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index b096049..bb62eb2 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -18,6 +18,8 @@
import android.Manifest;
import android.accounts.AccountManager;
+import android.annotation.ColorInt;
+import android.annotation.DrawableRes;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -76,6 +78,57 @@
private final Context mContext;
private Boolean mIsManagedProfileCached;
+ private Boolean mIsProfileCached;
+
+ /**
+ * User type representing a {@link UserHandle#USER_SYSTEM system} user that is a human user.
+ * This type of user cannot be created; it can only pre-exist on first boot.
+ * @hide
+ */
+ public static final String USER_TYPE_FULL_SYSTEM = "android.os.usertype.full.SYSTEM";
+
+ /**
+ * User type representing a regular non-profile non-{@link UserHandle#USER_SYSTEM system} human
+ * user.
+ * This is sometimes called an ordinary 'secondary user'.
+ * @hide
+ */
+ public static final String USER_TYPE_FULL_SECONDARY = "android.os.usertype.full.SECONDARY";
+
+ /**
+ * User type representing a guest user that may be transient.
+ * @hide
+ */
+ public static final String USER_TYPE_FULL_GUEST = "android.os.usertype.full.GUEST";
+
+ /**
+ * User type representing a user for demo purposes only, which can be removed at any time.
+ * @hide
+ */
+ public static final String USER_TYPE_FULL_DEMO = "android.os.usertype.full.DEMO";
+
+ /**
+ * User type representing a "restricted profile" user, which is a full user that is subject to
+ * certain restrictions from a parent user. Note, however, that it is NOT technically a profile.
+ * @hide
+ */
+ public static final String USER_TYPE_FULL_RESTRICTED = "android.os.usertype.full.RESTRICTED";
+
+ /**
+ * User type representing a managed profile, which is a profile that is to be managed by a
+ * device policy controller (DPC).
+ * The intended purpose is for work profiles, which are managed by a corporate entity.
+ * @hide
+ */
+ public static final String USER_TYPE_PROFILE_MANAGED = "android.os.usertype.profile.MANAGED";
+
+ /**
+ * User type representing a {@link UserHandle#USER_SYSTEM system} user that is <b>not</b> a
+ * human user.
+ * This type of user cannot be created; it can only pre-exist on first boot.
+ * @hide
+ */
+ public static final String USER_TYPE_SYSTEM_HEADLESS = "android.os.usertype.system.HEADLESS";
/**
* @hide
@@ -1306,8 +1359,11 @@
mContext.getContentResolver(),
Settings.Global.ALLOW_USER_SWITCHING_WHEN_SYSTEM_USER_LOCKED, 0) != 0;
boolean isSystemUserUnlocked = isUserUnlocked(UserHandle.SYSTEM);
- boolean inCall = TelephonyManager.getDefault().getCallState()
- != TelephonyManager.CALL_STATE_IDLE;
+ boolean inCall = false;
+ TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+ if (telephonyManager != null) {
+ inCall = telephonyManager.getCallState() != TelephonyManager.CALL_STATE_IDLE;
+ }
boolean isUserSwitchDisallowed = hasUserRestriction(DISALLOW_USER_SWITCH);
return (allowUserSwitchingWhenSystemUserLocked || isSystemUserUnlocked) && !inCall
&& !isUserSwitchDisallowed;
@@ -1479,6 +1535,79 @@
}
/**
+ * Returns the calling user's user type.
+ *
+ * // TODO(b/142482943): Decide on the appropriate permission requirements.
+ *
+ * @return the name of the user type, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
+ * @hide
+ */
+ public @NonNull String getUserType() {
+ try {
+ return mService.getUserTypeForUser(UserHandle.myUserId());
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Returns the given user's user type.
+ *
+ * // TODO(b/142482943): Decide on the appropriate permission requirements.
+ * Requires {@link android.Manifest.permission#MANAGE_USERS} or
+ * {@link android.Manifest.permission#INTERACT_ACROSS_USERS} permission, otherwise the caller
+ * must be in the same profile group of specified user.
+ *
+ * @param userHandle the user handle of the user whose type is being requested.
+ * @return the name of the user's user type, e.g. {@link UserManager#USER_TYPE_PROFILE_MANAGED},
+ * or {@code null} if there is no such user.
+ * @hide
+ */
+ @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS,
+ android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)
+ public @Nullable String getUserTypeForUser(@NonNull UserHandle userHandle) {
+ try {
+ return mService.getUserTypeForUser(userHandle.getIdentifier());
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Returns whether the user type is a
+ * {@link UserManager#USER_TYPE_PROFILE_MANAGED managed profile}.
+ * @hide
+ */
+ public static boolean isUserTypeManagedProfile(String userType) {
+ return USER_TYPE_PROFILE_MANAGED.equals(userType);
+ }
+
+ /**
+ * Returns whether the user type is a {@link UserManager#USER_TYPE_FULL_GUEST guest user}.
+ * @hide
+ */
+ public static boolean isUserTypeGuest(String userType) {
+ return USER_TYPE_FULL_GUEST.equals(userType);
+ }
+
+ /**
+ * Returns whether the user type is a
+ * {@link UserManager#USER_TYPE_FULL_RESTRICTED restricted user}.
+ * @hide
+ */
+ public static boolean isUserTypeRestricted(String userType) {
+ return USER_TYPE_FULL_RESTRICTED.equals(userType);
+ }
+
+ /**
+ * Returns whether the user type is a {@link UserManager#USER_TYPE_FULL_DEMO demo user}.
+ * @hide
+ */
+ public static boolean isUserTypeDemo(String userType) {
+ return USER_TYPE_FULL_DEMO.equals(userType);
+ }
+
+ /**
* @hide
* @deprecated Use {@link #isRestrictedProfile()}
*/
@@ -1589,6 +1718,48 @@
}
/**
+ * Checks if the calling app is running in a profile.
+ *
+ * @return whether the caller is in a profile.
+ * @hide
+ */
+ public boolean isProfile() {
+ // No need for synchronization. Once it becomes non-null, it'll be non-null forever.
+ // Worst case we might end up calling the AIDL method multiple times but that's fine.
+ if (mIsProfileCached != null) {
+ return mIsProfileCached;
+ }
+ try {
+ mIsProfileCached = mService.isProfile(UserHandle.myUserId());
+ return mIsProfileCached;
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Checks if the specified user is a profile.
+ *
+ * Requires {@link android.Manifest.permission#MANAGE_USERS} or
+ * {@link android.Manifest.permission#INTERACT_ACROSS_USERS} permission, otherwise the caller
+ * must be in the same profile group of specified user.
+ *
+ * @return whether the specified user is a profile.
+ * @hide
+ */
+ @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS,
+ android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)
+ public boolean isProfile(@UserIdInt int userId) {
+ if (userId == UserHandle.myUserId()) {
+ return isProfile();
+ }
+ try {
+ return mService.isProfile(userId);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+ /**
* Checks if the calling app is running in a managed profile.
*
* @return whether the caller is in a managed profile.
@@ -1612,7 +1783,8 @@
/**
* Checks if the specified user is a managed profile.
- * Requires {@link android.Manifest.permission#MANAGE_USERS} permission, otherwise the caller
+ * Requires {@link android.Manifest.permission#MANAGE_USERS} or
+ * {@link android.Manifest.permission#INTERACT_ACROSS_USERS} permission, otherwise the caller
* must be in the same profile group of specified user.
*
* @return whether the specified user is a managed profile.
@@ -1632,23 +1804,6 @@
}
/**
- * Gets badge for a managed profile.
- * Requires {@link android.Manifest.permission#MANAGE_USERS} permission, otherwise the caller
- * must be in the same profile group of specified user.
- *
- * @return which badge to use for the managed profile badge id will be less than
- * UserManagerService.getMaxManagedProfiles()
- * @hide
- */
- public int getManagedProfileBadge(@UserIdInt int userId) {
- try {
- return mService.getManagedProfileBadge(userId);
- } catch (RemoteException re) {
- throw re.rethrowFromSystemServer();
- }
- }
-
- /**
* Checks if the calling app is running as an ephemeral user.
*
* @return whether the caller is an ephemeral user.
@@ -2120,23 +2275,44 @@
/**
* Creates a user with the specified name and options. For non-admin users, default user
+ * restrictions are going to be applied.
+ * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
+ *
+ * @param name the user's name
+ * @param flags UserInfo flags that identify the type of user and other properties.
+ * @see UserInfo
+ *
+ * @return the UserInfo object for the created user, or null if the user could not be created.
+ * @throws IllegalArgumentException if flags do not correspond to a valid user type.
+ * @deprecated Use {@link #createUser(String, String, int)} instead.
+ * @hide
+ */
+ @UnsupportedAppUsage
+ @Deprecated
+ public @Nullable UserInfo createUser(@Nullable String name, @UserInfoFlag int flags) {
+ return createUser(name, UserInfo.getDefaultUserType(flags), flags);
+ }
+
+ /**
+ * Creates a user with the specified name and options. For non-admin users, default user
* restrictions will be applied.
*
* <p>Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
*
* @param name the user's name
- * @param flags UserInfo flags that identify the type of user and other properties.
+ * @param userType the type of user, such as {@link UserManager#USER_TYPE_FULL_GUEST}.
+ * @param flags UserInfo flags that specify user properties.
* @see UserInfo
*
* @return the UserInfo object for the created user, or {@code null} if the user could not be
* created.
* @hide
*/
- @UnsupportedAppUsage
- public @Nullable UserInfo createUser(@Nullable String name, @UserInfoFlag int flags) {
+ public @Nullable UserInfo createUser(@Nullable String name, @NonNull String userType,
+ @UserInfoFlag int flags) {
UserInfo user = null;
try {
- user = mService.createUser(name, flags);
+ user = mService.createUser(name, userType, flags);
// TODO: Keep this in sync with
// UserManagerService.LocalService.createUserEvenWhenDisallowed
if (user != null && !user.isAdmin() && !user.isDemo()) {
@@ -2150,19 +2326,17 @@
}
/**
- * Pre-creates a user with the specified name and options. For non-admin users, default user
+ * Pre-creates a user of the specified type. For non-admin users, default user
* restrictions will be applied.
*
* <p>This method can be used by OEMs to "warm" up the user creation by pre-creating some users
* at the first boot, so they when the "real" user is created (for example,
- * by {@link #createUser(String, int)} or {@link #createGuest(Context, String)}), it takes
- * less time.
+ * by {@link #createUser(String, String, int)} or {@link #createGuest(Context, String)}), it
+ * takes less time.
*
* <p>Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
*
- * @param flags UserInfo flags that identify the type of user and other properties.
- * @see UserInfo
- *
+ * @param userType the type of user, such as {@link UserManager#USER_TYPE_FULL_GUEST}.
* @return the UserInfo object for the created user, or {@code null} if the user could not be
* created.
*
@@ -2171,9 +2345,9 @@
*
* @hide
*/
- public @Nullable UserInfo preCreateUser(@UserInfoFlag int flags) {
+ public @Nullable UserInfo preCreateUser(@NonNull String userType) {
try {
- return mService.preCreateUser(flags);
+ return mService.preCreateUser(userType);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
@@ -2188,7 +2362,7 @@
public UserInfo createGuest(Context context, String name) {
UserInfo guest = null;
try {
- guest = mService.createUser(name, UserInfo.FLAG_GUEST);
+ guest = mService.createUser(name, USER_TYPE_FULL_GUEST, 0);
if (guest != null) {
Settings.Secure.putStringForUser(context.getContentResolver(),
Settings.Secure.SKIP_FIRST_USE_HINTS, "1", guest.id);
@@ -2202,6 +2376,7 @@
/**
* Creates a user with the specified name and options as a profile of another user.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
+ * The type of profile must be specified using the given flags.
*
* @param name the user's name
* @param flags flags that identify the type of user and other properties.
@@ -2209,20 +2384,44 @@
*
* @return the {@link UserInfo} object for the created user, or null if the user
* could not be created.
+ * @throws IllegalArgumentException if flags do not correspond to a valid user type.
+ * @deprecated Use {@link #createProfileForUser(String, String, int, int)} instead.
* @hide
*/
@UnsupportedAppUsage
- public UserInfo createProfileForUser(String name, int flags, @UserIdInt int userId) {
- return createProfileForUser(name, flags, userId, null);
+ @Deprecated
+ public UserInfo createProfileForUser(String name, @UserInfoFlag int flags,
+ @UserIdInt int userId) {
+ return createProfileForUser(name, UserInfo.getDefaultUserType(flags), flags,
+ userId, null);
}
/**
- * Version of {@link #createProfileForUser(String, int, int)} that allows you to specify
+ * Creates a user with the specified name and options as a profile of another user.
+ * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
+ *
+ * @param name the user's name
+ * @param userType the type of user, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
+ * @param flags UserInfo flags that specify user properties.
+ * @param userId new user will be a profile of this user.
+ *
+ * @return the {@link UserInfo} object for the created user, or null if the user
+ * could not be created.
+ * @hide
+ */
+ public UserInfo createProfileForUser(String name, @NonNull String userType,
+ @UserInfoFlag int flags, @UserIdInt int userId) {
+ return createProfileForUser(name, userType, flags, userId, null);
+ }
+
+ /**
+ * Version of {@link #createProfileForUser(String, String, int, int)} that allows you to specify
* any packages that should not be installed in the new profile by default, these packages can
* still be installed later by the user if needed.
*
* @param name the user's name
- * @param flags flags that identify the type of user and other properties.
+ * @param userType the type of user, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
+ * @param flags UserInfo flags that specify user properties.
* @param userId new user will be a profile of this user.
* @param disallowedPackages packages that will not be installed in the profile being created.
*
@@ -2230,28 +2429,29 @@
* could not be created.
* @hide
*/
- public UserInfo createProfileForUser(String name, int flags, @UserIdInt int userId,
- String[] disallowedPackages) {
+ public UserInfo createProfileForUser(String name, @NonNull String userType,
+ @UserInfoFlag int flags, @UserIdInt int userId, String[] disallowedPackages) {
try {
- return mService.createProfileForUser(name, flags, userId, disallowedPackages);
+ return mService.createProfileForUser(name, userType, flags, userId, disallowedPackages);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
/**
- * Similar to {@link #createProfileForUser(String, int, int, String[])}
+ * Similar to {@link #createProfileForUser(String, String, int, int, String[])}
* except bypassing the checking of {@link UserManager#DISALLOW_ADD_MANAGED_PROFILE}.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
*
- * @see #createProfileForUser(String, int, int, String[])
+ * @see #createProfileForUser(String, String, int, int, String[])
* @hide
*/
- public UserInfo createProfileForUserEvenWhenDisallowed(String name, int flags,
- @UserIdInt int userId, String[] disallowedPackages) {
+ public UserInfo createProfileForUserEvenWhenDisallowed(String name,
+ @NonNull String userType, @UserInfoFlag int flags, @UserIdInt int userId,
+ String[] disallowedPackages) {
try {
- return mService.createProfileForUserEvenWhenDisallowed(name, flags, userId,
- disallowedPackages);
+ return mService.createProfileForUserEvenWhenDisallowed(name, userType, flags,
+ userId, disallowedPackages);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
@@ -2595,6 +2795,8 @@
* @hide
*/
public boolean canAddMoreUsers() {
+ // TODO(b/142482943): UMS has different logic, excluding Demo and Profile from counting. Why
+ // not here? The logic is inconsistent. See UMS.canAddMoreManagedProfiles
final List<UserInfo> users = getUsers(true);
final int totalUserCount = users.size();
int aliveUserCount = 0;
@@ -2625,6 +2827,22 @@
}
/**
+ * Checks whether it's possible to add more profiles of the given type to the given user.
+ *
+ * @param userType the type of user, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
+ * @return true if more profiles can be added, false if limit has been reached.
+ * @hide
+ */
+ @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
+ public boolean canAddMoreProfilesToUser(@NonNull String userType, @UserIdInt int userId) {
+ try {
+ return mService.canAddMoreProfilesToUser(userType, userId, false);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Returns list of the profiles of userId including userId itself.
* Note that this returns both enabled and not enabled profiles. See
* {@link #getEnabledProfiles(int)} if you need only the enabled ones.
@@ -2858,8 +3076,112 @@
}
/**
- * If the target user is a managed profile of the calling user or the caller
- * is itself a managed profile, then this returns a badged copy of the given
+ * Returns whether the given user has a badge (generally to put on profiles' icons).
+ *
+ * @param userId userId of the user in question
+ * @return true if the user's icons should display a badge; false otherwise.
+ *
+ * @see #getBadgedIconForUser more information about badging in general
+ * @hide
+ */
+ public boolean hasBadge(@UserIdInt int userId) {
+ if (!isProfile(userId)) {
+ // Since currently only profiles actually have badges, we can do this optimization.
+ return false;
+ }
+ try {
+ return mService.hasBadge(userId);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Returns whether the calling app's user has a badge (generally to put on profiles' icons).
+ *
+ * @return true if the user's icons should display a badge; false otherwise.
+ *
+ * @see #getBadgedIconForUser more information about badging in general
+ * @hide
+ */
+ public boolean hasBadge() {
+ return hasBadge(UserHandle.myUserId());
+ }
+
+ /**
+ * Returns the badge color for the given user (generally to color a profile's icon's badge).
+ *
+ * <p>To check whether a badge color is expected for the user, first call {@link #hasBadge}.
+ *
+ * @return the color (not the resource ID) to be used for the user's badge
+ * @throws Resources.NotFoundException if no valid badge color exists for this user
+ *
+ * @see #getBadgedIconForUser more information about badging in general
+ * @hide
+ */
+ public @ColorInt int getUserBadgeColor(@UserIdInt int userId) {
+ try {
+ final int resourceId = mService.getUserBadgeColorResId(userId);
+ return Resources.getSystem().getColor(resourceId, null);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Returns the Resource ID of the user's icon badge.
+ *
+ * @return the Resource ID of the user's icon badge if it has one; otherwise
+ * {@link Resources#ID_NULL}.
+ *
+ * @see #getBadgedIconForUser more information about badging in general
+ * @hide
+ */
+ public @DrawableRes int getUserIconBadgeResId(@UserIdInt int userId) {
+ try {
+ return mService.getUserIconBadgeResId(userId);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Returns the Resource ID of the user's badge.
+ *
+ * @return the Resource ID of the user's badge if it has one; otherwise
+ * {@link Resources#ID_NULL}.
+ *
+ * @see #getBadgedIconForUser more information about badging in general
+ * @hide
+ */
+ public @DrawableRes int getUserBadgeResId(@UserIdInt int userId) {
+ try {
+ return mService.getUserBadgeResId(userId);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Returns the Resource ID of the user's badge without a background.
+ *
+ * @return the Resource ID of the user's no-background badge if it has one; otherwise
+ * {@link Resources#ID_NULL}.
+ *
+ * @see #getBadgedIconForUser more information about badging in general
+ * @hide
+ */
+ public @DrawableRes int getUserBadgeNoBackgroundResId(@UserIdInt int userId) {
+ try {
+ return mService.getUserBadgeNoBackgroundResId(userId);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * If the target user is a profile of the calling user or the caller
+ * is itself a profile, then this returns a badged copy of the given
* icon to be able to distinguish it from the original icon. For badging an
* arbitrary drawable use {@link #getBadgedDrawableForUser(
* android.graphics.drawable.Drawable, UserHandle, android.graphics.Rect, int)}.
@@ -2880,8 +3202,8 @@
}
/**
- * If the target user is a managed profile of the calling user or the caller
- * is itself a managed profile, then this returns a badged copy of the given
+ * If the target user is a profile of the calling user or the caller
+ * is itself a profile, then this returns a badged copy of the given
* drawable allowing the user to distinguish it from the original drawable.
* The caller can specify the location in the bounds of the drawable to be
* badged where the badge should be applied as well as the density of the
@@ -2911,11 +3233,15 @@
}
/**
- * If the target user is a managed profile of the calling user or the caller
- * is itself a managed profile, then this returns a copy of the label with
+ * If the target user is a profile of the calling user or the caller
+ * is itself a profile, then this returns a copy of the label with
* badging for accessibility services like talkback. E.g. passing in "Email"
* and it might return "Work Email" for Email in the work profile.
*
+ * <p>Requires {@link android.Manifest.permission#MANAGE_USERS} or
+ * {@link android.Manifest.permission#INTERACT_ACROSS_USERS} permission, otherwise the caller
+ * must be in the same profile group of specified user.
+ *
* @param label The label to change.
* @param user The target user.
* @return A label that combines the original label and a badge as
@@ -2923,7 +3249,16 @@
* @removed
*/
public CharSequence getBadgedLabelForUser(CharSequence label, UserHandle user) {
- return mContext.getPackageManager().getUserBadgedLabel(label, user);
+ final int userId = user.getIdentifier();
+ if (!hasBadge(userId)) {
+ return label;
+ }
+ try {
+ final int resourceId = mService.getUserBadgeLabelResId(userId);
+ return Resources.getSystem().getString(resourceId, label);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
}
/**
diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java
index 26da0a0..5769c34 100644
--- a/core/java/android/os/VibrationEffect.java
+++ b/core/java/android/os/VibrationEffect.java
@@ -27,6 +27,8 @@
import android.net.Uri;
import android.util.MathUtils;
+import dalvik.annotation.compat.UnsupportedAppUsage;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays;
@@ -77,6 +79,7 @@
* @see #get(int)
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final int EFFECT_THUD = Effect.THUD;
@@ -85,6 +88,7 @@
* @see #get(int)
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final int EFFECT_POP = Effect.POP;
@@ -126,6 +130,7 @@
* @see #get(Uri, Context)
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final int[] RINGTONES = {
Effect.RINGTONE_1,
@@ -493,6 +498,7 @@
out.writeInt(mAmplitude);
}
+ @UnsupportedAppUsage
public static final @android.annotation.NonNull Parcelable.Creator<OneShot> CREATOR =
new Parcelable.Creator<OneShot>() {
@Override
diff --git a/core/java/android/os/WorkSource.java b/core/java/android/os/WorkSource.java
index 9cc9aac..825fc64 100644
--- a/core/java/android/os/WorkSource.java
+++ b/core/java/android/os/WorkSource.java
@@ -92,6 +92,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public WorkSource(int uid) {
mNum = 1;
@@ -138,12 +139,14 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public int size() {
return mNum;
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public int get(int index) {
return mUids[index];
@@ -165,6 +168,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public String getName(int index) {
return mNames != null ? mNames[index] : null;
@@ -419,6 +423,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public boolean add(int uid) {
if (mNum <= 0) {
@@ -439,6 +444,7 @@
}
/** @hide */
+ @UnsupportedAppUsage
@TestApi
public boolean add(int uid, String name) {
if (mNum <= 0) {
diff --git a/core/java/android/os/health/HealthStatsParceler.java b/core/java/android/os/health/HealthStatsParceler.java
index de98359..384342c 100644
--- a/core/java/android/os/health/HealthStatsParceler.java
+++ b/core/java/android/os/health/HealthStatsParceler.java
@@ -19,10 +19,8 @@
import android.annotation.TestApi;
import android.os.Parcel;
import android.os.Parcelable;
-import android.util.ArrayMap;
-import java.util.Arrays;
-import java.util.Map;
+import dalvik.annotation.compat.UnsupportedAppUsage;
/**
* Class to allow sending the HealthStats through aidl generated glue.
@@ -41,6 +39,7 @@
private HealthStatsWriter mWriter;
private HealthStats mHealthStats;
+ @UnsupportedAppUsage
public static final @android.annotation.NonNull Parcelable.Creator<HealthStatsParceler> CREATOR
= new Parcelable.Creator<HealthStatsParceler>() {
public HealthStatsParceler createFromParcel(Parcel in) {
diff --git a/core/java/android/os/image/DynamicSystemManager.java b/core/java/android/os/image/DynamicSystemManager.java
index 0e00d5e..4c92c28 100644
--- a/core/java/android/os/image/DynamicSystemManager.java
+++ b/core/java/android/os/image/DynamicSystemManager.java
@@ -101,6 +101,19 @@
}
}
/**
+ * Start DynamicSystem installation.
+ *
+ * @return true if the call succeeds
+ */
+ @RequiresPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
+ public boolean startInstallation() {
+ try {
+ return mService.startInstallation();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e.toString());
+ }
+ }
+ /**
* Start DynamicSystem installation. This call may take an unbounded amount of time. The caller
* may use another thread to call the getStartProgress() to get the progress.
*
@@ -112,9 +125,9 @@
* true.
*/
@RequiresPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
- public Session startInstallation(String name, long size, boolean readOnly) {
+ public Session createPartition(String name, long size, boolean readOnly) {
try {
- if (mService.startInstallation(name, size, readOnly)) {
+ if (mService.createPartition(name, size, readOnly)) {
return new Session();
} else {
return null;
@@ -123,7 +136,18 @@
throw new RuntimeException(e.toString());
}
}
-
+ /**
+ * Finish a previously started installation. Installations without a cooresponding
+ * finishInstallation() will be cleaned up during device boot.
+ */
+ @RequiresPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)
+ public boolean finishInstallation() {
+ try {
+ return mService.finishInstallation();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e.toString());
+ }
+ }
/**
* Query the progress of the current installation operation. This can be called while the
* installation is in progress.
diff --git a/core/java/android/os/image/IDynamicSystemService.aidl b/core/java/android/os/image/IDynamicSystemService.aidl
index 75f6785..69cbab2 100644
--- a/core/java/android/os/image/IDynamicSystemService.aidl
+++ b/core/java/android/os/image/IDynamicSystemService.aidl
@@ -21,15 +21,26 @@
interface IDynamicSystemService
{
/**
- * Start DynamicSystem installation. This call may take 60~90 seconds. The caller
+ * Start DynamicSystem installation.
+ * @return true if the call succeeds
+ */
+ boolean startInstallation();
+
+ /**
+ * Create a DSU partition. This call may take 60~90 seconds. The caller
* may use another thread to call the getStartProgress() to get the progress.
- *
* @param name The DSU partition name
* @param size Size of the DSU image in bytes
* @param readOnly True if this partition is readOnly
* @return true if the call succeeds
*/
- boolean startInstallation(@utf8InCpp String name, long size, boolean readOnly);
+ boolean createPartition(@utf8InCpp String name, long size, boolean readOnly);
+
+ /**
+ * Finish a previously started installation. Installations without
+ * a cooresponding finishInstallation() will be cleaned up during device boot.
+ */
+ boolean finishInstallation();
/**
* Query the progress of the current installation operation. This can be called while
diff --git a/core/java/android/os/incremental/IIncrementalService.aidl b/core/java/android/os/incremental/IIncrementalService.aidl
new file mode 100644
index 0000000..1c832ca
--- /dev/null
+++ b/core/java/android/os/incremental/IIncrementalService.aidl
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os.incremental;
+
+import android.os.incremental.IncrementalDataLoaderParamsParcel;
+
+/** @hide */
+interface IIncrementalService {
+ /**
+ * A set of flags for the |createMode| parameters when creating a new Incremental storage.
+ */
+ const int CREATE_MODE_TEMPORARY_BIND = 1;
+ const int CREATE_MODE_PERMANENT_BIND = 2;
+ const int CREATE_MODE_CREATE = 4;
+ const int CREATE_MODE_OPEN_EXISTING = 8;
+
+ /**
+ * Opens or creates a storage given a target path and data loader params. Returns the storage ID.
+ */
+ int openStorage(in @utf8InCpp String path);
+ int createStorage(in @utf8InCpp String path, in IncrementalDataLoaderParamsParcel params, int createMode);
+ int createLinkedStorage(in @utf8InCpp String path, int otherStorageId, int createMode);
+
+ /**
+ * Bind-mounts a path under a storage to a full path. Can be permanent or temporary.
+ */
+ const int BIND_TEMPORARY = 0;
+ const int BIND_PERMANENT = 1;
+ int makeBindMount(int storageId, in @utf8InCpp String pathUnderStorage, in @utf8InCpp String targetFullPath, int bindType);
+
+ /**
+ * Deletes an existing bind mount on a path under a storage. Returns 0 on success, and -errno on failure.
+ */
+ int deleteBindMount(int storageId, in @utf8InCpp String targetFullPath);
+
+ /**
+ * Creates a directory under a storage. The target directory is specified by its relative path under the storage.
+ */
+ int makeDirectory(int storageId, in @utf8InCpp String pathUnderStorage);
+
+ /**
+ * Creates a file under a storage, specifying its name, size and metadata.
+ */
+ int makeFile(int storageId, in @utf8InCpp String pathUnderStorage, long size, in byte[] metadata);
+
+ /**
+ * Creates a file under a storage. Content of the file is from a range inside another file.
+ * Both files are specified by relative paths under storage.
+ */
+ int makeFileFromRange(int storageId, in @utf8InCpp String targetPathUnderStorage, in @utf8InCpp String sourcePathUnderStorage, long start, long end);
+
+ /**
+ * Creates a hard link between two files in a storage.
+ * Both source and destination are specified by relative paths under storage.
+ */
+ int makeLink(int storageId, in @utf8InCpp String sourcePathUnderStorage, in @utf8InCpp String destPathUnderStorage);
+
+ /**
+ * Deletes a hard link in a storage, specified by the relative path of the link target under storage.
+ */
+ int unlink(int storageId, in @utf8InCpp String pathUnderStorage);
+
+ /**
+ * Checks if a file's certain range is loaded. File is specified by relative file path under storage.
+ */
+ boolean isFileRangeLoaded(int storageId, in @utf8InCpp String pathUnderStorage, long start, long end);
+
+ /**
+ * Reads the metadata of a file. File is specified by relative path under storage.
+ */
+ byte[] getFileMetadata(int storageId, in @utf8InCpp String pathUnderStorage);
+
+ /**
+ * Returns the list of file paths under a storage.
+ */
+ @utf8InCpp String[] getFileList(int storageId);
+
+ /**
+ * Starts loading data for a storage.
+ */
+ boolean startLoading(int storageId);
+}
diff --git a/core/java/android/os/incremental/IIncrementalServiceProxy.aidl b/core/java/android/os/incremental/IIncrementalServiceProxy.aidl
new file mode 100644
index 0000000..12740ea
--- /dev/null
+++ b/core/java/android/os/incremental/IIncrementalServiceProxy.aidl
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os.incremental;
+
+import android.os.incremental.IncrementalFileSystemControlParcel;
+import android.os.incremental.IncrementalDataLoaderParamsParcel;
+import android.service.incremental.IIncrementalDataLoaderStatusListener;
+
+/**
+ * Binder service to receive calls from native Incremental Service and handle Java tasks such as
+ * looking up data loader service package names, binding and talking to the data loader service.
+ * @hide
+ */
+interface IIncrementalServiceProxy {
+ boolean prepareDataLoader(int mountId,
+ in IncrementalFileSystemControlParcel control,
+ in IncrementalDataLoaderParamsParcel params,
+ in IIncrementalDataLoaderStatusListener listener);
+ boolean startDataLoader(int mountId);
+ void showHealthBlockedUI(int mountId);
+ void destroyDataLoader(int mountId);
+ void newFileForDataLoader(int mountId, long inode, in byte[] metadata);
+}
diff --git a/core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl b/core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl
new file mode 100644
index 0000000..50c28f0
--- /dev/null
+++ b/core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os.incremental;
+
+import android.os.incremental.NamedParcelFileDescriptor;
+
+/**
+ * Class for holding data loader configuration parameters.
+ * @hide
+ */
+parcelable IncrementalDataLoaderParamsParcel {
+ @utf8InCpp String staticUri;
+ @utf8InCpp String packageName;
+ NamedParcelFileDescriptor[] dynamicArgs;
+}
diff --git a/core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl b/core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl
new file mode 100644
index 0000000..0ae353d
--- /dev/null
+++ b/core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os.incremental;
+
+/**
+ * Wraps two file descriptors that Incremental Service uses to communicate
+ * with Incremental FileSystem.
+ * @hide
+ */
+parcelable IncrementalFileSystemControlParcel {
+ @nullable ParcelFileDescriptor cmd;
+ @nullable ParcelFileDescriptor log;
+}
diff --git a/core/java/android/os/incremental/NamedParcelFileDescriptor.aidl b/core/java/android/os/incremental/NamedParcelFileDescriptor.aidl
new file mode 100644
index 0000000..038ced1
--- /dev/null
+++ b/core/java/android/os/incremental/NamedParcelFileDescriptor.aidl
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os.incremental;
+
+import android.os.ParcelFileDescriptor;
+
+/**
+ * A named ParcelFileDescriptor.
+ * @hide
+ */
+parcelable NamedParcelFileDescriptor {
+ @utf8InCpp String name;
+ ParcelFileDescriptor fd;
+}
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 2d8af83..ac7a0a8 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -779,7 +779,12 @@
/** {@hide} */
public @Nullable VolumeInfo findPrivateForEmulated(VolumeInfo emulatedVol) {
if (emulatedVol != null) {
- return findVolumeById(emulatedVol.getId().replace("emulated", "private"));
+ String id = emulatedVol.getId();
+ int idx = id.indexOf(";");
+ if (idx != -1) {
+ id = id.substring(0, idx);
+ }
+ return findVolumeById(id.replace("emulated", "private"));
} else {
return null;
}
@@ -789,7 +794,8 @@
@UnsupportedAppUsage
public @Nullable VolumeInfo findEmulatedForPrivate(VolumeInfo privateVol) {
if (privateVol != null) {
- return findVolumeById(privateVol.getId().replace("private", "emulated"));
+ return findVolumeById(privateVol.getId().replace("private", "emulated") + ";"
+ + mContext.getUserId());
} else {
return null;
}
diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java
index 6280600..aefe843 100644
--- a/core/java/android/os/storage/StorageVolume.java
+++ b/core/java/android/os/storage/StorageVolume.java
@@ -173,6 +173,7 @@
* @return the mount path
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public String getPath() {
return mPath.toString();
diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java
index 7699a05..d6ec52f 100644
--- a/core/java/android/os/storage/VolumeInfo.java
+++ b/core/java/android/os/storage/VolumeInfo.java
@@ -266,7 +266,7 @@
@UnsupportedAppUsage
public @Nullable String getDescription() {
- if (ID_PRIVATE_INTERNAL.equals(id) || ID_EMULATED_INTERNAL.equals(id)) {
+ if (ID_PRIVATE_INTERNAL.equals(id) || id.startsWith(ID_EMULATED_INTERNAL + ";")) {
return Resources.getSystem().getString(com.android.internal.R.string.storage_internal);
} else if (!TextUtils.isEmpty(fsLabel)) {
return fsLabel;
@@ -301,13 +301,20 @@
}
public boolean isVisibleForUser(int userId) {
- if ((type == TYPE_PUBLIC || type == TYPE_STUB) && mountUserId == userId) {
+ if ((type == TYPE_PUBLIC || type == TYPE_STUB || type == TYPE_EMULATED)
+ && mountUserId == userId) {
return isVisible();
- } else if (type == TYPE_EMULATED) {
- return isVisible();
- } else {
- return false;
}
+ return false;
+ }
+
+ /**
+ * Returns {@code true} if this volume is the primary emulated volume for {@code userId},
+ * {@code false} otherwise.
+ */
+ @UnsupportedAppUsage
+ public boolean isPrimaryEmulatedForUser(int userId) {
+ return id.equals(ID_EMULATED_INTERNAL + ";" + userId);
}
public boolean isVisibleForRead(int userId) {
@@ -390,7 +397,7 @@
derivedFsUuid = privateVol.fsUuid;
}
- if (ID_EMULATED_INTERNAL.equals(id)) {
+ if (isPrimaryEmulatedForUser(userId)) {
removable = false;
} else {
removable = true;
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index d862d602..7285166 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -1862,6 +1862,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String[] SYNC_WRITABLE_COLUMNS = new String[] {
_SYNC_ID,
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index af3a16c..f10e184 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -126,6 +126,7 @@
* Prefix for column names that are not visible to client apps.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String HIDDEN_COLUMN_PREFIX = "x_";
@@ -6069,6 +6070,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final Uri ENTERPRISE_CONTENT_URI =
Uri.withAppendedPath(Data.ENTERPRISE_CONTENT_URI, "phones");
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index aa67d97..01f9c73 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -104,7 +104,14 @@
/** The authority for the media provider */
public static final String AUTHORITY = "media";
/** A content:// style uri to the authority for the media provider */
- public static final @NonNull Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
+ public static final @NonNull Uri AUTHORITY_URI =
+ Uri.parse("content://" + AUTHORITY);
+
+ /** @hide */
+ public static final String AUTHORITY_LEGACY = "media_legacy";
+ /** @hide */
+ public static final @NonNull Uri AUTHORITY_LEGACY_URI =
+ Uri.parse("content://" + AUTHORITY_LEGACY);
/**
* Synthetic volume name that provides a view of all content across the
@@ -878,6 +885,16 @@
}
/**
+ * Rewrite the given {@link Uri} to point at
+ * {@link MediaStore#AUTHORITY_LEGACY}.
+ *
+ * @hide
+ */
+ public static @NonNull Uri rewriteToLegacy(@NonNull Uri uri) {
+ return uri.buildUpon().authority(MediaStore.AUTHORITY_LEGACY).build();
+ }
+
+ /**
* Common media metadata columns.
*/
public interface MediaColumns extends BaseColumns {
@@ -3477,11 +3494,15 @@
*/
public static @NonNull String getVolumeName(@NonNull Uri uri) {
final List<String> segments = uri.getPathSegments();
- if (uri.getAuthority().equals(AUTHORITY) && segments != null && segments.size() > 0) {
- return segments.get(0);
- } else {
- throw new IllegalArgumentException("Missing volume name: " + uri);
+ switch (uri.getAuthority()) {
+ case AUTHORITY:
+ case AUTHORITY_LEGACY: {
+ if (segments != null && segments.size() > 0) {
+ return segments.get(0);
+ }
+ }
}
+ throw new IllegalArgumentException("Missing volume name: " + uri);
}
/** {@hide} */
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 381d492..50dac46 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -836,9 +836,9 @@
* In some cases, a matching Activity may not exist, so ensure you
* safeguard against this.
* <p>
- * Input: Optionally, the Intent's data URI can specify the application package name to
- * directly invoke the management GUI specific to the package name. For example
- * "package:com.my.app".
+ * Input: Optionally, in versions of Android prior to 11, the Intent's data URI can specify the
+ * application package name to directly invoke the management GUI specific to the package name.
+ * For example "package:com.my.app".
* <p>
* Output: Nothing.
*/
@@ -1262,6 +1262,33 @@
= "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
/**
+ * Activity Action: Show notification listener permission settings page for app.
+ * <p>
+ * Users can grant and deny access to notifications for a {@link ComponentName} from here.
+ * See
+ * {@link android.app.NotificationManager#isNotificationListenerAccessGranted(ComponentName)}
+ * for more details.
+ * <p>
+ * Input: The extra {@link #EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME} containing the name
+ * of the component to grant or revoke notification listener access to.
+ * <p>
+ * Output: Nothing.
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS =
+ "android.settings.NOTIFICATION_LISTENER_DETAIL_SETTINGS";
+
+ /**
+ * Activity Extra: What component name to show the notification listener permission
+ * page for.
+ * <p>
+ * A string extra containing a {@link ComponentName}. This must be passed as an extra field to
+ * {@link #ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS}.
+ */
+ public static final String EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME =
+ "android.provider.extra.NOTIFICATION_LISTENER_COMPONENT_NAME";
+
+ /**
* Activity Action: Show Do Not Disturb access settings.
* <p>
* Users can grant and deny access to Do Not Disturb configuration from here. Managed
@@ -2060,6 +2087,7 @@
* This is the only type of reset available to non-system clients.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final int RESET_MODE_PACKAGE_DEFAULTS = 1;
@@ -6137,6 +6165,7 @@
* shortcut. Must be its flattened {@link ComponentName}.
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE =
"accessibility_shortcut_target_service";
@@ -6294,6 +6323,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED =
"accessibility_display_magnification_enabled";
@@ -7677,6 +7707,20 @@
public static final String SLEEP_TIMEOUT = "sleep_timeout";
/**
+ * The timeout in milliseconds before the device goes to sleep due to user inattentiveness,
+ * even if the system is holding wakelocks. It should generally be longer than {@code
+ * config_attentiveWarningDuration}, as otherwise the device will show the attentive
+ * warning constantly. Small timeouts are discouraged, as they will cause the device to
+ * go to sleep quickly after waking up.
+ * <p>
+ * Use -1 to disable this timeout.
+ * </p>
+ *
+ * @hide
+ */
+ public static final String ATTENTIVE_TIMEOUT = "attentive_timeout";
+
+ /**
* Controls whether double tap to wake is enabled.
* @hide
*/
@@ -7930,6 +7974,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners";
@@ -8077,6 +8122,7 @@
* The value is boolean (1 or 0).
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static final String NOTIFICATION_BADGING = "notification_badging";
@@ -8343,7 +8389,6 @@
INSTANT_APP_SETTINGS.add(ANDROID_ID);
- INSTANT_APP_SETTINGS.add(PACKAGE_VERIFIER_USER_CONSENT);
INSTANT_APP_SETTINGS.add(ALLOW_MOCK_LOCATION);
}
@@ -10053,25 +10098,26 @@
*/
public static final String MODE_RINGER = "mode_ringer";
- /**
- * Overlay display devices setting.
- * The associated value is a specially formatted string that describes the
- * size and density of simulated secondary display devices.
- * <p>
- * Format: {width}x{height}/{dpi};...
- * </p><p>
- * Example:
- * <ul>
- * <li><code>1280x720/213</code>: make one overlay that is 1280x720 at 213dpi.</li>
- * <li><code>1920x1080/320;1280x720/213</code>: make two overlays, the first
- * at 1080p and the second at 720p.</li>
- * <li>If the value is empty, then no overlay display devices are created.</li>
- * </ul></p>
- *
- * @hide
- */
- @TestApi
- public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices";
+ /**
+ * Overlay display devices setting.
+ * The associated value is a specially formatted string that describes the
+ * size and density of simulated secondary display devices.
+ * <p>
+ * Format: {width}x{height}/{dpi};...
+ * </p><p>
+ * Example:
+ * <ul>
+ * <li><code>1280x720/213</code>: make one overlay that is 1280x720 at 213dpi.</li>
+ * <li><code>1920x1080/320;1280x720/213</code>: make two overlays, the first
+ * at 1080p and the second at 720p.</li>
+ * <li>If the value is empty, then no overlay display devices are created.</li>
+ * </ul></p>
+ *
+ * @hide
+ */
+ @UnsupportedAppUsage
+ @TestApi
+ public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices";
/**
* Threshold values for the duration and level of a discharge cycle,
@@ -10720,6 +10766,7 @@
* @hide
* @see com.android.server.power.batterysaver.BatterySaverPolicy
*/
+ @UnsupportedAppUsage
@TestApi
public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants";
diff --git a/core/java/android/service/euicc/EuiccService.java b/core/java/android/service/euicc/EuiccService.java
index 12c2580..bc6a9e8 100644
--- a/core/java/android/service/euicc/EuiccService.java
+++ b/core/java/android/service/euicc/EuiccService.java
@@ -21,6 +21,7 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SdkConstant;
import android.annotation.SystemApi;
import android.app.Service;
import android.content.Intent;
@@ -104,6 +105,26 @@
"android.service.euicc.action.BIND_CARRIER_PROVISIONING_SERVICE";
/**
+ * Intent action sent by the LPA to launch a carrier app Activity for eSIM activation, e.g. a
+ * carrier login screen. Carrier apps wishing to support this activation method must implement
+ * an Activity that responds to this intent action. Upon completion, the Activity must return
+ * one of the following results to the LPA:
+ *
+ * <p>{@code Activity.RESULT_CANCELED}: The LPA should treat this as an back button and abort
+ * the activation flow.
+ * <p>{@code Activity.RESULT_OK}: The LPA should try to get an activation code from the carrier
+ * app by binding to the carrier app service implementing
+ * {@link #ACTION_BIND_CARRIER_PROVISIONING_SERVICE}.
+ * <p>{@code Activity.RESULT_OK} with
+ * {@link android.telephony.euicc.EuiccManager#EXTRA_USE_QR_SCANNER} set to true: The LPA should
+ * start a QR scanner for the user to scan an eSIM profile QR code.
+ * <p>For other results: The LPA should treat this as an error.
+ **/
+ @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_START_CARRIER_ACTIVATION =
+ "android.service.euicc.action.START_CARRIER_ACTIVATION";
+
+ /**
* @see android.telephony.euicc.EuiccManager#ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS
* The difference is this one is used by system to bring up the LUI.
*/
@@ -138,6 +159,15 @@
public static final String ACTION_RENAME_SUBSCRIPTION_PRIVILEGED =
"android.service.euicc.action.RENAME_SUBSCRIPTION_PRIVILEGED";
+ /**
+ * @see android.telephony.euicc.EuiccManager#ACTION_START_EUICC_ACTIVATION. This is
+ * a protected intent that can only be sent by the system, and requires the
+ * {@link android.Manifest.permission#BIND_EUICC_SERVICE} permission.
+ */
+ @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_START_EUICC_ACTIVATION =
+ "android.service.euicc.action.START_EUICC_ACTIVATION";
+
// LUI resolution actions. These are called by the platform to resolve errors in situations that
// require user interaction.
// TODO(b/33075886): Define extras for any input parameters to these dialogs once they are
@@ -516,7 +546,7 @@
* @see android.telephony.euicc.EuiccManager#eraseSubscriptions
*
* @deprecated From R, callers should specify a flag for specific set of subscriptions to erase
- * and use {@link #onEraseSubscriptionsWithOptions(int, int)} instead
+ * and use {@link #onEraseSubscriptions(int, int)} instead
*/
@Deprecated
public abstract int onEraseSubscriptions(int slotId);
@@ -533,7 +563,7 @@
* constants or any implementation-specific code starting with {@link #RESULT_FIRST_USER}.
* @see android.telephony.euicc.EuiccManager#eraseSubscriptionsWithOptions
*/
- public int onEraseSubscriptionsWithOptions(int slotIndex, @ResetOption int options) {
+ public int onEraseSubscriptions(int slotIndex, @ResetOption int options) {
throw new UnsupportedOperationException(
"This method must be overridden to enable the ResetOption parameter");
}
@@ -779,8 +809,7 @@
mExecutor.execute(new Runnable() {
@Override
public void run() {
- int result = EuiccService.this.onEraseSubscriptionsWithOptions(
- slotIndex, options);
+ int result = EuiccService.this.onEraseSubscriptions(slotIndex, options);
try {
callback.onComplete(result);
} catch (RemoteException e) {
diff --git a/core/java/android/service/incremental/IIncrementalDataLoaderService.aidl b/core/java/android/service/incremental/IIncrementalDataLoaderService.aidl
new file mode 100644
index 0000000..723fc59
--- /dev/null
+++ b/core/java/android/service/incremental/IIncrementalDataLoaderService.aidl
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.incremental;
+
+import android.os.incremental.IncrementalDataLoaderParamsParcel;
+import android.os.incremental.IncrementalFileSystemControlParcel;
+import android.service.incremental.IIncrementalDataLoaderStatusListener;
+
+/** @hide */
+oneway interface IIncrementalDataLoaderService {
+ void createDataLoader(in int storageId,
+ in IncrementalFileSystemControlParcel control,
+ in IncrementalDataLoaderParamsParcel params,
+ in IIncrementalDataLoaderStatusListener listener,
+ in boolean start);
+ void startDataLoader(in int storageId);
+ void stopDataLoader(in int storageId);
+ void destroyDataLoader(in int storageId);
+ void onFileCreated(in int storageId, in long inode, in byte[] metadata);
+}
diff --git a/core/java/android/service/incremental/IIncrementalDataLoaderStatusListener.aidl b/core/java/android/service/incremental/IIncrementalDataLoaderStatusListener.aidl
new file mode 100644
index 0000000..f04242d
--- /dev/null
+++ b/core/java/android/service/incremental/IIncrementalDataLoaderStatusListener.aidl
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.incremental;
+
+/**
+ * Callbacks from DataLoaderService to IncrementalService to report data loader status.
+ * @hide
+ */
+oneway interface IIncrementalDataLoaderStatusListener {
+ /** Data loader status */
+ const int DATA_LOADER_READY = 0;
+ const int DATA_LOADER_NOT_READY = 1;
+ const int DATA_LOADER_RUNNING = 2;
+ const int DATA_LOADER_STOPPED = 3;
+ const int DATA_LOADER_SLOW_CONNECTION = 4;
+ const int DATA_LOADER_NO_CONNECTION = 5;
+ const int DATA_LOADER_CONNECTION_OK = 6;
+
+ /** Data loader status callback */
+ void onStatusChanged(in int storageId, in int status);
+}
+
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index e784ad3..d5c6766 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -176,14 +176,10 @@
int mCurWindowPrivateFlags = mWindowPrivateFlags;
final Rect mVisibleInsets = new Rect();
final Rect mWinFrame = new Rect();
- final Rect mOverscanInsets = new Rect();
final Rect mContentInsets = new Rect();
final Rect mStableInsets = new Rect();
- final Rect mOutsets = new Rect();
- final Rect mDispatchedOverscanInsets = new Rect();
final Rect mDispatchedContentInsets = new Rect();
final Rect mDispatchedStableInsets = new Rect();
- final Rect mDispatchedOutsets = new Rect();
final Rect mFinalSystemInsets = new Rect();
final Rect mFinalStableInsets = new Rect();
final Rect mBackdropFrame = new Rect();
@@ -317,13 +313,13 @@
final BaseIWindow mWindow = new BaseIWindow() {
@Override
- public void resized(Rect frame, Rect overscanInsets, Rect contentInsets,
- Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,
+ public void resized(Rect frame, Rect contentInsets,
+ Rect visibleInsets, Rect stableInsets, boolean reportDraw,
MergedConfiguration mergedConfiguration, Rect backDropRect, boolean forceLayout,
boolean alwaysConsumeSystemBars, int displayId,
DisplayCutout.ParcelableWrapper displayCutout) {
- Message msg = mCaller.obtainMessageIO(MSG_WINDOW_RESIZED,
- reportDraw ? 1 : 0, outsets);
+ Message msg = mCaller.obtainMessageI(MSG_WINDOW_RESIZED,
+ reportDraw ? 1 : 0);
mCaller.sendMessage(msg);
}
@@ -822,7 +818,7 @@
if (mSession.addToDisplay(mWindow, mWindow.mSeq, mLayout, View.VISIBLE,
mDisplay.getDisplayId(), mWinFrame, mContentInsets, mStableInsets,
- mOutsets, mDisplayCutout, inputChannel,
+ mDisplayCutout, inputChannel,
mInsetsState) < 0) {
Log.w(TAG, "Failed to add window while updating wallpaper surface.");
return;
@@ -838,17 +834,13 @@
if (!fixedSize) {
mLayout.surfaceInsets.set(mIWallpaperEngine.mDisplayPadding);
- mLayout.surfaceInsets.left += mOutsets.left;
- mLayout.surfaceInsets.top += mOutsets.top;
- mLayout.surfaceInsets.right += mOutsets.right;
- mLayout.surfaceInsets.bottom += mOutsets.bottom;
} else {
mLayout.surfaceInsets.set(0, 0, 0, 0);
}
final int relayoutResult = mSession.relayout(
mWindow, mWindow.mSeq, mLayout, mWidth, mHeight,
- View.VISIBLE, 0, -1, mWinFrame, mOverscanInsets, mContentInsets,
- mVisibleInsets, mStableInsets, mOutsets, mBackdropFrame,
+ View.VISIBLE, 0, -1, mWinFrame, mContentInsets,
+ mVisibleInsets, mStableInsets, mBackdropFrame,
mDisplayCutout, mMergedConfiguration, mSurfaceControl,
mInsetsState);
if (mSurfaceControl.isValid()) {
@@ -864,12 +856,8 @@
if (!fixedSize) {
final Rect padding = mIWallpaperEngine.mDisplayPadding;
- w += padding.left + padding.right + mOutsets.left + mOutsets.right;
- h += padding.top + padding.bottom + mOutsets.top + mOutsets.bottom;
- mOverscanInsets.left += padding.left;
- mOverscanInsets.top += padding.top;
- mOverscanInsets.right += padding.right;
- mOverscanInsets.bottom += padding.bottom;
+ w += padding.left + padding.right;
+ h += padding.top + padding.bottom;
mContentInsets.left += padding.left;
mContentInsets.top += padding.top;
mContentInsets.right += padding.right;
@@ -898,10 +886,8 @@
Log.v(TAG, "Wallpaper size has changed: (" + mCurWidth + ", " + mCurHeight);
}
- insetsChanged |= !mDispatchedOverscanInsets.equals(mOverscanInsets);
insetsChanged |= !mDispatchedContentInsets.equals(mContentInsets);
insetsChanged |= !mDispatchedStableInsets.equals(mStableInsets);
- insetsChanged |= !mDispatchedOutsets.equals(mOutsets);
insetsChanged |= !mDispatchedDisplayCutout.equals(mDisplayCutout.get());
mSurfaceHolder.setSurfaceFrameSize(w, h);
@@ -961,16 +947,9 @@
}
if (insetsChanged) {
- mDispatchedOverscanInsets.set(mOverscanInsets);
- mDispatchedOverscanInsets.left += mOutsets.left;
- mDispatchedOverscanInsets.top += mOutsets.top;
- mDispatchedOverscanInsets.right += mOutsets.right;
- mDispatchedOverscanInsets.bottom += mOutsets.bottom;
mDispatchedContentInsets.set(mContentInsets);
mDispatchedStableInsets.set(mStableInsets);
- mDispatchedOutsets.set(mOutsets);
mDispatchedDisplayCutout = mDisplayCutout.get();
- mFinalSystemInsets.set(mDispatchedOverscanInsets);
mFinalStableInsets.set(mDispatchedStableInsets);
WindowInsets insets = new WindowInsets(mFinalSystemInsets,
mFinalStableInsets,
@@ -1457,7 +1436,6 @@
} break;
case MSG_WINDOW_RESIZED: {
final boolean reportDraw = message.arg1 != 0;
- mEngine.mOutsets.set((Rect) message.obj);
mEngine.updateSurface(true, false, reportDraw);
mEngine.doOffsetsChanged(true);
} break;
diff --git a/telephony/java/android/telephony/Rlog.java b/core/java/android/telephony/Rlog.java
similarity index 100%
rename from telephony/java/android/telephony/Rlog.java
rename to core/java/android/telephony/Rlog.java
diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java
index 64d6124..a080091 100644
--- a/core/java/android/telephony/TelephonyRegistryManager.java
+++ b/core/java/android/telephony/TelephonyRegistryManager.java
@@ -15,7 +15,6 @@
*/
package android.telephony;
-import android.annotation.CallbackExecutor;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.content.Context;
@@ -23,8 +22,6 @@
import android.net.NetworkCapabilities;
import android.os.Binder;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.telephony.Annotation.ApnType;
@@ -37,19 +34,12 @@
import android.telephony.Annotation.RadioPowerState;
import android.telephony.Annotation.SimActivationState;
import android.telephony.Annotation.SrvccState;
-import android.telephony.CallQuality;
-import android.telephony.CellInfo;
-import android.telephony.DisconnectCause;
-import android.telephony.PhoneCapability;
-import android.telephony.ServiceState;
-import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
import android.telephony.data.ApnSetting;
import android.telephony.ims.ImsReasonInfo;
import android.util.Log;
-import com.android.internal.telephony.ITelephonyRegistry;
import com.android.internal.telephony.IOnSubscriptionsChangedListener;
+import com.android.internal.telephony.ITelephonyRegistry;
import java.util.HashMap;
import java.util.List;
@@ -120,7 +110,8 @@
};
mSubscriptionChangedListenerMap.put(listener, callback);
try {
- sRegistry.addOnSubscriptionsChangedListener(mContext.getOpPackageName(), callback);
+ sRegistry.addOnSubscriptionsChangedListener(mContext.getOpPackageName(),
+ mContext.getFeatureId(), callback);
} catch (RemoteException ex) {
// system server crash
}
@@ -179,7 +170,7 @@
mOpportunisticSubscriptionChangedListenerMap.put(listener, callback);
try {
sRegistry.addOnOpportunisticSubscriptionsChangedListener(mContext.getOpPackageName(),
- callback);
+ mContext.getFeatureId(), callback);
} catch (RemoteException ex) {
// system server crash
}
diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java
index df54209..993bbe8 100644
--- a/core/java/android/text/util/Linkify.java
+++ b/core/java/android/text/util/Linkify.java
@@ -663,11 +663,8 @@
private static void gatherTelLinks(ArrayList<LinkSpec> links, Spannable s,
@Nullable Context context) {
PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
- final TelephonyManager tm = (context == null)
- ? TelephonyManager.getDefault()
- : TelephonyManager.from(context);
Iterable<PhoneNumberMatch> matches = phoneUtil.findNumbers(s.toString(),
- tm.getSimCountryIso().toUpperCase(Locale.US),
+ TelephonyManager.getDefaultSimCountryIso().toUpperCase(Locale.US),
Leniency.POSSIBLE, Long.MAX_VALUE);
for (PhoneNumberMatch match : matches) {
LinkSpec spec = new LinkSpec();
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index c40c123..451a669 100755
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -23,9 +23,8 @@
/**
* A structure describing general information about a display, such as its
* size, density, and font scaling.
- * <p>To access the DisplayMetrics members, initialize an object like this:</p>
- * <pre> DisplayMetrics metrics = new DisplayMetrics();
- * getWindowManager().getDefaultDisplay().getMetrics(metrics);</pre>
+ * <p>To access the DisplayMetrics members, retrieve display metrics like this:</p>
+ * <pre>context.getResources().getDisplayMetrics();</pre>
*/
public class DisplayMetrics {
/**
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index af1a51f..12a55c7 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -56,6 +56,7 @@
DEFAULT_FLAGS.put("settings_skip_direction_mutable", "true");
DEFAULT_FLAGS.put(SETTINGS_WIFITRACKER2, "false");
DEFAULT_FLAGS.put("settings_work_profile", "false");
+ DEFAULT_FLAGS.put("settings_controller_loading_enhancement", "false");
}
/**
diff --git a/core/java/android/util/IconDrawableFactory.java b/core/java/android/util/IconDrawableFactory.java
index d90b65e..d86ebf3 100644
--- a/core/java/android/util/IconDrawableFactory.java
+++ b/core/java/android/util/IconDrawableFactory.java
@@ -26,8 +26,6 @@
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.internal.annotations.VisibleForTesting;
-
/**
* Utility class to load app drawables with appropriate badging.
*
@@ -78,10 +76,10 @@
com.android.internal.R.drawable.ic_instant_icon_badge_bolt,
badgeColor);
}
- if (mUm.isManagedProfile(userId)) {
+ if (mUm.hasBadge(userId)) {
icon = mLauncherIcons.getBadgedDrawable(icon,
- com.android.internal.R.drawable.ic_corp_icon_badge_case,
- getUserBadgeColor(mUm, userId));
+ mUm.getUserIconBadgeResId(userId),
+ mUm.getUserBadgeColor(userId));
}
return icon;
}
@@ -93,23 +91,6 @@
return mLauncherIcons.wrapIconDrawableWithShadow(icon);
}
- // Should have enough colors to cope with UserManagerService.getMaxManagedProfiles()
- @VisibleForTesting
- public static final int[] CORP_BADGE_COLORS = new int[] {
- com.android.internal.R.color.profile_badge_1,
- com.android.internal.R.color.profile_badge_2,
- com.android.internal.R.color.profile_badge_3
- };
-
- public static int getUserBadgeColor(UserManager um, @UserIdInt int userId) {
- int badge = um.getManagedProfileBadge(userId);
- if (badge < 0) {
- badge = 0;
- }
- int resourceId = CORP_BADGE_COLORS[badge % CORP_BADGE_COLORS.length];
- return Resources.getSystem().getColor(resourceId, null);
- }
-
@UnsupportedAppUsage
public static IconDrawableFactory newInstance(Context context) {
return new IconDrawableFactory(context, true);
diff --git a/core/java/android/util/LauncherIcons.java b/core/java/android/util/LauncherIcons.java
index 8501eb5..e652e17 100644
--- a/core/java/android/util/LauncherIcons.java
+++ b/core/java/android/util/LauncherIcons.java
@@ -106,9 +106,11 @@
Resources overlayableRes =
ActivityThread.currentActivityThread().getApplication().getResources();
+ // ic_corp_icon_badge_shadow is not work-profile-specific.
Drawable badgeShadow = overlayableRes.getDrawable(
com.android.internal.R.drawable.ic_corp_icon_badge_shadow);
+ // ic_corp_icon_badge_color is not work-profile-specific.
Drawable badgeColor = overlayableRes.getDrawable(
com.android.internal.R.drawable.ic_corp_icon_badge_color)
.getConstantState().newDrawable().mutate();
diff --git a/core/java/android/util/StatsEvent.aidl b/core/java/android/util/StatsEvent.aidl
new file mode 100644
index 0000000..deac873
--- /dev/null
+++ b/core/java/android/util/StatsEvent.aidl
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2019, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.util;
+
+parcelable StatsEvent cpp_header "android/util/StatsEvent.h";
diff --git a/core/java/android/util/StatsEvent.java b/core/java/android/util/StatsEvent.java
index a21f9e0..10c9d87 100644
--- a/core/java/android/util/StatsEvent.java
+++ b/core/java/android/util/StatsEvent.java
@@ -20,6 +20,8 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.os.SystemClock;
import com.android.internal.annotations.GuardedBy;
@@ -42,7 +44,7 @@
* </pre>
* @hide
**/
-public final class StatsEvent {
+public final class StatsEvent implements Parcelable {
private static final int LOGGER_ENTRY_MAX_PAYLOAD = 4068;
// Max payload size is 4 bytes less as 4 bytes are reserved for statsEventTag.
@@ -63,7 +65,7 @@
* Returns a new StatsEvent.Builder for building StatsEvent object.
**/
@NonNull
- public StatsEvent.Builder newBuilder() {
+ public static StatsEvent.Builder newBuilder() {
return new StatsEvent.Builder(Buffer.obtain());
}
@@ -631,4 +633,39 @@
return 0;
}
}
+
+ /**
+ * Boilerplate for Parcel.
+ *
+ * @hide
+ */
+ public static final @NonNull Parcelable.Creator<StatsEvent> CREATOR =
+ new Parcelable.Creator<StatsEvent>() {
+ public StatsEvent createFromParcel(Parcel in) {
+ // Purposefully leaving this method not implemented.
+ throw new RuntimeException("Not implemented");
+ }
+
+ public StatsEvent[] newArray(int size) {
+ // Purposefully leaving this method not implemented.
+ throw new RuntimeException("Not implemented");
+ }
+ };
+
+ /**
+ * @hide
+ */
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeInt(mAtomId);
+ out.writeInt(getNumBytes());
+ out.writeByteArray(getBytes());
+ }
+
+ /**
+ * Boilerplate for Parcel.
+ */
+ public int describeContents() {
+ return 0;
+ }
+
}
diff --git a/core/java/android/view/ActionMode.java b/core/java/android/view/ActionMode.java
index 05d9167..6b200e1 100644
--- a/core/java/android/view/ActionMode.java
+++ b/core/java/android/view/ActionMode.java
@@ -21,6 +21,8 @@
import android.annotation.TestApi;
import android.graphics.Rect;
+import dalvik.annotation.compat.UnsupportedAppUsage;
+
/**
* Represents a contextual mode of the user interface. Action modes can be used to provide
* alternative interaction modes and replace parts of the normal UI until finished.
@@ -279,6 +281,7 @@
* @return true if the UI used to show this action mode can take focus
* @hide Internal use only
*/
+ @UnsupportedAppUsage
@TestApi
public boolean isUiFocusable() {
return true;
diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index e95b5ca..28eb79a 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -331,6 +331,7 @@
* @return the requested time between frames, in milliseconds
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public static long getFrameDelay() {
return sFrameDelay;
@@ -413,6 +414,7 @@
* @see #removeCallbacks
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public void postCallback(int callbackType, Runnable action, Object token) {
postCallbackDelayed(callbackType, action, token, 0);
@@ -432,6 +434,7 @@
* @see #removeCallback
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public void postCallbackDelayed(int callbackType,
Runnable action, Object token, long delayMillis) {
@@ -482,6 +485,7 @@
* @see #postCallbackDelayed
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public void removeCallbacks(int callbackType, Runnable action, Object token) {
if (callbackType < 0 || callbackType > CALLBACK_LAST) {
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index b3d98b8..03e68b0 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -749,20 +749,6 @@
}
/**
- * @hide
- * Return a rectangle defining the insets of the overscan region of the display.
- * Each field of the rectangle is the number of pixels the overscan area extends
- * into the display on that side.
- */
- public void getOverscanInsets(Rect outRect) {
- synchronized (this) {
- updateDisplayInfoLocked();
- outRect.set(mDisplayInfo.overscanLeft, mDisplayInfo.overscanTop,
- mDisplayInfo.overscanRight, mDisplayInfo.overscanBottom);
- }
- }
-
- /**
* Returns the rotation of the screen from its "natural" orientation.
* The returned value may be {@link Surface#ROTATION_0 Surface.ROTATION_0}
* (no rotation), {@link Surface#ROTATION_90 Surface.ROTATION_90},
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index 7e22dd9..38baccb 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -136,30 +136,6 @@
public int logicalHeight;
/**
- * @hide
- * Number of overscan pixels on the left side of the display.
- */
- public int overscanLeft;
-
- /**
- * @hide
- * Number of overscan pixels on the top side of the display.
- */
- public int overscanTop;
-
- /**
- * @hide
- * Number of overscan pixels on the right side of the display.
- */
- public int overscanRight;
-
- /**
- * @hide
- * Number of overscan pixels on the bottom side of the display.
- */
- public int overscanBottom;
-
- /**
* The {@link DisplayCutout} if present, otherwise {@code null}.
*
* @hide
@@ -322,10 +298,6 @@
&& largestNominalAppHeight == other.largestNominalAppHeight
&& logicalWidth == other.logicalWidth
&& logicalHeight == other.logicalHeight
- && overscanLeft == other.overscanLeft
- && overscanTop == other.overscanTop
- && overscanRight == other.overscanRight
- && overscanBottom == other.overscanBottom
&& Objects.equals(displayCutout, other.displayCutout)
&& rotation == other.rotation
&& modeId == other.modeId
@@ -365,10 +337,6 @@
largestNominalAppHeight = other.largestNominalAppHeight;
logicalWidth = other.logicalWidth;
logicalHeight = other.logicalHeight;
- overscanLeft = other.overscanLeft;
- overscanTop = other.overscanTop;
- overscanRight = other.overscanRight;
- overscanBottom = other.overscanBottom;
displayCutout = other.displayCutout;
rotation = other.rotation;
modeId = other.modeId;
@@ -404,10 +372,6 @@
largestNominalAppHeight = source.readInt();
logicalWidth = source.readInt();
logicalHeight = source.readInt();
- overscanLeft = source.readInt();
- overscanTop = source.readInt();
- overscanRight = source.readInt();
- overscanBottom = source.readInt();
displayCutout = DisplayCutout.ParcelableWrapper.readCutoutFromParcel(source);
rotation = source.readInt();
modeId = source.readInt();
@@ -452,10 +416,6 @@
dest.writeInt(largestNominalAppHeight);
dest.writeInt(logicalWidth);
dest.writeInt(logicalHeight);
- dest.writeInt(overscanLeft);
- dest.writeInt(overscanTop);
- dest.writeInt(overscanRight);
- dest.writeInt(overscanBottom);
DisplayCutout.ParcelableWrapper.writeCutoutToParcel(displayCutout, dest, flags);
dest.writeInt(rotation);
dest.writeInt(modeId);
@@ -632,17 +592,6 @@
sb.append(logicalWidth);
sb.append(" x ");
sb.append(logicalHeight);
- if (overscanLeft != 0 || overscanTop != 0 || overscanRight != 0 || overscanBottom != 0) {
- sb.append(", overscan (");
- sb.append(overscanLeft);
- sb.append(",");
- sb.append(overscanTop);
- sb.append(",");
- sb.append(overscanRight);
- sb.append(",");
- sb.append(overscanBottom);
- sb.append(")");
- }
sb.append(", largest app ");
sb.append(largestNominalAppWidth);
sb.append(" x ");
diff --git a/core/java/android/view/IDisplayWindowListener.aidl b/core/java/android/view/IDisplayWindowListener.aidl
new file mode 100644
index 0000000..725cd6f
--- /dev/null
+++ b/core/java/android/view/IDisplayWindowListener.aidl
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.view;
+
+/**
+ * Interface to listen for changes to display window-containers.
+ *
+ * This differs from DisplayManager's DisplayListener:
+ * - onDisplayAdded is always called after the display is actually added to the WM hierarchy.
+ * This corresponds to the DisplayContent and not the raw Dislay from DisplayManager.
+ *
+ * @hide
+ */
+oneway interface IDisplayWindowListener {
+
+ /**
+ * Called when a display is added to the WM hierarchy.
+ */
+ void onDisplayAdded(int displayId);
+
+ /**
+ * Called when a display is removed from the hierarchy.
+ */
+ void onDisplayRemoved(int displayId);
+
+}
diff --git a/core/java/android/view/IDisplayWindowRotationCallback.aidl b/core/java/android/view/IDisplayWindowRotationCallback.aidl
new file mode 100644
index 0000000..79a15ad
--- /dev/null
+++ b/core/java/android/view/IDisplayWindowRotationCallback.aidl
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package android.view;
+
+import android.view.WindowContainerTransaction;
+
+/**
+ * Interface to be invoked by the controller when it has finished preparing for a display rotation.
+ *
+ * @see IDisplayWindowRotationController
+ * @hide
+ */
+interface IDisplayWindowRotationCallback {
+ void continueRotateDisplay(int targetRotation, in WindowContainerTransaction t);
+}
diff --git a/core/java/android/view/IDisplayWindowRotationController.aidl b/core/java/android/view/IDisplayWindowRotationController.aidl
new file mode 100644
index 0000000..c1c7464
--- /dev/null
+++ b/core/java/android/view/IDisplayWindowRotationController.aidl
@@ -0,0 +1,52 @@
+/**
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.view;
+
+import android.view.IDisplayWindowRotationCallback;
+
+/**
+ * Singular controller of a "remote" display rotation. When a display rotation is started, WM
+ * freezes the screen. It will then call into this controller and wait for a response via the
+ * callback.
+ *
+ * This needs to provide configuration changes because those changes need to be applied in sync
+ * with the actual display rotation to prevent relayouts with mismatched information.
+ *
+ * The flow is like this:
+ * 1. DisplayContent/Rotation freezes the screen
+ * 2. This controller is notified of a rotation and provided a callback.
+ * 3. This controller is responsible for collecting a set of configuration changes to go along with
+ * the rotation.
+ * 4. The callback is fired which tells DisplayContent/Rotation to apply the provided configuration
+ * changes and continue the rotation.
+ *
+ * @hide
+ */
+oneway interface IDisplayWindowRotationController {
+
+ /**
+ * Called when WM needs to know how to update tasks in response to a display rotation.
+ * If this isn't called, a timeout will continue the rotation in WM.
+ *
+ * @param displayId the display that is rotating.
+ * @param fromRotation the rotation the display is rotating from.
+ * @param toRotation the rotation the display is rotating to.
+ * @param callback A callback to be called when this has calculated updated configs.
+ */
+ void onRotateDisplay(int displayId, int fromRotation, int toRotation,
+ in IDisplayWindowRotationCallback callback);
+}
diff --git a/core/java/android/view/IWindow.aidl b/core/java/android/view/IWindow.aidl
index 8bf99ec..37b685a 100644
--- a/core/java/android/view/IWindow.aidl
+++ b/core/java/android/view/IWindow.aidl
@@ -51,8 +51,8 @@
*/
void executeCommand(String command, String parameters, in ParcelFileDescriptor descriptor);
- void resized(in Rect frame, in Rect overscanInsets, in Rect contentInsets,
- in Rect visibleInsets, in Rect stableInsets, in Rect outsets, boolean reportDraw,
+ void resized(in Rect frame, in Rect contentInsets,
+ in Rect visibleInsets, in Rect stableInsets, boolean reportDraw,
in MergedConfiguration newMergedConfiguration, in Rect backDropFrame,
boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId,
in DisplayCutout.ParcelableWrapper displayCutout);
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 7f717a7..258b1ae 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -35,7 +35,9 @@
import android.view.IApplicationToken;
import android.view.IAppTransitionAnimationSpecsFuture;
import android.view.IDockedStackListener;
+import android.view.IDisplayWindowListener;
import android.view.IDisplayFoldListener;
+import android.view.IDisplayWindowRotationController;
import android.view.IOnKeyguardExitResult;
import android.view.IPinnedStackListener;
import android.view.RemoteAnimationAdapter;
@@ -88,8 +90,6 @@
void clearForcedDisplayDensityForUser(int displayId, int userId);
void setForcedDisplayScalingMode(int displayId, int mode); // 0 = auto, 1 = disable
- void setOverscan(int displayId, int left, int top, int right, int bottom);
-
// These can only be called when holding the MANAGE_APP_TOKENS permission.
void setEventDispatching(boolean enabled);
void addWindowToken(IBinder token, int type, int displayId);
@@ -97,6 +97,13 @@
void prepareAppTransition(int transit, boolean alwaysKeepCurrent);
/**
+ * Sets a singular remote controller of display rotations. There can only be one. The
+ * controller is called after the display has "frozen" for a rotation and display rotation will
+ * only continue once the controller has finished calculating associated configurations.
+ */
+ void setDisplayWindowRotationController(IDisplayWindowRotationController controller);
+
+ /**
* Like overridePendingAppTransitionMultiThumb, but uses a future to supply the specs. This is
* used for recents, where generating the thumbnails of the specs takes a non-trivial amount of
* time, so we want to move that off the critical path for starting the new activity.
@@ -476,6 +483,16 @@
void unregisterDisplayFoldListener(IDisplayFoldListener listener);
/**
+ * Registers an IDisplayContainerListener
+ */
+ void registerDisplayWindowListener(IDisplayWindowListener listener);
+
+ /**
+ * Unregisters an IDisplayContainerListener.
+ */
+ void unregisterDisplayWindowListener(IDisplayWindowListener listener);
+
+ /**
* Starts a window trace.
*/
void startWindowTrace();
diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl
index eaf6fca..0489e14 100644
--- a/core/java/android/view/IWindowSession.aidl
+++ b/core/java/android/view/IWindowSession.aidl
@@ -43,7 +43,7 @@
interface IWindowSession {
int addToDisplay(IWindow window, int seq, in WindowManager.LayoutParams attrs,
in int viewVisibility, in int layerStackId, out Rect outFrame,
- out Rect outContentInsets, out Rect outStableInsets, out Rect outOutsets,
+ out Rect outContentInsets, out Rect outStableInsets,
out DisplayCutout.ParcelableWrapper displayCutout, out InputChannel outInputChannel,
out InsetsState insetsState);
int addToDisplayWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs,
@@ -70,9 +70,6 @@
* @param frameNumber A frame number in which changes requested in this layout will be rendered.
* @param outFrame Rect in which is placed the new position/size on
* screen.
- * @param outOverscanInsets Rect in which is placed the offsets from
- * <var>outFrame</var> in which the content of the window are inside
- * of the display's overlay region.
* @param outContentInsets Rect in which is placed the offsets from
* <var>outFrame</var> in which the content of the window should be
* placed. This can be used to modify the window layout to ensure its
@@ -99,9 +96,9 @@
*/
int relayout(IWindow window, int seq, in WindowManager.LayoutParams attrs,
int requestedWidth, int requestedHeight, int viewVisibility,
- int flags, long frameNumber, out Rect outFrame, out Rect outOverscanInsets,
+ int flags, long frameNumber, out Rect outFrame,
out Rect outContentInsets, out Rect outVisibleInsets, out Rect outStableInsets,
- out Rect outOutsets, out Rect outBackdropFrame,
+ out Rect outBackdropFrame,
out DisplayCutout.ParcelableWrapper displayCutout,
out MergedConfiguration outMergedConfiguration, out SurfaceControl outSurfaceControl,
out InsetsState insetsState);
diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java
index 1fc7f0e..75862e0 100644
--- a/core/java/android/view/LayoutInflater.java
+++ b/core/java/android/view/LayoutInflater.java
@@ -62,19 +62,20 @@
* {@link Context#getSystemService} to retrieve a standard LayoutInflater instance
* that is already hooked up to the current context and correctly configured
* for the device you are running on.
- *
* <p>
* To create a new LayoutInflater with an additional {@link Factory} for your
* own views, you can use {@link #cloneInContext} to clone an existing
* ViewFactory, and then call {@link #setFactory} on it to include your
* Factory.
- *
* <p>
* For performance reasons, view inflation relies heavily on pre-processing of
* XML files that is done at build time. Therefore, it is not currently possible
* to use LayoutInflater with an XmlPullParser over a plain XML file at runtime;
* it only works with an XmlPullParser returned from a compiled resource
* (R.<em>something</em> file.)
+ * <p>
+ * <strong>Note:</strong> This class is <strong>not</strong> thread-safe and a given
+ * instance should only be accessed by a single thread.
*/
@SystemService(Context.LAYOUT_INFLATER_SERVICE)
public abstract class LayoutInflater {
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index bd865c0..be4c598 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -2610,6 +2610,7 @@
* @see #getActionButton()
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public final void setActionButton(int button) {
nativeSetActionButton(mNativePtr, button);
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 8dd475e..3251127 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -90,7 +90,8 @@
Rect sourceCrop, int width, int height, boolean useIdentityTransform, int rotation,
boolean captureSecureLayers);
private static native ScreenshotGraphicBuffer nativeCaptureLayers(IBinder displayToken,
- long layerObject, Rect sourceCrop, float frameScale, long[] excludeLayerObjects);
+ long layerObject, Rect sourceCrop, float frameScale, long[] excludeLayerObjects,
+ int format);
private static native long nativeMirrorSurface(long mirrorOfObject);
private static native long nativeCreateTransaction();
private static native long nativeGetNativeTransactionFinalizer();
@@ -196,6 +197,8 @@
float brightness);
private static native long nativeReadTransactionFromParcel(Parcel in);
private static native void nativeWriteTransactionToParcel(long nativeObject, Parcel out);
+ private static native void nativeSetShadowRadius(long transactionObj, long nativeObject,
+ float shadowRadius);
private final CloseGuard mCloseGuard = CloseGuard.get();
private String mName;
@@ -1867,8 +1870,27 @@
*/
public static ScreenshotGraphicBuffer captureLayers(SurfaceControl layer, Rect sourceCrop,
float frameScale) {
+ return captureLayers(layer, sourceCrop, frameScale, PixelFormat.RGBA_8888);
+ }
+
+ /**
+ * Captures a layer and its children and returns a {@link GraphicBuffer} with the content.
+ *
+ * @param layer The root layer to capture.
+ * @param sourceCrop The portion of the root surface to capture; caller may pass in 'new
+ * Rect()' or null if no cropping is desired.
+ * @param frameScale The desired scale of the returned buffer; the raw
+ * screen will be scaled up/down.
+ * @param format The desired pixel format of the returned buffer.
+ *
+ * @return Returns a GraphicBuffer that contains the layer capture.
+ * @hide
+ */
+ public static ScreenshotGraphicBuffer captureLayers(SurfaceControl layer, Rect sourceCrop,
+ float frameScale, int format) {
final IBinder displayToken = SurfaceControl.getInternalDisplayToken();
- return nativeCaptureLayers(displayToken, layer.mNativeObject, sourceCrop, frameScale, null);
+ return nativeCaptureLayers(displayToken, layer.mNativeObject, sourceCrop, frameScale, null,
+ format);
}
/**
@@ -1883,7 +1905,7 @@
nativeExcludeObjects[i] = exclude[i].mNativeObject;
}
return nativeCaptureLayers(displayToken, layer.mNativeObject, sourceCrop, frameScale,
- nativeExcludeObjects);
+ nativeExcludeObjects, PixelFormat.RGBA_8888);
}
/**
@@ -2545,6 +2567,29 @@
return this;
}
+ /**
+ * Draws shadows of length {@code shadowRadius} around the surface {@link SurfaceControl}.
+ * If the length is 0.0f then the shadows will not be drawn.
+ *
+ * Shadows are drawn around the screen bounds, these are the post transformed cropped
+ * bounds. They can draw over their parent bounds and will be occluded by layers with a
+ * higher z-order. The shadows will respect the surface's corner radius if the
+ * rounded corner bounds (transformed source bounds) are within the screen bounds.
+ *
+ * A shadow will only be drawn on buffer and color layers. If the radius is applied on a
+ * container layer, it will be passed down the hierarchy to be applied on buffer and color
+ * layers but not its children. A scenario where this is useful is when SystemUI animates
+ * a task by controlling a leash to it, can draw a shadow around the app surface by
+ * setting a shadow on the leash. This is similar to how rounded corners are set.
+ *
+ * @hide
+ */
+ public Transaction setShadowRadius(SurfaceControl sc, float shadowRadius) {
+ sc.checkNotReleased();
+ nativeSetShadowRadius(mNativeObject, sc.mNativeObject, shadowRadius);
+ return this;
+ }
+
/**
* Merge the other transaction into this transaction, clearing the
* other transaction as if it had been applied.
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 8d08004..3920271 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -11287,16 +11287,14 @@
public WindowInsets computeSystemWindowInsets(WindowInsets in, Rect outLocalInsets) {
if ((mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) == 0
|| mAttachInfo == null
- || ((mAttachInfo.mSystemUiVisibility & SYSTEM_UI_LAYOUT_FLAGS) == 0
- && !mAttachInfo.mOverscanRequested)) {
+ || ((mAttachInfo.mSystemUiVisibility & SYSTEM_UI_LAYOUT_FLAGS) == 0)) {
outLocalInsets.set(in.getSystemWindowInsetsAsRect());
return in.consumeSystemWindowInsets().inset(outLocalInsets);
} else {
// The application wants to take care of fitting system window for
- // the content... however we still need to take care of any overscan here.
- final Rect overscan = mAttachInfo.mOverscanInsets;
- outLocalInsets.set(overscan);
- return in.inset(outLocalInsets);
+ // the content.
+ outLocalInsets.setEmpty();
+ return in;
}
}
@@ -11376,19 +11374,6 @@
}
/**
- * Returns the outsets, which areas of the device that aren't a surface, but we would like to
- * treat them as such.
- * @hide
- */
- public void getOutsets(Rect outOutsetRect) {
- if (mAttachInfo != null) {
- outOutsetRect.set(mAttachInfo.mOutsets);
- } else {
- outOutsetRect.setEmpty();
- }
- }
-
- /**
* Returns the visibility status for this view.
*
* @return One of {@link #VISIBLE}, {@link #INVISIBLE}, or {@link #GONE}.
@@ -24729,6 +24714,7 @@
* @param isRoot true if the view belongs to the root namespace, false
* otherwise
*/
+ @UnsupportedAppUsage
@TestApi
public void setIsRootNamespace(boolean isRoot) {
if (isRoot) {
@@ -28444,13 +28430,6 @@
/**
* For windows that are full-screen but using insets to layout inside
- * of the screen areas, these are the current insets to appear inside
- * the overscan area of the display.
- */
- final Rect mOverscanInsets = new Rect();
-
- /**
- * For windows that are full-screen but using insets to layout inside
* of the screen decorations, these are the current insets for the
* content of the window.
*/
@@ -28477,12 +28456,6 @@
new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT);
/**
- * For windows that include areas that are not covered by real surface these are the outsets
- * for real surface.
- */
- final Rect mOutsets = new Rect();
-
- /**
* In multi-window we force show the system bars. Because we don't want that the surface
* size changes in this mode, we instead have a flag whether the system bars sizes should
* always be consumed, so the app is treated like there are no virtual system bars at all.
@@ -28591,12 +28564,6 @@
boolean mHasSystemUiListeners;
/**
- * Set if the window has requested to extend into the overscan region
- * via WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN.
- */
- boolean mOverscanRequested;
-
- /**
* Set if the visibility of any views has changed.
*/
@UnsupportedAppUsage
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java
index 6a099d57..9e914d4 100644
--- a/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@ -23,6 +23,7 @@
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
+import android.graphics.Point;
import android.os.Build;
import android.os.RemoteException;
import android.provider.Settings;
@@ -397,7 +398,11 @@
mWindowTouchSlop = (int) (sizeAndDensity * WINDOW_TOUCH_SLOP + 0.5f);
// Size of the screen in bytes, in ARGB_8888 format
- mMaximumDrawingCacheSize = 4 * metrics.heightPixels * metrics.widthPixels;
+ final WindowManager win = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
+ final Display display = win.getDefaultDisplay();
+ final Point size = new Point();
+ display.getRealSize(size);
+ mMaximumDrawingCacheSize = 4 * size.x * size.y;
mOverscrollDistance = (int) (sizeAndDensity * OVERSCROLL_DISTANCE + 0.5f);
mOverflingDistance = (int) (sizeAndDensity * OVERFLING_DISTANCE + 0.5f);
@@ -837,7 +842,6 @@
* The maximum drawing cache size expressed in bytes.
*
* @return the maximum size of View's drawing cache expressed in bytes
- *
*/
public int getScaledMaximumDrawingCacheSize() {
return mMaximumDrawingCacheSize;
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 36daa5c..a62ba63 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -415,6 +415,11 @@
private static final String REMOTE_COMMAND_CAPTURE = "CAPTURE";
private static final String REMOTE_COMMAND_DUMP = "DUMP";
private static final String REMOTE_COMMAND_DUMP_THEME = "DUMP_THEME";
+ /**
+ * Similar to REMOTE_COMMAND_DUMP but uses ViewHierarchyEncoder instead of flat text
+ * @hide
+ */
+ public static final String REMOTE_COMMAND_DUMP_ENCODED = "DUMP_ENCODED";
private static final String REMOTE_COMMAND_INVALIDATE = "INVALIDATE";
private static final String REMOTE_COMMAND_REQUEST_LAYOUT = "REQUEST_LAYOUT";
private static final String REMOTE_PROFILE = "PROFILE";
@@ -527,7 +532,6 @@
@UnsupportedAppUsage
static void dispatchCommand(View view, String command, String parameters,
OutputStream clientStream) throws IOException {
-
// Paranoid but safe...
view = view.getRootView();
@@ -535,6 +539,8 @@
dump(view, false, true, clientStream);
} else if (REMOTE_COMMAND_DUMP_THEME.equalsIgnoreCase(command)) {
dumpTheme(view, clientStream);
+ } else if (REMOTE_COMMAND_DUMP_ENCODED.equalsIgnoreCase(command)) {
+ dumpEncoded(view, clientStream);
} else if (REMOTE_COMMAND_CAPTURE_LAYERS.equalsIgnoreCase(command)) {
captureLayers(view, new DataOutputStream(clientStream));
} else {
@@ -1198,6 +1204,18 @@
encoder.endStream();
}
+ private static void dumpEncoded(@NonNull final View view, @NonNull OutputStream out)
+ throws IOException {
+ ByteArrayOutputStream baOut = new ByteArrayOutputStream();
+
+ final ViewHierarchyEncoder encoder = new ViewHierarchyEncoder(baOut);
+ encoder.addProperty("window:left", view.mAttachInfo.mWindowLeft);
+ encoder.addProperty("window:top", view.mAttachInfo.mWindowTop);
+ view.encode(encoder);
+ encoder.endStream();
+ out.write(baOut.toByteArray());
+ }
+
/**
* Dumps the theme attributes from the given View.
* @hide
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 97adaf5..8ee7a0e 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -219,10 +219,6 @@
*/
private static final String PROPERTY_PROFILE_RENDERING = "viewroot.profile_rendering";
- // properties used by emulator to determine display shape
- public static final String PROPERTY_EMULATOR_WIN_OUTSET_BOTTOM_PX =
- "ro.emu.win_outset_bottom_px";
-
/**
* Maximum time we allow the user to roll the trackball enough to generate
* a key event, before resetting the counters.
@@ -447,7 +443,6 @@
boolean mIsDrawing;
int mLastSystemUiVisibility;
int mClientWindowLayoutFlags;
- boolean mLastOverscanRequested;
// Pool of queued input events.
private static final int MAX_QUEUED_INPUT_EVENT_POOL_SIZE = 10;
@@ -507,11 +502,9 @@
// These are accessed by multiple threads.
final Rect mWinFrame; // frame given by window manager.
- final Rect mPendingOverscanInsets = new Rect();
final Rect mPendingVisibleInsets = new Rect();
final Rect mPendingStableInsets = new Rect();
final Rect mPendingContentInsets = new Rect();
- final Rect mPendingOutsets = new Rect();
final Rect mPendingBackDropFrame = new Rect();
final DisplayCutout.ParcelableWrapper mPendingDisplayCutout =
new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT);
@@ -900,7 +893,7 @@
res = mWindowSession.addToDisplay(mWindow, mSeq, mWindowAttributes,
getHostVisibility(), mDisplay.getDisplayId(), mTmpFrame,
mAttachInfo.mContentInsets, mAttachInfo.mStableInsets,
- mAttachInfo.mOutsets, mAttachInfo.mDisplayCutout, inputChannel,
+ mAttachInfo.mDisplayCutout, inputChannel,
mTempInsets);
setFrame(mTmpFrame);
} catch (RemoteException e) {
@@ -921,7 +914,6 @@
if (mTranslator != null) {
mTranslator.translateRectInScreenToAppWindow(mAttachInfo.mContentInsets);
}
- mPendingOverscanInsets.set(0, 0, 0, 0);
mPendingContentInsets.set(mAttachInfo.mContentInsets);
mPendingStableInsets.set(mAttachInfo.mStableInsets);
mPendingDisplayCutout.set(mAttachInfo.mDisplayCutout);
@@ -1967,12 +1959,6 @@
stableInsets = mPendingStableInsets;
displayCutout = mPendingDisplayCutout.get();
}
- Rect outsets = mAttachInfo.mOutsets;
- if (outsets.left > 0 || outsets.top > 0 || outsets.right > 0 || outsets.bottom > 0) {
- contentInsets = new Rect(contentInsets.left + outsets.left,
- contentInsets.top + outsets.top, contentInsets.right + outsets.right,
- contentInsets.bottom + outsets.bottom);
- }
contentInsets = ensureInsetsNonNegative(contentInsets, "content");
stableInsets = ensureInsetsNonNegative(stableInsets, "stable");
mLastWindowInsets = mInsetsController.calculateInsets(
@@ -2146,9 +2132,6 @@
mAttachInfo.mInTouchMode = !mAddedTouchMode;
ensureTouchModeLocally(mAddedTouchMode);
} else {
- if (!mPendingOverscanInsets.equals(mAttachInfo.mOverscanInsets)) {
- insetsChanged = true;
- }
if (!mPendingContentInsets.equals(mAttachInfo.mContentInsets)) {
insetsChanged = true;
}
@@ -2163,9 +2146,6 @@
if (DEBUG_LAYOUT) Log.v(mTag, "Visible insets changing to: "
+ mAttachInfo.mVisibleInsets);
}
- if (!mPendingOutsets.equals(mAttachInfo.mOutsets)) {
- insetsChanged = true;
- }
if (mPendingAlwaysConsumeSystemBars != mAttachInfo.mAlwaysConsumeSystemBars) {
insetsChanged = true;
}
@@ -2228,7 +2208,6 @@
if (mApplyInsetsRequested) {
mApplyInsetsRequested = false;
- mLastOverscanRequested = mAttachInfo.mOverscanRequested;
dispatchApplyInsets(host);
if (mLayoutRequested) {
// Short-circuit catching a new layout request here, so
@@ -2292,8 +2271,6 @@
&& !PixelFormat.formatHasAlpha(params.format)) {
params.format = PixelFormat.TRANSLUCENT;
}
- mAttachInfo.mOverscanRequested =
- (params.flags & WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN) != 0;
}
if (mFirst || windowShouldResize || insetsChanged ||
@@ -2342,12 +2319,10 @@
relayoutResult = relayoutWindow(params, viewVisibility, insetsPending);
if (DEBUG_LAYOUT) Log.v(mTag, "relayout: frame=" + frame.toShortString()
- + " overscan=" + mPendingOverscanInsets.toShortString()
+ " content=" + mPendingContentInsets.toShortString()
+ " visible=" + mPendingVisibleInsets.toShortString()
+ " stable=" + mPendingStableInsets.toShortString()
+ " cutout=" + mPendingDisplayCutout.get().toString()
- + " outsets=" + mPendingOutsets.toShortString()
+ " surface=" + mSurface);
// If the pending {@link MergedConfiguration} handed back from
@@ -2363,8 +2338,6 @@
updatedConfiguration = true;
}
- final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals(
- mAttachInfo.mOverscanInsets);
contentInsetsChanged = !mPendingContentInsets.equals(
mAttachInfo.mContentInsets);
final boolean visibleInsetsChanged = !mPendingVisibleInsets.equals(
@@ -2373,7 +2346,6 @@
mAttachInfo.mStableInsets);
final boolean cutoutChanged = !mPendingDisplayCutout.equals(
mAttachInfo.mDisplayCutout);
- final boolean outsetsChanged = !mPendingOutsets.equals(mAttachInfo.mOutsets);
surfaceSizeChanged = (relayoutResult
& WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED) != 0;
final boolean alwaysConsumeSystemBarsChanged =
@@ -2389,13 +2361,6 @@
if (DEBUG_LAYOUT) Log.v(mTag, "Content insets changing to: "
+ mAttachInfo.mContentInsets);
}
- if (overscanInsetsChanged) {
- mAttachInfo.mOverscanInsets.set(mPendingOverscanInsets);
- if (DEBUG_LAYOUT) Log.v(mTag, "Overscan insets changing to: "
- + mAttachInfo.mOverscanInsets);
- // Need to relayout with content insets.
- contentInsetsChanged = true;
- }
if (stableInsetsChanged) {
mAttachInfo.mStableInsets.set(mPendingStableInsets);
if (DEBUG_LAYOUT) Log.v(mTag, "Decor insets changing to: "
@@ -2416,12 +2381,8 @@
contentInsetsChanged = true;
}
if (contentInsetsChanged || mLastSystemUiVisibility !=
- mAttachInfo.mSystemUiVisibility || mApplyInsetsRequested
- || mLastOverscanRequested != mAttachInfo.mOverscanRequested
- || outsetsChanged) {
+ mAttachInfo.mSystemUiVisibility || mApplyInsetsRequested) {
mLastSystemUiVisibility = mAttachInfo.mSystemUiVisibility;
- mLastOverscanRequested = mAttachInfo.mOverscanRequested;
- mAttachInfo.mOutsets.set(mPendingOutsets);
mApplyInsetsRequested = false;
dispatchApplyInsets(host);
// We applied insets so force contentInsetsChanged to ensure the
@@ -4671,12 +4632,10 @@
// Recycled in the fall through...
SomeArgs args = (SomeArgs) msg.obj;
if (mWinFrame.equals(args.arg1)
- && mPendingOverscanInsets.equals(args.arg5)
&& mPendingContentInsets.equals(args.arg2)
&& mPendingStableInsets.equals(args.arg6)
&& mPendingDisplayCutout.get().equals(args.arg9)
&& mPendingVisibleInsets.equals(args.arg3)
- && mPendingOutsets.equals(args.arg7)
&& mPendingBackDropFrame.equals(args.arg8)
&& args.arg4 == null
&& args.argi1 == 0
@@ -4706,20 +4665,16 @@
}
final boolean framesChanged = !mWinFrame.equals(args.arg1)
- || !mPendingOverscanInsets.equals(args.arg5)
|| !mPendingContentInsets.equals(args.arg2)
|| !mPendingStableInsets.equals(args.arg6)
|| !mPendingDisplayCutout.get().equals(args.arg9)
- || !mPendingVisibleInsets.equals(args.arg3)
- || !mPendingOutsets.equals(args.arg7);
+ || !mPendingVisibleInsets.equals(args.arg3);
setFrame((Rect) args.arg1);
- mPendingOverscanInsets.set((Rect) args.arg5);
mPendingContentInsets.set((Rect) args.arg2);
mPendingStableInsets.set((Rect) args.arg6);
mPendingDisplayCutout.set((DisplayCutout) args.arg9);
mPendingVisibleInsets.set((Rect) args.arg3);
- mPendingOutsets.set((Rect) args.arg7);
mPendingBackDropFrame.set((Rect) args.arg8);
mForceNextWindowRelayout = args.argi1 != 0;
mPendingAlwaysConsumeSystemBars = args.argi2 != 0;
@@ -7174,8 +7129,8 @@
(int) (mView.getMeasuredWidth() * appScale + 0.5f),
(int) (mView.getMeasuredHeight() * appScale + 0.5f), viewVisibility,
insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0, frameNumber,
- mTmpFrame, mPendingOverscanInsets, mPendingContentInsets, mPendingVisibleInsets,
- mPendingStableInsets, mPendingOutsets, mPendingBackDropFrame, mPendingDisplayCutout,
+ mTmpFrame, mPendingContentInsets, mPendingVisibleInsets,
+ mPendingStableInsets, mPendingBackDropFrame, mPendingDisplayCutout,
mPendingMergedConfiguration, mSurfaceControl, mTempInsets);
if (mSurfaceControl.isValid()) {
if (USE_BLAST_BUFFERQUEUE == false) {
@@ -7198,7 +7153,6 @@
if (mTranslator != null) {
mTranslator.translateRectInScreenToAppWinFrame(mTmpFrame);
- mTranslator.translateRectInScreenToAppWindow(mPendingOverscanInsets);
mTranslator.translateRectInScreenToAppWindow(mPendingContentInsets);
mTranslator.translateRectInScreenToAppWindow(mPendingVisibleInsets);
mTranslator.translateRectInScreenToAppWindow(mPendingStableInsets);
@@ -7493,8 +7447,8 @@
}
@UnsupportedAppUsage
- private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets,
- Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,
+ private void dispatchResized(Rect frame, Rect contentInsets,
+ Rect visibleInsets, Rect stableInsets, boolean reportDraw,
MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout,
boolean alwaysConsumeSystemBars, int displayId,
DisplayCutout.ParcelableWrapper displayCutout) {
@@ -7519,7 +7473,6 @@
Message msg = mHandler.obtainMessage(reportDraw ? MSG_RESIZED_REPORT : MSG_RESIZED);
if (mTranslator != null) {
mTranslator.translateRectInScreenToAppWindow(frame);
- mTranslator.translateRectInScreenToAppWindow(overscanInsets);
mTranslator.translateRectInScreenToAppWindow(contentInsets);
mTranslator.translateRectInScreenToAppWindow(visibleInsets);
}
@@ -7530,9 +7483,7 @@
args.arg3 = sameProcessCall ? new Rect(visibleInsets) : visibleInsets;
args.arg4 = sameProcessCall && mergedConfiguration != null
? new MergedConfiguration(mergedConfiguration) : mergedConfiguration;
- args.arg5 = sameProcessCall ? new Rect(overscanInsets) : overscanInsets;
args.arg6 = sameProcessCall ? new Rect(stableInsets) : stableInsets;
- args.arg7 = sameProcessCall ? new Rect(outsets) : outsets;
args.arg8 = sameProcessCall ? new Rect(backDropFrame) : backDropFrame;
args.arg9 = displayCutout.get(); // DisplayCutout is immutable.
args.argi1 = forceLayout ? 1 : 0;
@@ -8637,15 +8588,15 @@
}
@Override
- public void resized(Rect frame, Rect overscanInsets, Rect contentInsets,
- Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,
+ public void resized(Rect frame, Rect contentInsets,
+ Rect visibleInsets, Rect stableInsets, boolean reportDraw,
MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout,
boolean alwaysConsumeSystemBars, int displayId,
DisplayCutout.ParcelableWrapper displayCutout) {
final ViewRootImpl viewAncestor = mViewAncestor.get();
if (viewAncestor != null) {
- viewAncestor.dispatchResized(frame, overscanInsets, contentInsets,
- visibleInsets, stableInsets, outsets, reportDraw, mergedConfiguration,
+ viewAncestor.dispatchResized(frame, contentInsets,
+ visibleInsets, stableInsets, reportDraw, mergedConfiguration,
backDropFrame, forceLayout, alwaysConsumeSystemBars, displayId,
displayCutout);
}
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 742ab77..c62e69c 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1445,7 +1445,10 @@
* position its UI elements with this overscan flag is set:</p>
*
* {@sample development/samples/ApiDemos/res/layout/overscan_activity.xml complete}
+ *
+ * @deprecated Overscan areas aren't set by any Android product anymore.
*/
+ @Deprecated
public static final int FLAG_LAYOUT_IN_OVERSCAN = 0x02000000;
/**
@@ -1685,6 +1688,7 @@
*
* {@hide}
*/
+ @UnsupportedAppUsage
@TestApi
public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 0x00000040;
@@ -1842,6 +1846,7 @@
* Control flags that are private to the platform.
* @hide
*/
+ @UnsupportedAppUsage
@ViewDebug.ExportedProperty(flagMapping = {
@ViewDebug.FlagToString(
mask = PRIVATE_FLAG_FAKE_HARDWARE_ACCELERATED,
diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java
index 403bfda..0ff6063 100644
--- a/core/java/android/view/WindowlessWindowManager.java
+++ b/core/java/android/view/WindowlessWindowManager.java
@@ -90,7 +90,7 @@
@Override
public int addToDisplay(IWindow window, int seq, WindowManager.LayoutParams attrs,
int viewVisibility, int displayId, Rect outFrame, Rect outContentInsets,
- Rect outStableInsets, Rect outOutsets,
+ Rect outStableInsets,
DisplayCutout.ParcelableWrapper outDisplayCutout, InputChannel outInputChannel,
InsetsState outInsetsState) {
final SurfaceControl.Builder b = new SurfaceControl.Builder(mSurfaceSession)
@@ -140,8 +140,8 @@
@Override
public int relayout(IWindow window, int seq, WindowManager.LayoutParams inAttrs,
int requestedWidth, int requestedHeight, int viewFlags, int flags, long frameNumber,
- Rect outFrame, Rect outOverscanInsets, Rect outContentInsets, Rect outVisibleInsets,
- Rect outStableInsets, Rect outsets, Rect outBackdropFrame,
+ Rect outFrame, Rect outContentInsets, Rect outVisibleInsets,
+ Rect outStableInsets, Rect outBackdropFrame,
DisplayCutout.ParcelableWrapper cutout, MergedConfiguration mergedConfiguration,
SurfaceControl outSurfaceControl, InsetsState outInsetsState) {
State state = null;
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index b33fdbb..a389555 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -4590,10 +4590,6 @@
* @param label The label for the new AccessibilityAction.
*/
public AccessibilityAction(int actionId, @Nullable CharSequence label) {
- if ((actionId & ACTION_TYPE_MASK) == 0 && Integer.bitCount(actionId) != 1) {
- throw new IllegalArgumentException("Invalid standard action id");
- }
-
mActionId = actionId;
mLabel = label;
}
diff --git a/core/java/android/view/inputmethod/BaseInputConnection.java b/core/java/android/view/inputmethod/BaseInputConnection.java
index 090e19f..ae2fb8e 100644
--- a/core/java/android/view/inputmethod/BaseInputConnection.java
+++ b/core/java/android/view/inputmethod/BaseInputConnection.java
@@ -211,6 +211,10 @@
* If this is greater than the number of existing characters between the cursor and
* the end of the text, then this method does not fail but deletes all the characters in
* that range.
+ *
+ * @return {@code true} when selected text is deleted, {@code false} when either the
+ * selection is invalid or not yet attached (i.e. selection start or end is -1),
+ * or the editable text is {@code null}.
*/
public boolean deleteSurroundingText(int beforeLength, int afterLength) {
if (DEBUG) Log.v(TAG, "deleteSurroundingText " + beforeLength
@@ -229,6 +233,12 @@
b = tmp;
}
+ // Skip when the selection is not yet attached.
+ if (a == -1 || b == -1) {
+ endBatchEdit();
+ return false;
+ }
+
// Ignore the composing text.
int ca = getComposingSpanStart(content);
int cb = getComposingSpanEnd(content);
@@ -247,8 +257,12 @@
if (beforeLength > 0) {
int start = a - beforeLength;
if (start < 0) start = 0;
- content.delete(start, a);
- deleted = a - start;
+
+ final int numDeleteBefore = a - start;
+ if (a >= 0 && numDeleteBefore > 0) {
+ content.delete(start, a);
+ deleted = numDeleteBefore;
+ }
}
if (afterLength > 0) {
@@ -257,7 +271,10 @@
int end = b + afterLength;
if (end > content.length()) end = content.length();
- content.delete(b, end);
+ final int numDeleteAfter = end - b;
+ if (b >= 0 && numDeleteAfter > 0) {
+ content.delete(b, end);
+ }
}
endBatchEdit();
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index e81db16..2650a67 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -655,14 +655,14 @@
} catch (RemoteException e) {
}
}
- // Check focus again in case that "onWindowFocus" is called before
- // handling this message.
- if (mServedView != null && canStartInput(mServedView)) {
- if (checkFocusNoStartInput(mRestartOnNextWindowFocus)) {
- final int reason = active ? StartInputReason.ACTIVATED_BY_IMMS
- : StartInputReason.DEACTIVATED_BY_IMMS;
- startInputInner(reason, null, 0, 0, 0);
- }
+ }
+ // Check focus again in case that "onWindowFocus" is called before
+ // handling this message.
+ if (mServedView != null && canStartInput(mServedView)) {
+ if (checkFocusNoStartInput(mRestartOnNextWindowFocus)) {
+ final int reason = active ? StartInputReason.ACTIVATED_BY_IMMS
+ : StartInputReason.DEACTIVATED_BY_IMMS;
+ startInputInner(reason, null, 0, 0, 0);
}
}
return;
@@ -1225,6 +1225,10 @@
*/
void clearBindingLocked() {
if (DEBUG) Log.v(TAG, "Clearing binding!");
+ if (mWindowFocusGainFuture != null) {
+ mWindowFocusGainFuture.cancel(false /* mayInterruptIfRunning */);
+ mWindowFocusGainFuture = null;
+ }
clearConnectionLocked();
setInputChannelLocked(null);
mBindSequence = -1;
diff --git a/core/java/android/view/textclassifier/TextClassificationSession.java b/core/java/android/view/textclassifier/TextClassificationSession.java
index cd2806a..6a706f5 100644
--- a/core/java/android/view/textclassifier/TextClassificationSession.java
+++ b/core/java/android/view/textclassifier/TextClassificationSession.java
@@ -70,6 +70,24 @@
}
@Override
+ public ConversationActions suggestConversationActions(ConversationActions.Request request) {
+ checkDestroyed();
+ return mDelegate.suggestConversationActions(request);
+ }
+
+ @Override
+ public TextLanguage detectLanguage(TextLanguage.Request request) {
+ checkDestroyed();
+ return mDelegate.detectLanguage(request);
+ }
+
+ @Override
+ public int getMaxGenerateLinksTextLength() {
+ checkDestroyed();
+ return mDelegate.getMaxGenerateLinksTextLength();
+ }
+
+ @Override
public void onSelectionEvent(SelectionEvent event) {
try {
if (mEventHelper.sanitizeEvent(event)) {
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index a428fea..882e81a 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -1267,12 +1267,12 @@
* current value is set to the {@link NumberPicker#getMaxValue()} value.
* </p>
* <p>
- * If the argument is less than the {@link NumberPicker#getMaxValue()} and
+ * If the argument is more than the {@link NumberPicker#getMaxValue()} and
* {@link NumberPicker#getWrapSelectorWheel()} is <code>false</code> the
* current value is set to the {@link NumberPicker#getMaxValue()} value.
* </p>
* <p>
- * If the argument is less than the {@link NumberPicker#getMaxValue()} and
+ * If the argument is more than the {@link NumberPicker#getMaxValue()} and
* {@link NumberPicker#getWrapSelectorWheel()} is <code>true</code> the
* current value is set to the {@link NumberPicker#getMinValue()} value.
* </p>
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index b1752a4..6c372e4 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -96,10 +96,7 @@
import android.view.ViewGroup.LayoutParams;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
import android.widget.ImageView;
-import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@@ -118,6 +115,8 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.ImageUtils;
+import com.android.internal.widget.GridLayoutManager;
+import com.android.internal.widget.RecyclerView;
import com.android.internal.widget.ResolverDrawerLayout;
import com.google.android.collect.Lists;
@@ -167,6 +166,7 @@
@VisibleForTesting
public static final int LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS = 250;
+ private static final int SINGLE_CELL_SPAN_SIZE = 1;
private boolean mIsAppPredictorComponentAvailable;
private AppPredictor mAppPredictor;
@@ -222,8 +222,9 @@
private long mQueriedTargetServicesTimeMs;
private long mQueriedSharingShortcutsTimeMs;
+ private RecyclerView mRecyclerView;
private ChooserListAdapter mChooserListAdapter;
- private ChooserRowAdapter mChooserRowAdapter;
+ private ChooserGridAdapter mChooserGridAdapter;
private int mChooserRowServiceSpacing;
private int mCurrAvailableWidth = 0;
@@ -351,8 +352,8 @@
Log.i(TAG, "Hiding image preview area. Timed out waiting for preview to load"
+ " within " + mImageLoadTimeoutMillis + "ms.");
collapseParentView();
- if (mChooserRowAdapter != null) {
- mChooserRowAdapter.hideContentPreview();
+ if (mChooserGridAdapter != null) {
+ mChooserGridAdapter.hideContentPreview();
}
mHideParentOnFail = false;
}
@@ -671,14 +672,14 @@
final float chooserHeaderScrollElevation =
getResources().getDimensionPixelSize(R.dimen.chooser_header_scroll_elevation);
- mAdapterView.setOnScrollListener(new AbsListView.OnScrollListener() {
- public void onScrollStateChanged(AbsListView view, int scrollState) {
+ mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+ public void onScrollStateChanged(RecyclerView view, int scrollState) {
}
- public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
- int totalItemCount) {
+ public void onScrolled(RecyclerView view, int dx, int dy) {
if (view.getChildCount() > 0) {
- if (firstVisibleItem > 0 || view.getChildAt(0).getTop() < 0) {
+ View child = view.getLayoutManager().findViewByPosition(0);
+ if (child == null || child.getTop() < 0) {
chooserHeader.setElevation(chooserHeaderScrollElevation);
return;
}
@@ -847,10 +848,7 @@
}
private ViewGroup displayContentPreview(@ContentPreviewType int previewType,
- Intent targetIntent, LayoutInflater layoutInflater, ViewGroup convertView,
- ViewGroup parent) {
- if (convertView != null) return convertView;
-
+ Intent targetIntent, LayoutInflater layoutInflater, ViewGroup parent) {
ViewGroup layout = null;
switch (previewType) {
@@ -1213,22 +1211,36 @@
}
@Override
- public void onPrepareAdapterView(AbsListView adapterView, ResolverListAdapter adapter) {
- final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null;
+ public void onPrepareAdapterView(ResolverListAdapter adapter, boolean isVisible) {
+ mRecyclerView = findViewById(R.id.resolver_list);
+ if (!isVisible) {
+ mRecyclerView.setVisibility(View.GONE);
+ return;
+ }
+ mRecyclerView.setVisibility(View.VISIBLE);
if (mCallerChooserTargets != null && mCallerChooserTargets.length > 0) {
mChooserListAdapter.addServiceResults(null, Lists.newArrayList(mCallerChooserTargets),
TARGET_TYPE_DEFAULT);
}
- mChooserRowAdapter = new ChooserRowAdapter(mChooserListAdapter);
- if (listView != null) {
- listView.setItemsCanFocus(true);
- }
+ mChooserGridAdapter = new ChooserGridAdapter(mChooserListAdapter);
+ GridLayoutManager glm = (GridLayoutManager) mRecyclerView.getLayoutManager();
+ glm.setSpanCount(mChooserGridAdapter.getMaxTargetsPerRow());
+ glm.setSpanSizeLookup(
+ new GridLayoutManager.SpanSizeLookup() {
+ @Override
+ public int getSpanSize(int position) {
+ return mChooserGridAdapter.getItemViewType(position)
+ == ChooserGridAdapter.VIEW_TYPE_NORMAL
+ ? SINGLE_CELL_SPAN_SIZE
+ : glm.getSpanCount();
+ }
+ });
}
@Override
- protected boolean rebuildList() {
+ protected boolean postRebuildList(boolean rebuildCompleted) {
mChooserListAdapter = (ChooserListAdapter) mAdapter;
- return rebuildListInternal();
+ return postRebuildListInternal(rebuildCompleted);
}
@Override
@@ -1996,8 +2008,8 @@
}
private void handleScroll(View view, int x, int y, int oldx, int oldy) {
- if (mChooserRowAdapter != null) {
- mChooserRowAdapter.handleScroll(view, y, oldy);
+ if (mChooserGridAdapter != null) {
+ mChooserGridAdapter.handleScroll(view, y, oldy);
}
}
@@ -2008,35 +2020,37 @@
*/
private void handleLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft,
int oldTop, int oldRight, int oldBottom) {
- if (mChooserRowAdapter == null || mAdapterView == null) {
+ if (mChooserGridAdapter == null || mRecyclerView == null) {
return;
}
final int availableWidth = right - left - v.getPaddingLeft() - v.getPaddingRight();
- if (mChooserRowAdapter.consumeLayoutRequest()
- || mChooserRowAdapter.calculateChooserTargetWidth(availableWidth)
- || mAdapterView.getAdapter() == null
+ if (mChooserGridAdapter.consumeLayoutRequest()
+ || mChooserGridAdapter.calculateChooserTargetWidth(availableWidth)
+ || mRecyclerView.getAdapter() == null
|| availableWidth != mCurrAvailableWidth) {
mCurrAvailableWidth = availableWidth;
- mAdapterView.setAdapter(mChooserRowAdapter);
+ mRecyclerView.setAdapter(mChooserGridAdapter);
+ ((GridLayoutManager) mRecyclerView.getLayoutManager())
+ .setSpanCount(mChooserGridAdapter.getMaxTargetsPerRow());
getMainThreadHandler().post(() -> {
- if (mResolverDrawerLayout == null || mChooserRowAdapter == null) {
+ if (mResolverDrawerLayout == null || mChooserGridAdapter == null) {
return;
}
final int bottomInset = mSystemWindowInsets != null
? mSystemWindowInsets.bottom : 0;
int offset = bottomInset;
- int rowsToShow = mChooserRowAdapter.getContentPreviewRowCount()
- + mChooserRowAdapter.getProfileRowCount()
- + mChooserRowAdapter.getServiceTargetRowCount()
- + mChooserRowAdapter.getCallerAndRankedTargetRowCount();
+ int rowsToShow = mChooserGridAdapter.getContentPreviewRowCount()
+ + mChooserGridAdapter.getProfileRowCount()
+ + mChooserGridAdapter.getServiceTargetRowCount()
+ + mChooserGridAdapter.getCallerAndRankedTargetRowCount();
// then this is most likely not a SEND_* action, so check
// the app target count
if (rowsToShow == 0) {
- rowsToShow = mChooserRowAdapter.getCount();
+ rowsToShow = mChooserGridAdapter.getRowCount();
}
// still zero? then use a default height and leave, which
@@ -2050,15 +2064,22 @@
int directShareHeight = 0;
rowsToShow = Math.min(4, rowsToShow);
- for (int i = 0; i < Math.min(rowsToShow, mAdapterView.getChildCount()); i++) {
- View child = mAdapterView.getChildAt(i);
+ for (int i = 0, childCount = mRecyclerView.getChildCount();
+ i < childCount && rowsToShow > 0; i++) {
+ View child = mRecyclerView.getChildAt(i);
+ if (((GridLayoutManager.LayoutParams)
+ child.getLayoutParams()).getSpanIndex() != 0) {
+ continue;
+ }
int height = child.getHeight();
offset += height;
- if (child.getTag() != null
- && (child.getTag() instanceof DirectShareViewHolder)) {
+ if (mChooserGridAdapter.getTargetType(
+ mRecyclerView.getChildAdapterPosition(child))
+ == mChooserListAdapter.TARGET_SERVICE) {
directShareHeight = height;
}
+ rowsToShow--;
}
boolean isExpandable = getResources().getConfiguration().orientation
@@ -2107,7 +2128,9 @@
@Override // ChooserListCommunicator
public int getMaxRankedTargets() {
- return mChooserRowAdapter == null ? 4 : mChooserRowAdapter.getMaxTargetsPerRow();
+ return mChooserGridAdapter == null
+ ? ChooserGridAdapter.MAX_TARGETS_PER_ROW_PORTRAIT
+ : mChooserGridAdapter.getMaxTargetsPerRow();
}
@Override // ChooserListCommunicator
@@ -2175,7 +2198,40 @@
return false;
}
- class ChooserRowAdapter extends BaseAdapter {
+ /**
+ * Used to bind types of individual item including
+ * {@link ChooserGridAdapter#VIEW_TYPE_NORMAL},
+ * {@link ChooserGridAdapter#VIEW_TYPE_CONTENT_PREVIEW},
+ * {@link ChooserGridAdapter#VIEW_TYPE_PROFILE},
+ * and {@link ChooserGridAdapter#VIEW_TYPE_AZ_LABEL}.
+ */
+ final class ItemViewHolder extends RecyclerView.ViewHolder {
+ ResolverListAdapter.ViewHolder mWrappedViewHolder;
+ int mListPosition = ChooserListAdapter.NO_POSITION;
+
+ ItemViewHolder(View itemView, boolean isClickable) {
+ super(itemView);
+ mWrappedViewHolder = new ResolverListAdapter.ViewHolder(itemView);
+ if (isClickable) {
+ itemView.setOnClickListener(v -> startSelected(mListPosition,
+ false/* always */, true/* filterd */));
+ itemView.setOnLongClickListener(v -> {
+ showTargetDetails(
+ mChooserListAdapter.resolveInfoForPosition(
+ mListPosition, true/* filtered */));
+ return true;
+ });
+ }
+ }
+ }
+
+ /**
+ * Adapter for all types of items and targets in ShareSheet.
+ * Note that ranked sections like Direct Share - while appearing grid-like - are handled on the
+ * row level by this adapter but not on the item level. Individual targets within the row are
+ * handled by {@link ChooserListAdapter}
+ */
+ final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private ChooserListAdapter mChooserListAdapter;
private final LayoutInflater mLayoutInflater;
@@ -2191,13 +2247,15 @@
private static final int VIEW_TYPE_CONTENT_PREVIEW = 2;
private static final int VIEW_TYPE_PROFILE = 3;
private static final int VIEW_TYPE_AZ_LABEL = 4;
+ private static final int VIEW_TYPE_CALLER_AND_RANK = 5;
private static final int MAX_TARGETS_PER_ROW_PORTRAIT = 4;
private static final int MAX_TARGETS_PER_ROW_LANDSCAPE = 8;
private static final int NUM_EXPANSIONS_TO_HIDE_AZ_LABEL = 20;
- public ChooserRowAdapter(ChooserListAdapter wrappedAdapter) {
+ ChooserGridAdapter(ChooserListAdapter wrappedAdapter) {
+ super();
mChooserListAdapter = wrappedAdapter;
mLayoutInflater = LayoutInflater.from(ChooserActivity.this);
@@ -2213,7 +2271,7 @@
@Override
public void onInvalidated() {
super.onInvalidated();
- notifyDataSetInvalidated();
+ notifyDataSetChanged();
}
});
}
@@ -2229,7 +2287,7 @@
return false;
}
- int newWidth = width / getMaxTargetsPerRow();
+ int newWidth = width / getMaxTargetsPerRow();
if (newWidth != mChooserTargetWidth) {
mChooserTargetWidth = newWidth;
return true;
@@ -2259,22 +2317,7 @@
return oldValue;
}
- @Override
- public boolean areAllItemsEnabled() {
- return false;
- }
-
- @Override
- public boolean isEnabled(int position) {
- int viewType = getItemViewType(position);
- if (viewType == VIEW_TYPE_CONTENT_PREVIEW || viewType == VIEW_TYPE_AZ_LABEL) {
- return false;
- }
- return true;
- }
-
- @Override
- public int getCount() {
+ public int getRowCount() {
return (int) (
getContentPreviewRowCount()
+ getProfileRowCount()
@@ -2326,42 +2369,50 @@
}
@Override
- public Object getItem(int position) {
- // We have nothing useful to return here.
- return position;
+ public int getItemCount() {
+ return (int) (
+ getContentPreviewRowCount()
+ + getProfileRowCount()
+ + getServiceTargetRowCount()
+ + getCallerAndRankedTargetRowCount()
+ + getAzLabelRowCount()
+ + mChooserListAdapter.getAlphaTargetCount()
+ );
}
@Override
- public long getItemId(int position) {
- return position;
+ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ switch (viewType) {
+ case VIEW_TYPE_CONTENT_PREVIEW:
+ return new ItemViewHolder(createContentPreviewView(parent), false);
+ case VIEW_TYPE_PROFILE:
+ return new ItemViewHolder(createProfileView(parent), false);
+ case VIEW_TYPE_AZ_LABEL:
+ return new ItemViewHolder(createAzLabelView(parent), false);
+ case VIEW_TYPE_NORMAL:
+ return new ItemViewHolder(mChooserListAdapter.createView(parent), true);
+ case VIEW_TYPE_DIRECT_SHARE:
+ case VIEW_TYPE_CALLER_AND_RANK:
+ return createItemGroupViewHolder(viewType, parent);
+ default:
+ // Since we catch all possible viewTypes above, no chance this is being called.
+ return null;
+ }
}
@Override
- public View getView(int position, View convertView, ViewGroup parent) {
- final RowViewHolder holder;
+ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
int viewType = getItemViewType(position);
-
- if (viewType == VIEW_TYPE_CONTENT_PREVIEW) {
- return createContentPreviewView(convertView, parent);
+ switch (viewType) {
+ case VIEW_TYPE_DIRECT_SHARE:
+ case VIEW_TYPE_CALLER_AND_RANK:
+ bindItemGroupViewHolder(position, (ItemGroupViewHolder) holder);
+ break;
+ case VIEW_TYPE_NORMAL:
+ bindItemViewHolder(position, (ItemViewHolder) holder);
+ break;
+ default:
}
-
- if (viewType == VIEW_TYPE_PROFILE) {
- return createProfileView(convertView, parent);
- }
-
- if (viewType == VIEW_TYPE_AZ_LABEL) {
- return createAzLabelView(parent);
- }
-
- if (convertView == null) {
- holder = createViewHolder(viewType, parent);
- } else {
- holder = (RowViewHolder) convertView.getTag();
- }
-
- bindViewHolder(position, holder);
-
- return holder.getViewGroup();
}
@Override
@@ -2378,7 +2429,7 @@
if (count > 0 && position < countSum) return VIEW_TYPE_DIRECT_SHARE;
countSum += (count = getCallerAndRankedTargetRowCount());
- if (count > 0 && position < countSum) return VIEW_TYPE_NORMAL;
+ if (count > 0 && position < countSum) return VIEW_TYPE_CALLER_AND_RANK;
countSum += (count = getAzLabelRowCount());
if (count > 0 && position < countSum) return VIEW_TYPE_AZ_LABEL;
@@ -2386,27 +2437,22 @@
return VIEW_TYPE_NORMAL;
}
- @Override
- public int getViewTypeCount() {
- return 5;
+ public int getTargetType(int position) {
+ return mChooserListAdapter.getPositionTargetType(getListPosition(position));
}
- private ViewGroup createContentPreviewView(View convertView, ViewGroup parent) {
+ private ViewGroup createContentPreviewView(ViewGroup parent) {
Intent targetIntent = getTargetIntent();
int previewType = findPreferredContentPreview(targetIntent, getContentResolver());
- if (convertView == null) {
- getMetricsLogger().write(new LogMaker(MetricsEvent.ACTION_SHARE_WITH_PREVIEW)
+ getMetricsLogger().write(new LogMaker(MetricsEvent.ACTION_SHARE_WITH_PREVIEW)
.setSubtype(previewType));
- }
- return displayContentPreview(previewType, targetIntent, mLayoutInflater,
- (ViewGroup) convertView, parent);
+ return displayContentPreview(previewType, targetIntent, mLayoutInflater, parent);
}
- private View createProfileView(View convertView, ViewGroup parent) {
- View profileRow = convertView != null ? convertView : mLayoutInflater.inflate(
- R.layout.chooser_profile_row, parent, false);
+ private View createProfileView(ViewGroup parent) {
+ View profileRow = mLayoutInflater.inflate(R.layout.chooser_profile_row, parent, false);
profileRow.setBackground(
getResources().getDrawable(R.drawable.chooser_row_layer_list, null));
mProfileView = profileRow.findViewById(R.id.profile_button);
@@ -2419,7 +2465,7 @@
return mLayoutInflater.inflate(R.layout.chooser_az_label_row, parent, false);
}
- private RowViewHolder loadViewsIntoRow(RowViewHolder holder) {
+ private ItemGroupViewHolder loadViewsIntoGroup(ItemGroupViewHolder holder) {
final int spec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
final int exactSpec = MeasureSpec.makeMeasureSpec(mChooserTargetWidth,
MeasureSpec.EXACTLY);
@@ -2445,7 +2491,7 @@
return true;
}
});
- ViewGroup row = holder.addView(i, v);
+ holder.addView(i, v);
// Force Direct Share to be 2 lines and auto-wrap to second line via hoz scroll =
// false. TextView#setHorizontallyScrolling must be reset after #setLines. Must be
@@ -2490,7 +2536,7 @@
}
}
- RowViewHolder createViewHolder(int viewType, ViewGroup parent) {
+ ItemGroupViewHolder createItemGroupViewHolder(int viewType, ViewGroup parent) {
if (viewType == VIEW_TYPE_DIRECT_SHARE) {
ViewGroup parentGroup = (ViewGroup) mLayoutInflater.inflate(
R.layout.chooser_row_direct_share, parent, false);
@@ -2503,14 +2549,14 @@
mDirectShareViewHolder = new DirectShareViewHolder(parentGroup,
Lists.newArrayList(row1, row2), getMaxTargetsPerRow());
- loadViewsIntoRow(mDirectShareViewHolder);
+ loadViewsIntoGroup(mDirectShareViewHolder);
return mDirectShareViewHolder;
} else {
ViewGroup row = (ViewGroup) mLayoutInflater.inflate(R.layout.chooser_row, parent,
false);
- RowViewHolder holder = new SingleRowViewHolder(row, getMaxTargetsPerRow());
- loadViewsIntoRow(holder);
+ ItemGroupViewHolder holder = new SingleRowViewHolder(row, getMaxTargetsPerRow());
+ loadViewsIntoGroup(holder);
return holder;
}
@@ -2538,19 +2584,20 @@
return positionType;
}
- void bindViewHolder(int rowPosition, RowViewHolder holder) {
- final int start = getFirstRowPosition(rowPosition);
- final int startType = getRowType(start);
- final int lastStartType = getRowType(getFirstRowPosition(rowPosition - 1));
+ void bindItemViewHolder(int position, ItemViewHolder holder) {
+ View v = holder.itemView;
+ int listPosition = getListPosition(position);
+ holder.mListPosition = listPosition;
+ mChooserListAdapter.bindView(listPosition, v);
+ }
- final ViewGroup row = holder.getViewGroup();
-
- if (startType != lastStartType
- || rowPosition == getContentPreviewRowCount() + getProfileRowCount()) {
- row.setForeground(
+ void bindItemGroupViewHolder(int position, ItemGroupViewHolder holder) {
+ final ViewGroup viewGroup = (ViewGroup) holder.itemView;
+ int start = getListPosition(position);
+ int startType = getRowType(start);
+ if (viewGroup.getForeground() == null) {
+ viewGroup.setForeground(
getResources().getDrawable(R.drawable.chooser_row_layer_list, null));
- } else {
- row.setForeground(null);
}
int columnCount = holder.getColumnCount();
@@ -2560,7 +2607,7 @@
}
if (end == start && mChooserListAdapter.getItem(start) instanceof EmptyTargetInfo) {
- final TextView textView = row.findViewById(R.id.chooser_row_text_option);
+ final TextView textView = viewGroup.findViewById(R.id.chooser_row_text_option);
if (textView.getVisibility() != View.VISIBLE) {
textView.setAlpha(0.0f);
@@ -2597,27 +2644,28 @@
}
}
- int getFirstRowPosition(int row) {
- row -= getContentPreviewRowCount() + getProfileRowCount();
+ int getListPosition(int position) {
+ position -= getContentPreviewRowCount() + getProfileRowCount();
final int serviceCount = mChooserListAdapter.getServiceTargetCount();
final int serviceRows = (int) Math.ceil((float) serviceCount
/ ChooserListAdapter.MAX_SERVICE_TARGETS);
- if (row < serviceRows) {
- return row * getMaxTargetsPerRow();
+ if (position < serviceRows) {
+ return position * getMaxTargetsPerRow();
}
+ position -= serviceRows;
+
final int callerAndRankedCount = mChooserListAdapter.getCallerTargetCount()
+ mChooserListAdapter.getRankedTargetCount();
final int callerAndRankedRows = getCallerAndRankedTargetRowCount();
- if (row < callerAndRankedRows + serviceRows) {
- return serviceCount + (row - serviceRows) * getMaxTargetsPerRow();
+ if (position < callerAndRankedRows) {
+ return serviceCount + position * getMaxTargetsPerRow();
}
- row -= getAzLabelRowCount();
+ position -= getAzLabelRowCount() + callerAndRankedRows;
- return callerAndRankedCount + serviceCount
- + (row - callerAndRankedRows - serviceRows) * getMaxTargetsPerRow();
+ return callerAndRankedCount + serviceCount + position;
}
public void handleScroll(View v, int y, int oldy) {
@@ -2631,18 +2679,24 @@
&& !isInMultiWindowMode();
if (mDirectShareViewHolder != null && canExpandDirectShare) {
- mDirectShareViewHolder.handleScroll(mAdapterView, y, oldy, getMaxTargetsPerRow());
+ mDirectShareViewHolder.handleScroll(mRecyclerView, y, oldy, getMaxTargetsPerRow());
}
}
}
- abstract class RowViewHolder {
+ /**
+ * Used to bind types for group of items including:
+ * {@link ChooserGridAdapter#VIEW_TYPE_DIRECT_SHARE},
+ * and {@link ChooserGridAdapter#VIEW_TYPE_CALLER_AND_RANK}.
+ */
+ abstract class ItemGroupViewHolder extends RecyclerView.ViewHolder {
protected int mMeasuredRowHeight;
private int[] mItemIndices;
protected final View[] mCells;
private final int mColumnCount;
- RowViewHolder(int cellCount) {
+ ItemGroupViewHolder(int cellCount, View itemView) {
+ super(itemView);
this.mCells = new View[cellCount];
this.mItemIndices = new int[cellCount];
this.mColumnCount = cellCount;
@@ -2685,11 +2739,11 @@
}
}
- class SingleRowViewHolder extends RowViewHolder {
+ class SingleRowViewHolder extends ItemGroupViewHolder {
private final ViewGroup mRow;
SingleRowViewHolder(ViewGroup row, int cellCount) {
- super(cellCount);
+ super(cellCount, row);
this.mRow = row;
}
@@ -2719,7 +2773,7 @@
}
}
- class DirectShareViewHolder extends RowViewHolder {
+ class DirectShareViewHolder extends ItemGroupViewHolder {
private final ViewGroup mParent;
private final List<ViewGroup> mRows;
private int mCellCountPerRow;
@@ -2732,7 +2786,7 @@
private final boolean[] mCellVisibility;
DirectShareViewHolder(ViewGroup parent, List<ViewGroup> rows, int cellCountPerRow) {
- super(rows.size() * cellCountPerRow);
+ super(rows.size() * cellCountPerRow, parent);
this.mParent = parent;
this.mRows = rows;
@@ -2767,7 +2821,7 @@
mDirectShareMinHeight = getRow(0).getMeasuredHeight();
mDirectShareCurrHeight = mDirectShareCurrHeight > 0
- ? mDirectShareCurrHeight : mDirectShareMinHeight;
+ ? mDirectShareCurrHeight : mDirectShareMinHeight;
mDirectShareMaxHeight = 2 * mDirectShareMinHeight;
}
@@ -2800,7 +2854,7 @@
}
}
- public void handleScroll(AbsListView view, int y, int oldy, int maxTargetsPerRow) {
+ public void handleScroll(RecyclerView view, int y, int oldy, int maxTargetsPerRow) {
// only exit early if fully collapsed, otherwise onListRebuilt() with shifting
// targets can lock us into an expanded mode
boolean notExpanded = mDirectShareCurrHeight == mDirectShareMinHeight;
diff --git a/core/java/com/android/internal/app/ChooserListAdapter.java b/core/java/com/android/internal/app/ChooserListAdapter.java
index 38f4c64..4eccf21 100644
--- a/core/java/com/android/internal/app/ChooserListAdapter.java
+++ b/core/java/com/android/internal/app/ChooserListAdapter.java
@@ -49,6 +49,7 @@
private static final String TAG = "ChooserListAdapter";
private static final boolean DEBUG = false;
+ public static final int NO_POSITION = -1;
public static final int TARGET_BAD = -1;
public static final int TARGET_CALLER = 0;
public static final int TARGET_SERVICE = 1;
@@ -189,7 +190,7 @@
}
@Override
- public View onCreateView(ViewGroup parent) {
+ View onCreateView(ViewGroup parent) {
return mInflater.inflate(
com.android.internal.R.layout.resolve_grid_item, parent, false);
}
@@ -321,6 +322,10 @@
*/
@Override
public TargetInfo targetInfoForPosition(int position, boolean filtered) {
+ if (position == NO_POSITION) {
+ return null;
+ }
+
int offset = 0;
// Direct share targets
diff --git a/core/java/com/android/internal/app/LocaleStore.java b/core/java/com/android/internal/app/LocaleStore.java
index c11089b..49f77e1 100644
--- a/core/java/com/android/internal/app/LocaleStore.java
+++ b/core/java/com/android/internal/app/LocaleStore.java
@@ -194,7 +194,7 @@
private static Set<String> getSimCountries(Context context) {
Set<String> result = new HashSet<>();
- TelephonyManager tm = TelephonyManager.from(context);
+ TelephonyManager tm = context.getSystemService(TelephonyManager.class);
if (tm != null) {
String iso = tm.getSimCountryIso().toUpperCase(Locale.US);
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 1beb1c5..0997cf8 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -97,7 +97,7 @@
@UnsupportedAppUsage
protected ResolverListAdapter mAdapter;
private boolean mSafeForwardingMode;
- protected AbsListView mAdapterView;
+ private AbsListView mAdapterView;
private Button mAlwaysButton;
private Button mOnceButton;
protected View mProfileView;
@@ -328,9 +328,8 @@
boolean filterLastUsed = mSupportsAlwaysUseOption && !isVoiceInteraction();
mAdapter = createAdapter(this, mIntents, initialIntents, rList,
filterLastUsed, mUseLayoutForBrowsables);
- configureContentView();
- if (rebuildList()) {
+ if (configureContentView()) {
return;
}
@@ -1063,33 +1062,39 @@
/**
* Sets up the content view.
+ * @return <code>true</code> if the activity is finishing and creation should halt.
*/
- private void configureContentView() {
+ private boolean configureContentView() {
if (mAdapter == null) {
throw new IllegalStateException("mAdapter cannot be null.");
}
+ boolean rebuildCompleted = mAdapter.rebuildList();
if (useLayoutWithDefault()) {
mLayoutId = R.layout.resolver_list_with_default;
} else {
mLayoutId = getLayoutResource();
}
setContentView(mLayoutId);
- mAdapterView = findViewById(R.id.resolver_list);
+ return postRebuildList(rebuildCompleted);
}
/**
- * Returns true if the activity is finishing and creation should halt.
- * </p>Subclasses must call rebuildListInternal at the end of rebuildList.
+ * Finishing procedures to be performed after the list has been rebuilt.
+ * </p>Subclasses must call postRebuildListInternal at the end of postRebuildList.
+ * @param rebuildCompleted
+ * @return <code>true</code> if the activity is finishing and creation should halt.
*/
- protected boolean rebuildList() {
- return rebuildListInternal();
+ protected boolean postRebuildList(boolean rebuildCompleted) {
+ return postRebuildListInternal(rebuildCompleted);
}
/**
- * Returns true if the activity is finishing and creation should halt.
+ * Finishing procedures to be performed after the list has been rebuilt.
+ * @param rebuildCompleted
+ * @return <code>true</code> if the activity is finishing and creation should halt.
*/
- final boolean rebuildListInternal() {
- boolean rebuildCompleted = mAdapter.rebuildList();
+ final boolean postRebuildListInternal(boolean rebuildCompleted) {
+
int count = mAdapter.getUnfilteredCount();
// We only rebuild asynchronously when we have multiple elements to sort. In the case where
@@ -1108,26 +1113,37 @@
}
}
+ boolean isAdapterViewVisible = true;
if (count == 0 && mAdapter.getPlaceholderCount() == 0) {
final TextView emptyView = findViewById(R.id.empty);
emptyView.setVisibility(View.VISIBLE);
- mAdapterView.setVisibility(View.GONE);
- } else {
- mAdapterView.setVisibility(View.VISIBLE);
- onPrepareAdapterView(mAdapterView, mAdapter);
+ isAdapterViewVisible = false;
}
+
+ onPrepareAdapterView(mAdapter, isAdapterViewVisible);
return false;
}
- public void onPrepareAdapterView(AbsListView adapterView, ResolverListAdapter adapter) {
+ /**
+ * Prepare the scrollable view which consumes data in the list adapter.
+ * @param adapter The adapter used to provide data to item views.
+ * @param isVisible True if the scrollable view should be visible; false, otherwise.
+ */
+ public void onPrepareAdapterView(ResolverListAdapter adapter, boolean isVisible) {
+ mAdapterView = findViewById(R.id.resolver_list);
+ if (!isVisible) {
+ mAdapterView.setVisibility(View.GONE);
+ return;
+ }
+ mAdapterView.setVisibility(View.VISIBLE);
final boolean useHeader = adapter.hasFilteredItem();
- final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null;
+ final ListView listView = mAdapterView instanceof ListView ? (ListView) mAdapterView : null;
- adapterView.setAdapter(mAdapter);
+ mAdapterView.setAdapter(mAdapter);
final ItemClickListener listener = new ItemClickListener();
- adapterView.setOnItemClickListener(listener);
- adapterView.setOnItemLongClickListener(listener);
+ mAdapterView.setOnItemClickListener(listener);
+ mAdapterView.setOnItemLongClickListener(listener);
if (mSupportsAlwaysUseOption || mUseLayoutForBrowsables) {
listView.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java
index 0286aa6..4570c6f 100644
--- a/core/java/com/android/internal/app/ResolverListAdapter.java
+++ b/core/java/com/android/internal/app/ResolverListAdapter.java
@@ -491,7 +491,7 @@
return view;
}
- public View onCreateView(ViewGroup parent) {
+ View onCreateView(ViewGroup parent) {
return mInflater.inflate(
com.android.internal.R.layout.resolve_list_item, parent, false);
}
diff --git a/core/java/com/android/internal/car/ICarStatsService.aidl b/core/java/com/android/internal/car/ICarStatsService.aidl
new file mode 100644
index 0000000..170b448
--- /dev/null
+++ b/core/java/com/android/internal/car/ICarStatsService.aidl
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 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.internal.car;
+
+import android.os.StatsLogEventWrapper;
+
+/**
+ * Interface for pulling statsd atoms from automotive devices.
+ *
+ * @hide
+ */
+interface ICarStatsService {
+ /**
+ * Pull the specified atom. Results will be sent to statsd when complete.
+ */
+ StatsLogEventWrapper[] pullData(int atomId);
+}
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index b02563a..c33b6dc 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -236,7 +236,6 @@
ViewGroup mContentRoot;
private Rect mTempRect;
- private Rect mOutsets = new Rect();
// This is the caption view for the window, containing the caption and window control
// buttons. The visibility of this decor depends on the workspace and the window type.
@@ -729,24 +728,6 @@
}
}
- getOutsets(mOutsets);
- if (mOutsets.top > 0 || mOutsets.bottom > 0) {
- int mode = MeasureSpec.getMode(heightMeasureSpec);
- if (mode != MeasureSpec.UNSPECIFIED) {
- int height = MeasureSpec.getSize(heightMeasureSpec);
- heightMeasureSpec = MeasureSpec.makeMeasureSpec(
- height + mOutsets.top + mOutsets.bottom, mode);
- }
- }
- if (mOutsets.left > 0 || mOutsets.right > 0) {
- int mode = MeasureSpec.getMode(widthMeasureSpec);
- if (mode != MeasureSpec.UNSPECIFIED) {
- int width = MeasureSpec.getSize(widthMeasureSpec);
- widthMeasureSpec = MeasureSpec.makeMeasureSpec(
- width + mOutsets.left + mOutsets.right, mode);
- }
- }
-
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int width = getMeasuredWidth();
@@ -785,13 +766,6 @@
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
- getOutsets(mOutsets);
- if (mOutsets.left > 0) {
- offsetLeftAndRight(-mOutsets.left);
- }
- if (mOutsets.top > 0) {
- offsetTopAndBottom(-mOutsets.top);
- }
if (mApplyFloatingVerticalInsets) {
offsetTopAndBottom(mFloatingInsets.top);
}
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index c8ba0a0..227ef28 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -2378,10 +2378,6 @@
& (~getForcedWindowFlags()));
}
- if (a.getBoolean(R.styleable.Window_windowOverscan, false)) {
- setFlags(FLAG_LAYOUT_IN_OVERSCAN, FLAG_LAYOUT_IN_OVERSCAN&(~getForcedWindowFlags()));
- }
-
if (a.getBoolean(R.styleable.Window_windowShowWallpaper, false)) {
setFlags(FLAG_SHOW_WALLPAPER, FLAG_SHOW_WALLPAPER&(~getForcedWindowFlags()));
}
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 73f549a..20706bb 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -188,4 +188,14 @@
* @param types the internal insets types of the bars are about to abort the transient state.
*/
void abortTransient(int displayId, in int[] types);
+
+ /**
+ * Show a warning that the device is about to go to sleep due to user inactivity.
+ */
+ void showInattentiveSleepWarning();
+
+ /**
+ * Dismiss the warning that the device is about to go to sleep due to user inactivity.
+ */
+ void dismissInattentiveSleepWarning();
}
diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index 3f08710..76235a4 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -113,4 +113,14 @@
void onBiometricError(int modality, int error, int vendorCode);
// Used to hide the authentication dialog, e.g. when the application cancels authentication
void hideAuthenticationDialog();
+
+ /**
+ * Show a warning that the device is about to go to sleep due to user inactivity.
+ */
+ void showInattentiveSleepWarning();
+
+ /**
+ * Dismiss the warning that the device is about to go to sleep due to user inactivity.
+ */
+ void dismissInattentiveSleepWarning();
}
diff --git a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl
index d7a7af1..9ae0ba5 100644
--- a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl
+++ b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl
@@ -32,16 +32,22 @@
import com.android.internal.telephony.IOnSubscriptionsChangedListener;
interface ITelephonyRegistry {
- void addOnSubscriptionsChangedListener(String pkg,
+ void addOnSubscriptionsChangedListener(String pkg, String featureId,
IOnSubscriptionsChangedListener callback);
- void addOnOpportunisticSubscriptionsChangedListener(String pkg,
+ void addOnOpportunisticSubscriptionsChangedListener(String pkg, String featureId,
IOnSubscriptionsChangedListener callback);
void removeOnSubscriptionsChangedListener(String pkg,
IOnSubscriptionsChangedListener callback);
+ /**
+ * @deprecated Use {@link #listenWithFeature(String, String, IPhoneStateListener, int,
+ * boolean) instead
+ */
@UnsupportedAppUsage
void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow);
- void listenForSubscriber(in int subId, String pkg, IPhoneStateListener callback, int events,
+ void listenWithFeature(String pkg, String featureId, IPhoneStateListener callback, int events,
boolean notifyNow);
+ void listenForSubscriber(in int subId, String pkg, String featureId,
+ IPhoneStateListener callback, int events, boolean notifyNow);
@UnsupportedAppUsage
void notifyCallStateForAllSubs(int state, String incomingNumber);
void notifyCallState(in int phoneId, in int subId, int state, String incomingNumber);
diff --git a/core/java/com/android/internal/util/ScreenShapeHelper.java b/core/java/com/android/internal/util/ScreenShapeHelper.java
deleted file mode 100644
index 5f390be..0000000
--- a/core/java/com/android/internal/util/ScreenShapeHelper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.android.internal.util;
-
-import android.content.res.Resources;
-import android.os.Build;
-import android.os.SystemProperties;
-import android.view.ViewRootImpl;
-
-/**
- * @hide
- */
-public class ScreenShapeHelper {
- /**
- * Return the bottom pixel window outset of a window given its style attributes.
- * @return An outset dimension in pixels or 0 if no outset should be applied.
- */
- public static int getWindowOutsetBottomPx(Resources resources) {
- if (Build.IS_EMULATOR) {
- return SystemProperties.getInt(ViewRootImpl.PROPERTY_EMULATOR_WIN_OUTSET_BOTTOM_PX, 0);
- } else {
- return resources.getInteger(com.android.internal.R.integer.config_windowOutsetBottom);
- }
- }
-}
diff --git a/core/java/com/android/internal/view/BaseIWindow.java b/core/java/com/android/internal/view/BaseIWindow.java
index 7e1f13a..c7cdc3b 100644
--- a/core/java/com/android/internal/view/BaseIWindow.java
+++ b/core/java/com/android/internal/view/BaseIWindow.java
@@ -49,8 +49,8 @@
}
@Override
- public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets,
- Rect stableInsets, Rect outsets, boolean reportDraw,
+ public void resized(Rect frame, Rect contentInsets, Rect visibleInsets,
+ Rect stableInsets, boolean reportDraw,
MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout,
boolean alwaysConsumeSystemBars, int displayId,
DisplayCutout.ParcelableWrapper displayCutout) {
diff --git a/core/java/com/android/internal/widget/GridLayoutManager.java b/core/java/com/android/internal/widget/GridLayoutManager.java
new file mode 100644
index 0000000..e0502f1
--- /dev/null
+++ b/core/java/com/android/internal/widget/GridLayoutManager.java
@@ -0,0 +1,1065 @@
+/*
+ * Copyright (C) 2019 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.internal.widget;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.SparseIntArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import java.util.Arrays;
+
+/**
+ * Note: This GridLayoutManager widget may lack of latest fix because it is ported from
+ * oc-dr1-release version of android.support.v7.widget.GridLayoutManager due to compatibility
+ * concern with other internal widgets, like {@link RecyclerView} and {@link LinearLayoutManager},
+ * and is merely used for {@link com.android.internal.app.ChooserActivity}.
+ *
+ * A {@link RecyclerView.LayoutManager} implementations that lays out items in a grid.
+ * <p>
+ * By default, each item occupies 1 span. You can change it by providing a custom
+ * {@link SpanSizeLookup} instance via {@link #setSpanSizeLookup(SpanSizeLookup)}.
+ */
+public class GridLayoutManager extends LinearLayoutManager {
+ private static final boolean DEBUG = false;
+ private static final String TAG = "GridLayoutManager";
+ public static final int DEFAULT_SPAN_COUNT = -1;
+ /**
+ * Span size have been changed but we've not done a new layout calculation.
+ */
+ boolean mPendingSpanCountChange = false;
+ int mSpanCount = DEFAULT_SPAN_COUNT;
+ /**
+ * Right borders for each span.
+ * <p>For <b>i-th</b> item start is {@link #mCachedBorders}[i-1] + 1
+ * and end is {@link #mCachedBorders}[i].
+ */
+ int[] mCachedBorders;
+ /**
+ * Temporary array to keep views in layoutChunk method
+ */
+ View[] mSet;
+ final SparseIntArray mPreLayoutSpanSizeCache = new SparseIntArray();
+ final SparseIntArray mPreLayoutSpanIndexCache = new SparseIntArray();
+ SpanSizeLookup mSpanSizeLookup = new DefaultSpanSizeLookup();
+ // re-used variable to acquire decor insets from RecyclerView
+ final Rect mDecorInsets = new Rect();
+
+ /**
+ * Constructor used when layout manager is set in XML by RecyclerView attribute
+ * "layoutManager". If spanCount is not specified in the XML, it defaults to a
+ * single column.
+ *
+ */
+ public GridLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ Properties properties = getProperties(context, attrs, defStyleAttr, defStyleRes);
+ setSpanCount(properties.spanCount);
+ }
+
+ /**
+ * Creates a vertical GridLayoutManager
+ *
+ * @param context Current context, will be used to access resources.
+ * @param spanCount The number of columns in the grid
+ */
+ public GridLayoutManager(Context context, int spanCount) {
+ super(context);
+ setSpanCount(spanCount);
+ }
+
+ /**
+ * @param context Current context, will be used to access resources.
+ * @param spanCount The number of columns or rows in the grid
+ * @param orientation Layout orientation. Should be {@link #HORIZONTAL} or {@link
+ * #VERTICAL}.
+ * @param reverseLayout When set to true, layouts from end to start.
+ */
+ public GridLayoutManager(Context context, int spanCount, int orientation,
+ boolean reverseLayout) {
+ super(context, orientation, reverseLayout);
+ setSpanCount(spanCount);
+ }
+
+ /**
+ * stackFromEnd is not supported by GridLayoutManager. Consider using
+ * {@link #setReverseLayout(boolean)}.
+ */
+ @Override
+ public void setStackFromEnd(boolean stackFromEnd) {
+ if (stackFromEnd) {
+ throw new UnsupportedOperationException(
+ "GridLayoutManager does not support stack from end."
+ + " Consider using reverse layout");
+ }
+ super.setStackFromEnd(false);
+ }
+
+ @Override
+ public int getRowCountForAccessibility(RecyclerView.Recycler recycler,
+ RecyclerView.State state) {
+ if (mOrientation == HORIZONTAL) {
+ return mSpanCount;
+ }
+ if (state.getItemCount() < 1) {
+ return 0;
+ }
+ // Row count is one more than the last item's row index.
+ return getSpanGroupIndex(recycler, state, state.getItemCount() - 1) + 1;
+ }
+
+ @Override
+ public int getColumnCountForAccessibility(RecyclerView.Recycler recycler,
+ RecyclerView.State state) {
+ if (mOrientation == VERTICAL) {
+ return mSpanCount;
+ }
+ if (state.getItemCount() < 1) {
+ return 0;
+ }
+ // Column count is one more than the last item's column index.
+ return getSpanGroupIndex(recycler, state, state.getItemCount() - 1) + 1;
+ }
+
+ @Override
+ public void onInitializeAccessibilityNodeInfoForItem(RecyclerView.Recycler recycler,
+ RecyclerView.State state, View host, AccessibilityNodeInfo info) {
+ ViewGroup.LayoutParams lp = host.getLayoutParams();
+ if (!(lp instanceof LayoutParams)) {
+ super.onInitializeAccessibilityNodeInfoForItem(host, info);
+ return;
+ }
+ LayoutParams glp = (LayoutParams) lp;
+ int spanGroupIndex = getSpanGroupIndex(recycler, state, glp.getViewLayoutPosition());
+ if (mOrientation == HORIZONTAL) {
+ info.setCollectionItemInfo(AccessibilityNodeInfo.CollectionItemInfo.obtain(
+ glp.getSpanIndex(), glp.getSpanSize(),
+ spanGroupIndex, 1,
+ mSpanCount > 1 && glp.getSpanSize() == mSpanCount, false));
+ } else { // VERTICAL
+ info.setCollectionItemInfo(AccessibilityNodeInfo.CollectionItemInfo.obtain(
+ spanGroupIndex, 1,
+ glp.getSpanIndex(), glp.getSpanSize(),
+ mSpanCount > 1 && glp.getSpanSize() == mSpanCount, false));
+ }
+ }
+
+ @Override
+ public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+ if (state.isPreLayout()) {
+ cachePreLayoutSpanMapping();
+ }
+ super.onLayoutChildren(recycler, state);
+ if (DEBUG) {
+ validateChildOrder();
+ }
+ clearPreLayoutSpanMappingCache();
+ }
+
+ @Override
+ public void onLayoutCompleted(RecyclerView.State state) {
+ super.onLayoutCompleted(state);
+ mPendingSpanCountChange = false;
+ }
+
+ private void clearPreLayoutSpanMappingCache() {
+ mPreLayoutSpanSizeCache.clear();
+ mPreLayoutSpanIndexCache.clear();
+ }
+
+ private void cachePreLayoutSpanMapping() {
+ final int childCount = getChildCount();
+ for (int i = 0; i < childCount; i++) {
+ final LayoutParams lp = (LayoutParams) getChildAt(i).getLayoutParams();
+ final int viewPosition = lp.getViewLayoutPosition();
+ mPreLayoutSpanSizeCache.put(viewPosition, lp.getSpanSize());
+ mPreLayoutSpanIndexCache.put(viewPosition, lp.getSpanIndex());
+ }
+ }
+
+ @Override
+ public void onItemsAdded(RecyclerView recyclerView, int positionStart, int itemCount) {
+ mSpanSizeLookup.invalidateSpanIndexCache();
+ }
+
+ @Override
+ public void onItemsChanged(RecyclerView recyclerView) {
+ mSpanSizeLookup.invalidateSpanIndexCache();
+ }
+
+ @Override
+ public void onItemsRemoved(RecyclerView recyclerView, int positionStart, int itemCount) {
+ mSpanSizeLookup.invalidateSpanIndexCache();
+ }
+
+ @Override
+ public void onItemsUpdated(RecyclerView recyclerView, int positionStart, int itemCount,
+ Object payload) {
+ mSpanSizeLookup.invalidateSpanIndexCache();
+ }
+
+ @Override
+ public void onItemsMoved(RecyclerView recyclerView, int from, int to, int itemCount) {
+ mSpanSizeLookup.invalidateSpanIndexCache();
+ }
+
+ @Override
+ public RecyclerView.LayoutParams generateDefaultLayoutParams() {
+ if (mOrientation == HORIZONTAL) {
+ return new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.MATCH_PARENT);
+ } else {
+ return new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT);
+ }
+ }
+
+ @Override
+ public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {
+ return new LayoutParams(c, attrs);
+ }
+
+ @Override
+ public RecyclerView.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {
+ if (lp instanceof ViewGroup.MarginLayoutParams) {
+ return new LayoutParams((ViewGroup.MarginLayoutParams) lp);
+ } else {
+ return new LayoutParams(lp);
+ }
+ }
+
+ @Override
+ public boolean checkLayoutParams(RecyclerView.LayoutParams lp) {
+ return lp instanceof LayoutParams;
+ }
+
+ /**
+ * Sets the source to get the number of spans occupied by each item in the adapter.
+ *
+ * @param spanSizeLookup {@link SpanSizeLookup} instance to be used to query number of spans
+ * occupied by each item
+ */
+ public void setSpanSizeLookup(SpanSizeLookup spanSizeLookup) {
+ mSpanSizeLookup = spanSizeLookup;
+ }
+
+ /**
+ * Returns the current {@link SpanSizeLookup} used by the GridLayoutManager.
+ *
+ * @return The current {@link SpanSizeLookup} used by the GridLayoutManager.
+ */
+ public SpanSizeLookup getSpanSizeLookup() {
+ return mSpanSizeLookup;
+ }
+
+ private void updateMeasurements() {
+ int totalSpace;
+ if (getOrientation() == VERTICAL) {
+ totalSpace = getWidth() - getPaddingRight() - getPaddingLeft();
+ } else {
+ totalSpace = getHeight() - getPaddingBottom() - getPaddingTop();
+ }
+ calculateItemBorders(totalSpace);
+ }
+
+ @Override
+ public void setMeasuredDimension(Rect childrenBounds, int wSpec, int hSpec) {
+ if (mCachedBorders == null) {
+ super.setMeasuredDimension(childrenBounds, wSpec, hSpec);
+ }
+ final int width, height;
+ final int horizontalPadding = getPaddingLeft() + getPaddingRight();
+ final int verticalPadding = getPaddingTop() + getPaddingBottom();
+ if (mOrientation == VERTICAL) {
+ final int usedHeight = childrenBounds.height() + verticalPadding;
+ height = chooseSize(hSpec, usedHeight, getMinimumHeight());
+ width = chooseSize(wSpec, mCachedBorders[mCachedBorders.length - 1] + horizontalPadding,
+ getMinimumWidth());
+ } else {
+ final int usedWidth = childrenBounds.width() + horizontalPadding;
+ width = chooseSize(wSpec, usedWidth, getMinimumWidth());
+ height = chooseSize(hSpec, mCachedBorders[mCachedBorders.length - 1] + verticalPadding,
+ getMinimumHeight());
+ }
+ setMeasuredDimension(width, height);
+ }
+
+ /**
+ * @param totalSpace Total available space after padding is removed
+ */
+ private void calculateItemBorders(int totalSpace) {
+ mCachedBorders = calculateItemBorders(mCachedBorders, mSpanCount, totalSpace);
+ }
+
+ /**
+ * @param cachedBorders The out array
+ * @param spanCount number of spans
+ * @param totalSpace total available space after padding is removed
+ * @return The updated array. Might be the same instance as the provided array if its size
+ * has not changed.
+ */
+ static int[] calculateItemBorders(int[] cachedBorders, int spanCount, int totalSpace) {
+ if (cachedBorders == null || cachedBorders.length != spanCount + 1
+ || cachedBorders[cachedBorders.length - 1] != totalSpace) {
+ cachedBorders = new int[spanCount + 1];
+ }
+ cachedBorders[0] = 0;
+ int sizePerSpan = totalSpace / spanCount;
+ int sizePerSpanRemainder = totalSpace % spanCount;
+ int consumedPixels = 0;
+ int additionalSize = 0;
+ for (int i = 1; i <= spanCount; i++) {
+ int itemSize = sizePerSpan;
+ additionalSize += sizePerSpanRemainder;
+ if (additionalSize > 0 && (spanCount - additionalSize) < sizePerSpanRemainder) {
+ itemSize += 1;
+ additionalSize -= spanCount;
+ }
+ consumedPixels += itemSize;
+ cachedBorders[i] = consumedPixels;
+ }
+ return cachedBorders;
+ }
+
+ int getSpaceForSpanRange(int startSpan, int spanSize) {
+ if (mOrientation == VERTICAL && isLayoutRTL()) {
+ return mCachedBorders[mSpanCount - startSpan]
+ - mCachedBorders[mSpanCount - startSpan - spanSize];
+ } else {
+ return mCachedBorders[startSpan + spanSize] - mCachedBorders[startSpan];
+ }
+ }
+
+ @Override
+ void onAnchorReady(RecyclerView.Recycler recycler, RecyclerView.State state,
+ AnchorInfo anchorInfo, int itemDirection) {
+ super.onAnchorReady(recycler, state, anchorInfo, itemDirection);
+ updateMeasurements();
+ if (state.getItemCount() > 0 && !state.isPreLayout()) {
+ ensureAnchorIsInCorrectSpan(recycler, state, anchorInfo, itemDirection);
+ }
+ ensureViewSet();
+ }
+
+ private void ensureViewSet() {
+ if (mSet == null || mSet.length != mSpanCount) {
+ mSet = new View[mSpanCount];
+ }
+ }
+
+ @Override
+ public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,
+ RecyclerView.State state) {
+ updateMeasurements();
+ ensureViewSet();
+ return super.scrollHorizontallyBy(dx, recycler, state);
+ }
+
+ @Override
+ public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,
+ RecyclerView.State state) {
+ updateMeasurements();
+ ensureViewSet();
+ return super.scrollVerticallyBy(dy, recycler, state);
+ }
+
+ private void ensureAnchorIsInCorrectSpan(RecyclerView.Recycler recycler,
+ RecyclerView.State state, AnchorInfo anchorInfo, int itemDirection) {
+ final boolean layingOutInPrimaryDirection =
+ itemDirection == LayoutState.ITEM_DIRECTION_TAIL;
+ int span = getSpanIndex(recycler, state, anchorInfo.mPosition);
+ if (layingOutInPrimaryDirection) {
+ // choose span 0
+ while (span > 0 && anchorInfo.mPosition > 0) {
+ anchorInfo.mPosition--;
+ span = getSpanIndex(recycler, state, anchorInfo.mPosition);
+ }
+ } else {
+ // choose the max span we can get. hopefully last one
+ final int indexLimit = state.getItemCount() - 1;
+ int pos = anchorInfo.mPosition;
+ int bestSpan = span;
+ while (pos < indexLimit) {
+ int next = getSpanIndex(recycler, state, pos + 1);
+ if (next > bestSpan) {
+ pos += 1;
+ bestSpan = next;
+ } else {
+ break;
+ }
+ }
+ anchorInfo.mPosition = pos;
+ }
+ }
+
+ @Override
+ View findReferenceChild(RecyclerView.Recycler recycler, RecyclerView.State state,
+ int start, int end, int itemCount) {
+ ensureLayoutState();
+ View invalidMatch = null;
+ View outOfBoundsMatch = null;
+ final int boundsStart = mOrientationHelper.getStartAfterPadding();
+ final int boundsEnd = mOrientationHelper.getEndAfterPadding();
+ final int diff = end > start ? 1 : -1;
+ for (int i = start; i != end; i += diff) {
+ final View view = getChildAt(i);
+ final int position = getPosition(view);
+ if (position >= 0 && position < itemCount) {
+ final int span = getSpanIndex(recycler, state, position);
+ if (span != 0) {
+ continue;
+ }
+ if (((RecyclerView.LayoutParams) view.getLayoutParams()).isItemRemoved()) {
+ if (invalidMatch == null) {
+ invalidMatch = view; // removed item, least preferred
+ }
+ } else if (mOrientationHelper.getDecoratedStart(view) >= boundsEnd
+ || mOrientationHelper.getDecoratedEnd(view) < boundsStart) {
+ if (outOfBoundsMatch == null) {
+ outOfBoundsMatch = view; // item is not visible, less preferred
+ }
+ } else {
+ return view;
+ }
+ }
+ }
+ return outOfBoundsMatch != null ? outOfBoundsMatch : invalidMatch;
+ }
+
+ private int getSpanGroupIndex(RecyclerView.Recycler recycler, RecyclerView.State state,
+ int viewPosition) {
+ if (!state.isPreLayout()) {
+ return mSpanSizeLookup.getSpanGroupIndex(viewPosition, mSpanCount);
+ }
+ final int adapterPosition = recycler.convertPreLayoutPositionToPostLayout(viewPosition);
+ if (adapterPosition == -1) {
+ if (DEBUG) {
+ throw new RuntimeException("Cannot find span group index for position "
+ + viewPosition);
+ }
+ Log.w(TAG, "Cannot find span size for pre layout position. " + viewPosition);
+ return 0;
+ }
+ return mSpanSizeLookup.getSpanGroupIndex(adapterPosition, mSpanCount);
+ }
+
+ private int getSpanIndex(RecyclerView.Recycler recycler, RecyclerView.State state, int pos) {
+ if (!state.isPreLayout()) {
+ return mSpanSizeLookup.getCachedSpanIndex(pos, mSpanCount);
+ }
+ final int cached = mPreLayoutSpanIndexCache.get(pos, -1);
+ if (cached != -1) {
+ return cached;
+ }
+ final int adapterPosition = recycler.convertPreLayoutPositionToPostLayout(pos);
+ if (adapterPosition == -1) {
+ if (DEBUG) {
+ throw new RuntimeException("Cannot find span index for pre layout position. It is"
+ + " not cached, not in the adapter. Pos:" + pos);
+ }
+ Log.w(TAG, "Cannot find span size for pre layout position. It is"
+ + " not cached, not in the adapter. Pos:" + pos);
+ return 0;
+ }
+ return mSpanSizeLookup.getCachedSpanIndex(adapterPosition, mSpanCount);
+ }
+
+ private int getSpanSize(RecyclerView.Recycler recycler, RecyclerView.State state, int pos) {
+ if (!state.isPreLayout()) {
+ return mSpanSizeLookup.getSpanSize(pos);
+ }
+ final int cached = mPreLayoutSpanSizeCache.get(pos, -1);
+ if (cached != -1) {
+ return cached;
+ }
+ final int adapterPosition = recycler.convertPreLayoutPositionToPostLayout(pos);
+ if (adapterPosition == -1) {
+ if (DEBUG) {
+ throw new RuntimeException("Cannot find span size for pre layout position. It is"
+ + " not cached, not in the adapter. Pos:" + pos);
+ }
+ Log.w(TAG, "Cannot find span size for pre layout position. It is"
+ + " not cached, not in the adapter. Pos:" + pos);
+ return 1;
+ }
+ return mSpanSizeLookup.getSpanSize(adapterPosition);
+ }
+
+ @Override
+ void collectPrefetchPositionsForLayoutState(RecyclerView.State state, LayoutState layoutState,
+ LayoutPrefetchRegistry layoutPrefetchRegistry) {
+ int remainingSpan = mSpanCount;
+ int count = 0;
+ while (count < mSpanCount && layoutState.hasMore(state) && remainingSpan > 0) {
+ final int pos = layoutState.mCurrentPosition;
+ layoutPrefetchRegistry.addPosition(pos, Math.max(0, layoutState.mScrollingOffset));
+ final int spanSize = mSpanSizeLookup.getSpanSize(pos);
+ remainingSpan -= spanSize;
+ layoutState.mCurrentPosition += layoutState.mItemDirection;
+ count++;
+ }
+ }
+
+ @Override
+ void layoutChunk(RecyclerView.Recycler recycler, RecyclerView.State state,
+ LayoutState layoutState, LayoutChunkResult result) {
+ final int otherDirSpecMode = mOrientationHelper.getModeInOther();
+ final boolean flexibleInOtherDir = otherDirSpecMode != View.MeasureSpec.EXACTLY;
+ final int currentOtherDirSize = getChildCount() > 0 ? mCachedBorders[mSpanCount] : 0;
+ // if grid layout's dimensions are not specified, let the new row change the measurements
+ // This is not perfect since we not covering all rows but still solves an important case
+ // where they may have a header row which should be laid out according to children.
+ if (flexibleInOtherDir) {
+ updateMeasurements(); // reset measurements
+ }
+ final boolean layingOutInPrimaryDirection =
+ layoutState.mItemDirection == LayoutState.ITEM_DIRECTION_TAIL;
+ int count = 0;
+ int consumedSpanCount = 0;
+ int remainingSpan = mSpanCount;
+ if (!layingOutInPrimaryDirection) {
+ int itemSpanIndex = getSpanIndex(recycler, state, layoutState.mCurrentPosition);
+ int itemSpanSize = getSpanSize(recycler, state, layoutState.mCurrentPosition);
+ remainingSpan = itemSpanIndex + itemSpanSize;
+ }
+ while (count < mSpanCount && layoutState.hasMore(state) && remainingSpan > 0) {
+ int pos = layoutState.mCurrentPosition;
+ final int spanSize = getSpanSize(recycler, state, pos);
+ if (spanSize > mSpanCount) {
+ throw new IllegalArgumentException("Item at position " + pos + " requires "
+ + spanSize + " spans but GridLayoutManager has only " + mSpanCount
+ + " spans.");
+ }
+ remainingSpan -= spanSize;
+ if (remainingSpan < 0) {
+ break; // item did not fit into this row or column
+ }
+ View view = layoutState.next(recycler);
+ if (view == null) {
+ break;
+ }
+ consumedSpanCount += spanSize;
+ mSet[count] = view;
+ count++;
+ }
+ if (count == 0) {
+ result.mFinished = true;
+ return;
+ }
+ int maxSize = 0;
+ float maxSizeInOther = 0; // use a float to get size per span
+ // we should assign spans before item decor offsets are calculated
+ assignSpans(recycler, state, count, consumedSpanCount, layingOutInPrimaryDirection);
+ for (int i = 0; i < count; i++) {
+ View view = mSet[i];
+ if (layoutState.mScrapList == null) {
+ if (layingOutInPrimaryDirection) {
+ addView(view);
+ } else {
+ addView(view, 0);
+ }
+ } else {
+ if (layingOutInPrimaryDirection) {
+ addDisappearingView(view);
+ } else {
+ addDisappearingView(view, 0);
+ }
+ }
+ calculateItemDecorationsForChild(view, mDecorInsets);
+ measureChild(view, otherDirSpecMode, false);
+ final int size = mOrientationHelper.getDecoratedMeasurement(view);
+ if (size > maxSize) {
+ maxSize = size;
+ }
+ final LayoutParams lp = (LayoutParams) view.getLayoutParams();
+ final float otherSize = 1f * mOrientationHelper.getDecoratedMeasurementInOther(view)
+ / lp.mSpanSize;
+ if (otherSize > maxSizeInOther) {
+ maxSizeInOther = otherSize;
+ }
+ }
+ if (flexibleInOtherDir) {
+ // re-distribute columns
+ guessMeasurement(maxSizeInOther, currentOtherDirSize);
+ // now we should re-measure any item that was match parent.
+ maxSize = 0;
+ for (int i = 0; i < count; i++) {
+ View view = mSet[i];
+ measureChild(view, View.MeasureSpec.EXACTLY, true);
+ final int size = mOrientationHelper.getDecoratedMeasurement(view);
+ if (size > maxSize) {
+ maxSize = size;
+ }
+ }
+ }
+ // Views that did not measure the maxSize has to be re-measured
+ // We will stop doing this once we introduce Gravity in the GLM layout params
+ for (int i = 0; i < count; i++) {
+ final View view = mSet[i];
+ if (mOrientationHelper.getDecoratedMeasurement(view) != maxSize) {
+ final LayoutParams lp = (LayoutParams) view.getLayoutParams();
+ final Rect decorInsets = lp.mDecorInsets;
+ final int verticalInsets = decorInsets.top + decorInsets.bottom
+ + lp.topMargin + lp.bottomMargin;
+ final int horizontalInsets = decorInsets.left + decorInsets.right
+ + lp.leftMargin + lp.rightMargin;
+ final int totalSpaceInOther = getSpaceForSpanRange(lp.mSpanIndex, lp.mSpanSize);
+ final int wSpec;
+ final int hSpec;
+ if (mOrientation == VERTICAL) {
+ wSpec = getChildMeasureSpec(totalSpaceInOther, View.MeasureSpec.EXACTLY,
+ horizontalInsets, lp.width, false);
+ hSpec = View.MeasureSpec.makeMeasureSpec(maxSize - verticalInsets,
+ View.MeasureSpec.EXACTLY);
+ } else {
+ wSpec = View.MeasureSpec.makeMeasureSpec(maxSize - horizontalInsets,
+ View.MeasureSpec.EXACTLY);
+ hSpec = getChildMeasureSpec(totalSpaceInOther, View.MeasureSpec.EXACTLY,
+ verticalInsets, lp.height, false);
+ }
+ measureChildWithDecorationsAndMargin(view, wSpec, hSpec, true);
+ }
+ }
+ result.mConsumed = maxSize;
+ int left = 0, right = 0, top = 0, bottom = 0;
+ if (mOrientation == VERTICAL) {
+ if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+ bottom = layoutState.mOffset;
+ top = bottom - maxSize;
+ } else {
+ top = layoutState.mOffset;
+ bottom = top + maxSize;
+ }
+ } else {
+ if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+ right = layoutState.mOffset;
+ left = right - maxSize;
+ } else {
+ left = layoutState.mOffset;
+ right = left + maxSize;
+ }
+ }
+ for (int i = 0; i < count; i++) {
+ View view = mSet[i];
+ LayoutParams params = (LayoutParams) view.getLayoutParams();
+ if (mOrientation == VERTICAL) {
+ if (isLayoutRTL()) {
+ right = getPaddingLeft() + mCachedBorders[mSpanCount - params.mSpanIndex];
+ left = right - mOrientationHelper.getDecoratedMeasurementInOther(view);
+ } else {
+ left = getPaddingLeft() + mCachedBorders[params.mSpanIndex];
+ right = left + mOrientationHelper.getDecoratedMeasurementInOther(view);
+ }
+ } else {
+ top = getPaddingTop() + mCachedBorders[params.mSpanIndex];
+ bottom = top + mOrientationHelper.getDecoratedMeasurementInOther(view);
+ }
+ // We calculate everything with View's bounding box (which includes decor and margins)
+ // To calculate correct layout position, we subtract margins.
+ layoutDecoratedWithMargins(view, left, top, right, bottom);
+ if (DEBUG) {
+ Log.d(TAG, "laid out child at position " + getPosition(view) + ", with l:"
+ + (left + params.leftMargin) + ", t:" + (top + params.topMargin) + ", r:"
+ + (right - params.rightMargin) + ", b:" + (bottom - params.bottomMargin)
+ + ", span:" + params.mSpanIndex + ", spanSize:" + params.mSpanSize);
+ }
+ // Consume the available space if the view is not removed OR changed
+ if (params.isItemRemoved() || params.isItemChanged()) {
+ result.mIgnoreConsumed = true;
+ }
+ result.mFocusable |= view.hasFocusable();
+ }
+ Arrays.fill(mSet, null);
+ }
+
+ /**
+ * Measures a child with currently known information. This is not necessarily the child's final
+ * measurement. (see fillChunk for details).
+ *
+ * @param view The child view to be measured
+ * @param otherDirParentSpecMode The RV measure spec that should be used in the secondary
+ * orientation
+ * @param alreadyMeasured True if we've already measured this view once
+ */
+ private void measureChild(View view, int otherDirParentSpecMode, boolean alreadyMeasured) {
+ final LayoutParams lp = (LayoutParams) view.getLayoutParams();
+ final Rect decorInsets = lp.mDecorInsets;
+ final int verticalInsets = decorInsets.top + decorInsets.bottom
+ + lp.topMargin + lp.bottomMargin;
+ final int horizontalInsets = decorInsets.left + decorInsets.right
+ + lp.leftMargin + lp.rightMargin;
+ final int availableSpaceInOther = getSpaceForSpanRange(lp.mSpanIndex, lp.mSpanSize);
+ final int wSpec;
+ final int hSpec;
+ if (mOrientation == VERTICAL) {
+ wSpec = getChildMeasureSpec(availableSpaceInOther, otherDirParentSpecMode,
+ horizontalInsets, lp.width, false);
+ hSpec = getChildMeasureSpec(mOrientationHelper.getTotalSpace(), getHeightMode(),
+ verticalInsets, lp.height, true);
+ } else {
+ hSpec = getChildMeasureSpec(availableSpaceInOther, otherDirParentSpecMode,
+ verticalInsets, lp.height, false);
+ wSpec = getChildMeasureSpec(mOrientationHelper.getTotalSpace(), getWidthMode(),
+ horizontalInsets, lp.width, true);
+ }
+ measureChildWithDecorationsAndMargin(view, wSpec, hSpec, alreadyMeasured);
+ }
+
+ /**
+ * This is called after laying out a row (if vertical) or a column (if horizontal) when the
+ * RecyclerView does not have exact measurement specs.
+ * <p>
+ * Here we try to assign a best guess width or height and re-do the layout to update other
+ * views that wanted to MATCH_PARENT in the non-scroll orientation.
+ *
+ * @param maxSizeInOther The maximum size per span ratio from the measurement of the
+ * children.
+ * @param currentOtherDirSize The size before this layout chunk. There is no reason to go below.
+ */
+ private void guessMeasurement(float maxSizeInOther, int currentOtherDirSize) {
+ final int contentSize = Math.round(maxSizeInOther * mSpanCount);
+ // always re-calculate because borders were stretched during the fill
+ calculateItemBorders(Math.max(contentSize, currentOtherDirSize));
+ }
+
+ private void measureChildWithDecorationsAndMargin(View child, int widthSpec, int heightSpec,
+ boolean alreadyMeasured) {
+ RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+ final boolean measure;
+ if (alreadyMeasured) {
+ measure = shouldReMeasureChild(child, widthSpec, heightSpec, lp);
+ } else {
+ measure = shouldMeasureChild(child, widthSpec, heightSpec, lp);
+ }
+ if (measure) {
+ child.measure(widthSpec, heightSpec);
+ }
+ }
+
+ private void assignSpans(RecyclerView.Recycler recycler, RecyclerView.State state, int count,
+ int consumedSpanCount, boolean layingOutInPrimaryDirection) {
+ // spans are always assigned from 0 to N no matter if it is RTL or not.
+ // RTL is used only when positioning the view.
+ int span, start, end, diff;
+ // make sure we traverse from min position to max position
+ if (layingOutInPrimaryDirection) {
+ start = 0;
+ end = count;
+ diff = 1;
+ } else {
+ start = count - 1;
+ end = -1;
+ diff = -1;
+ }
+ span = 0;
+ for (int i = start; i != end; i += diff) {
+ View view = mSet[i];
+ LayoutParams params = (LayoutParams) view.getLayoutParams();
+ params.mSpanSize = getSpanSize(recycler, state, getPosition(view));
+ params.mSpanIndex = span;
+ span += params.mSpanSize;
+ }
+ }
+
+ /**
+ * Returns the number of spans laid out by this grid.
+ *
+ * @return The number of spans
+ * @see #setSpanCount(int)
+ */
+ public int getSpanCount() {
+ return mSpanCount;
+ }
+
+ /**
+ * Sets the number of spans to be laid out.
+ * <p>
+ * If {@link #getOrientation()} is {@link #VERTICAL}, this is the number of columns.
+ * If {@link #getOrientation()} is {@link #HORIZONTAL}, this is the number of rows.
+ *
+ * @param spanCount The total number of spans in the grid
+ * @see #getSpanCount()
+ */
+ public void setSpanCount(int spanCount) {
+ if (spanCount == mSpanCount) {
+ return;
+ }
+ mPendingSpanCountChange = true;
+ if (spanCount < 1) {
+ throw new IllegalArgumentException("Span count should be at least 1. Provided "
+ + spanCount);
+ }
+ mSpanCount = spanCount;
+ mSpanSizeLookup.invalidateSpanIndexCache();
+ requestLayout();
+ }
+
+ /**
+ * A helper class to provide the number of spans each item occupies.
+ * <p>
+ * Default implementation sets each item to occupy exactly 1 span.
+ *
+ * @see GridLayoutManager#setSpanSizeLookup(SpanSizeLookup)
+ */
+ public abstract static class SpanSizeLookup {
+ final SparseIntArray mSpanIndexCache = new SparseIntArray();
+ private boolean mCacheSpanIndices = false;
+
+ /**
+ * Returns the number of span occupied by the item at <code>position</code>.
+ *
+ * @param position The adapter position of the item
+ * @return The number of spans occupied by the item at the provided position
+ */
+ public abstract int getSpanSize(int position);
+
+ /**
+ * Sets whether the results of {@link #getSpanIndex(int, int)} method should be cached or
+ * not. By default these values are not cached. If you are not overriding
+ * {@link #getSpanIndex(int, int)}, you should set this to true for better performance.
+ *
+ * @param cacheSpanIndices Whether results of getSpanIndex should be cached or not.
+ */
+ public void setSpanIndexCacheEnabled(boolean cacheSpanIndices) {
+ mCacheSpanIndices = cacheSpanIndices;
+ }
+
+ /**
+ * Clears the span index cache. GridLayoutManager automatically calls this method when
+ * adapter changes occur.
+ */
+ public void invalidateSpanIndexCache() {
+ mSpanIndexCache.clear();
+ }
+
+ /**
+ * Returns whether results of {@link #getSpanIndex(int, int)} method are cached or not.
+ *
+ * @return True if results of {@link #getSpanIndex(int, int)} are cached.
+ */
+ public boolean isSpanIndexCacheEnabled() {
+ return mCacheSpanIndices;
+ }
+
+ int getCachedSpanIndex(int position, int spanCount) {
+ if (!mCacheSpanIndices) {
+ return getSpanIndex(position, spanCount);
+ }
+ final int existing = mSpanIndexCache.get(position, -1);
+ if (existing != -1) {
+ return existing;
+ }
+ final int value = getSpanIndex(position, spanCount);
+ mSpanIndexCache.put(position, value);
+ return value;
+ }
+
+ /**
+ * Returns the final span index of the provided position.
+ * <p>
+ * If you have a faster way to calculate span index for your items, you should override
+ * this method. Otherwise, you should enable span index cache
+ * ({@link #setSpanIndexCacheEnabled(boolean)}) for better performance. When caching is
+ * disabled, default implementation traverses all items from 0 to
+ * <code>position</code>. When caching is enabled, it calculates from the closest cached
+ * value before the <code>position</code>.
+ * <p>
+ * If you override this method, you need to make sure it is consistent with
+ * {@link #getSpanSize(int)}. GridLayoutManager does not call this method for
+ * each item. It is called only for the reference item and rest of the items
+ * are assigned to spans based on the reference item. For example, you cannot assign a
+ * position to span 2 while span 1 is empty.
+ * <p>
+ * Note that span offsets always start with 0 and are not affected by RTL.
+ *
+ * @param position The position of the item
+ * @param spanCount The total number of spans in the grid
+ * @return The final span position of the item. Should be between 0 (inclusive) and
+ * <code>spanCount</code>(exclusive)
+ */
+ public int getSpanIndex(int position, int spanCount) {
+ int positionSpanSize = getSpanSize(position);
+ if (positionSpanSize == spanCount) {
+ return 0; // quick return for full-span items
+ }
+ int span = 0;
+ int startPos = 0;
+ // If caching is enabled, try to jump
+ if (mCacheSpanIndices && mSpanIndexCache.size() > 0) {
+ int prevKey = findReferenceIndexFromCache(position);
+ if (prevKey >= 0) {
+ span = mSpanIndexCache.get(prevKey) + getSpanSize(prevKey);
+ startPos = prevKey + 1;
+ }
+ }
+ for (int i = startPos; i < position; i++) {
+ int size = getSpanSize(i);
+ span += size;
+ if (span == spanCount) {
+ span = 0;
+ } else if (span > spanCount) {
+ // did not fit, moving to next row / column
+ span = size;
+ }
+ }
+ if (span + positionSpanSize <= spanCount) {
+ return span;
+ }
+ return 0;
+ }
+
+ int findReferenceIndexFromCache(int position) {
+ int lo = 0;
+ int hi = mSpanIndexCache.size() - 1;
+ while (lo <= hi) {
+ final int mid = (lo + hi) >>> 1;
+ final int midVal = mSpanIndexCache.keyAt(mid);
+ if (midVal < position) {
+ lo = mid + 1;
+ } else {
+ hi = mid - 1;
+ }
+ }
+ int index = lo - 1;
+ if (index >= 0 && index < mSpanIndexCache.size()) {
+ return mSpanIndexCache.keyAt(index);
+ }
+ return -1;
+ }
+
+ /**
+ * Returns the index of the group this position belongs.
+ * <p>
+ * For example, if grid has 3 columns and each item occupies 1 span, span group index
+ * for item 1 will be 0, item 5 will be 1.
+ *
+ * @param adapterPosition The position in adapter
+ * @param spanCount The total number of spans in the grid
+ * @return The index of the span group including the item at the given adapter position
+ */
+ public int getSpanGroupIndex(int adapterPosition, int spanCount) {
+ int span = 0;
+ int group = 0;
+ int positionSpanSize = getSpanSize(adapterPosition);
+ for (int i = 0; i < adapterPosition; i++) {
+ int size = getSpanSize(i);
+ span += size;
+ if (span == spanCount) {
+ span = 0;
+ group++;
+ } else if (span > spanCount) {
+ // did not fit, moving to next row / column
+ span = size;
+ group++;
+ }
+ }
+ if (span + positionSpanSize > spanCount) {
+ group++;
+ }
+ return group;
+ }
+ }
+
+ @Override
+ public boolean supportsPredictiveItemAnimations() {
+ return mPendingSavedState == null && !mPendingSpanCountChange;
+ }
+
+ /**
+ * Default implementation for {@link SpanSizeLookup}. Each item occupies 1 span.
+ */
+ public static final class DefaultSpanSizeLookup extends SpanSizeLookup {
+ @Override
+ public int getSpanSize(int position) {
+ return 1;
+ }
+
+ @Override
+ public int getSpanIndex(int position, int spanCount) {
+ return position % spanCount;
+ }
+ }
+
+ /**
+ * LayoutParams used by GridLayoutManager.
+ * <p>
+ * Note that if the orientation is {@link #VERTICAL}, the width parameter is ignored and if the
+ * orientation is {@link #HORIZONTAL} the height parameter is ignored because child view is
+ * expected to fill all of the space given to it.
+ */
+ public static class LayoutParams extends RecyclerView.LayoutParams {
+ /**
+ * Span Id for Views that are not laid out yet.
+ */
+ public static final int INVALID_SPAN_ID = -1;
+ int mSpanIndex = INVALID_SPAN_ID;
+ int mSpanSize = 0;
+
+ public LayoutParams(Context c, AttributeSet attrs) {
+ super(c, attrs);
+ }
+
+ public LayoutParams(int width, int height) {
+ super(width, height);
+ }
+
+ public LayoutParams(ViewGroup.MarginLayoutParams source) {
+ super(source);
+ }
+
+ public LayoutParams(ViewGroup.LayoutParams source) {
+ super(source);
+ }
+
+ public LayoutParams(RecyclerView.LayoutParams source) {
+ super(source);
+ }
+
+ /**
+ * Returns the current span index of this View. If the View is not laid out yet, the return
+ * value is <code>undefined</code>.
+ * <p>
+ * Starting with RecyclerView <b>24.2.0</b>, span indices are always indexed from position 0
+ * even if the layout is RTL. In a vertical GridLayoutManager, <b>leftmost</b> span is span
+ * 0 if the layout is <b>LTR</b> and <b>rightmost</b> span is span 0 if the layout is
+ * <b>RTL</b>. Prior to 24.2.0, it was the opposite which was conflicting with
+ * {@link SpanSizeLookup#getSpanIndex(int, int)}.
+ * <p>
+ * If the View occupies multiple spans, span with the minimum index is returned.
+ *
+ * @return The span index of the View.
+ */
+ public int getSpanIndex() {
+ return mSpanIndex;
+ }
+
+ /**
+ * Returns the number of spans occupied by this View. If the View not laid out yet, the
+ * return value is <code>undefined</code>.
+ *
+ * @return The number of spans occupied by this View.
+ */
+ public int getSpanSize() {
+ return mSpanSize;
+ }
+ }
+}
diff --git a/core/java/com/android/server/pm/UserTypeDetails.java b/core/java/com/android/server/pm/UserTypeDetails.java
new file mode 100644
index 0000000..5fc3ba1
--- /dev/null
+++ b/core/java/com/android/server/pm/UserTypeDetails.java
@@ -0,0 +1,388 @@
+/*
+ * Copyright (C) 2019 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.pm;
+
+import android.annotation.ColorRes;
+import android.annotation.DrawableRes;
+import android.annotation.NonNull;
+import android.annotation.StringRes;
+import android.content.pm.UserInfo;
+import android.content.pm.UserInfo.UserInfoFlag;
+import android.content.res.Resources;
+import android.os.UserManager;
+
+import com.android.internal.util.Preconditions;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Contains the details about a multiuser "user type", such as a
+ * {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
+ *
+ * Tests are located in UserManagerServiceUserTypeTest.java.
+ * @hide
+ */
+public final class UserTypeDetails {
+
+ /** Indicates that there is no limit to the number of users allowed. */
+ public static final int UNLIMITED_NUMBER_OF_USERS = -1;
+
+ /** Name of the user type, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}. */
+ private final @NonNull String mName;
+
+ // TODO(b/142482943): Currently unused. Hook this up.
+ private final boolean mEnabled;
+
+ // TODO(b/142482943): Currently unused and not set. Hook this up.
+ private final int mLabel;
+
+ /**
+ * Maximum number of this user type allowed on the device.
+ * Use {@link #UNLIMITED_NUMBER_OF_USERS} to indicate that there is no hard limit.
+ */
+ private final int mMaxAllowed;
+
+ /**
+ * Maximum number of this user type allowed per parent (for user types, like profiles, that
+ * have parents).
+ * Use {@link #UNLIMITED_NUMBER_OF_USERS} to indicate that there is no hard limit.
+ */
+ // TODO(b/142482943): Should this also apply to restricted profiles?
+ private final int mMaxAllowedPerParent;
+
+ // TODO(b/143784345): Update doc when we clean up UserInfo.
+ /** The {@link UserInfo.UserInfoFlag} representing the base type of this user. */
+ private final @UserInfoFlag int mBaseType;
+
+ // TODO(b/143784345): Update doc/name when we clean up UserInfo.
+ /** The {@link UserInfo.UserInfoFlag}s that all users of this type will automatically have. */
+ private final @UserInfoFlag int mDefaultUserInfoPropertyFlags;
+
+ // TODO(b/142482943): Hook these up to something and set them for each type.
+ private final List<String> mDefaultRestrictions;
+
+
+ // Fields for profiles only, controlling the nature of their badges.
+ // All badge information should be set if {@link #hasBadge()} is true.
+
+ /** Resource ID of the badge put on icons. */
+ private @DrawableRes final int mIconBadge;
+ /** Resource ID of the badge. Should be set if mIconBadge is set. */
+ private @DrawableRes final int mBadgePlain;
+ /** Resource ID of the badge without a background. Should be set if mIconBadge is set. */
+ private @DrawableRes final int mBadgeNoBackground;
+
+ /**
+ * Resource ID ({@link StringRes}) of the of the labels to describe badged apps; should be the
+ * same format as com.android.internal.R.color.profile_badge_1. These are used for accessibility
+ * services.
+ *
+ * <p>This is an array because, in general, there may be multiple users of the same user type.
+ * In this case, the user is indexed according to its {@link UserInfo#profileBadge}.
+ *
+ * <p>Must be set if mIconBadge is set.
+ */
+ private final int[] mBadgeLabels;
+
+ /**
+ * Resource ID ({@link ColorRes}) of the colors badge put on icons.
+ * (The value is a resource ID referring to the color; it is not the color value itself).
+ *
+ * <p>This is an array because, in general, there may be multiple users of the same user type.
+ * In this case, the user is indexed according to its {@link UserInfo#profileBadge}.
+ *
+ * <p>Must be set if mIconBadge is set.
+ */
+ private final int[] mBadgeColors;
+
+ private UserTypeDetails(@NonNull String name, boolean enabled, int maxAllowed,
+ @UserInfoFlag int baseType, @UserInfoFlag int defaultUserInfoPropertyFlags, int label,
+ int maxAllowedPerParent,
+ int iconBadge, int badgePlain, int badgeNoBackground,
+ int[] badgeLabels, int[] badgeColors,
+ ArrayList<String> defaultRestrictions) {
+ this.mName = name;
+ this.mEnabled = enabled;
+ this.mMaxAllowed = maxAllowed;
+ this.mMaxAllowedPerParent = maxAllowedPerParent;
+ this.mBaseType = baseType;
+ this.mDefaultUserInfoPropertyFlags = defaultUserInfoPropertyFlags;
+ this.mDefaultRestrictions =
+ Collections.unmodifiableList(new ArrayList<>(defaultRestrictions));
+
+ this.mIconBadge = iconBadge;
+ this.mBadgePlain = badgePlain;
+ this.mBadgeNoBackground = badgeNoBackground;
+ this.mLabel = label;
+ this.mBadgeLabels = badgeLabels;
+ this.mBadgeColors = badgeColors;
+ }
+
+ /**
+ * Returns the name of the user type, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
+ */
+ public String getName() {
+ return mName;
+ }
+
+ // TODO(b/142482943) Hook this up or delete it.
+ public boolean isEnabled() {
+ return mEnabled;
+ }
+
+ /**
+ * Returns the maximum number of this user type allowed on the device.
+ * <p>Returns {@link #UNLIMITED_NUMBER_OF_USERS} to indicate that there is no hard limit.
+ */
+ public int getMaxAllowed() {
+ return mMaxAllowed;
+ }
+
+ /**
+ * Returns the maximum number of this user type allowed per parent (for user types, like
+ * profiles, that have parents).
+ * <p>Returns {@link #UNLIMITED_NUMBER_OF_USERS} to indicate that there is no hard limit.
+ */
+ public int getMaxAllowedPerParent() {
+ return mMaxAllowedPerParent;
+ }
+
+ // TODO(b/143784345): Update comment when UserInfo is reorganized.
+ /** The {@link UserInfo.UserInfoFlag}s that all users of this type will automatically have. */
+ public int getDefaultUserInfoFlags() {
+ return mDefaultUserInfoPropertyFlags | mBaseType;
+ }
+
+ // TODO(b/142482943) Hook this up; it is currently unused.
+ public int getLabel() {
+ return mLabel;
+ }
+
+ /** Returns whether users of this user type should be badged. */
+ public boolean hasBadge() {
+ return mIconBadge != Resources.ID_NULL;
+ }
+
+ /** Resource ID of the badge put on icons. */
+ public @DrawableRes int getIconBadge() {
+ return mIconBadge;
+ }
+
+ /** Resource ID of the badge. Used for {@link UserManager#getUserBadgeResId(int)}. */
+ public @DrawableRes int getBadgePlain() {
+ return mBadgePlain;
+ }
+
+ /** Resource ID of the badge without a background. */
+ public @DrawableRes int getBadgeNoBackground() {
+ return mBadgeNoBackground;
+ }
+
+ /**
+ * Returns the Resource ID of the badgeIndexth badge label, where the badgeIndex is expected
+ * to be the {@link UserInfo#profileBadge} of the user.
+ * If badgeIndex exceeds the number of labels, returns the label for the highest index.
+ */
+ public @StringRes int getBadgeLabel(int badgeIndex) {
+ if (mBadgeLabels == null || mBadgeLabels.length == 0 || badgeIndex < 0) {
+ return Resources.ID_NULL;
+ }
+ return mBadgeLabels[Math.min(badgeIndex, mBadgeLabels.length - 1)];
+ }
+
+ /**
+ * Returns the Resource ID of the badgeIndexth badge color, where the badgeIndex is expected
+ * to be the {@link UserInfo#profileBadge} of the user.
+ * If badgeIndex exceeds the number of colors, returns the color for the highest index.
+ */
+ public @ColorRes int getBadgeColor(int badgeIndex) {
+ if (mBadgeColors == null || mBadgeColors.length == 0 || badgeIndex < 0) {
+ return Resources.ID_NULL;
+ }
+ return mBadgeColors[Math.min(badgeIndex, mBadgeColors.length - 1)];
+ }
+
+ public boolean isProfile() {
+ return (mBaseType & UserInfo.FLAG_PROFILE) != 0;
+ }
+
+ // TODO(b/142482943): Hook this up and don't return the original.
+ public List<String> getDefaultRestrictions() {
+ return mDefaultRestrictions;
+ }
+
+ /** Dumps details of the UserTypeDetails. Do not parse this. */
+ public void dump(PrintWriter pw) {
+ final String prefix = " ";
+ pw.print(prefix); pw.print("mName: "); pw.println(mName);
+ pw.print(prefix); pw.print("mBaseType: "); pw.println(UserInfo.flagsToString(mBaseType));
+ pw.print(prefix); pw.print("mEnabled: "); pw.println(mEnabled);
+ pw.print(prefix); pw.print("mMaxAllowed: "); pw.println(mMaxAllowed);
+ pw.print(prefix); pw.print("mMaxAllowedPerParent: "); pw.println(mMaxAllowedPerParent);
+ pw.print(prefix); pw.print("mDefaultUserInfoFlags: ");
+ pw.println(UserInfo.flagsToString(mDefaultUserInfoPropertyFlags));
+ pw.print(prefix); pw.print("mLabel: "); pw.println(mLabel);
+ pw.print(prefix); pw.print("mDefaultRestrictions: "); pw.println(mDefaultRestrictions);
+ pw.print(prefix); pw.print("mIconBadge: "); pw.println(mIconBadge);
+ pw.print(prefix); pw.print("mBadgePlain: "); pw.println(mBadgePlain);
+ pw.print(prefix); pw.print("mBadgeNoBackground: "); pw.println(mBadgeNoBackground);
+ pw.print(prefix); pw.print("mBadgeLabels.length: ");
+ pw.println(mBadgeLabels != null ? mBadgeLabels.length : "0(null)");
+ pw.print(prefix); pw.print("mBadgeColors.length: ");
+ pw.println(mBadgeColors != null ? mBadgeColors.length : "0(null)");
+ }
+
+ /** Builder for a {@link UserTypeDetails}; see that class for documentation. */
+ public static final class Builder {
+ // UserTypeDetails properties and their default values.
+ private String mName; // This MUST be explicitly set.
+ private int mBaseType; // This MUST be explicitly set.
+ private int mMaxAllowed = UNLIMITED_NUMBER_OF_USERS;
+ private int mMaxAllowedPerParent = UNLIMITED_NUMBER_OF_USERS;
+ private int mDefaultUserInfoPropertyFlags = 0;
+ private ArrayList<String> mDefaultRestrictions = new ArrayList<>();
+ private boolean mEnabled = true;
+ private int mLabel = Resources.ID_NULL;
+ private int[] mBadgeLabels = null;
+ private int[] mBadgeColors = null;
+ private int mIconBadge = Resources.ID_NULL;
+ private int mBadgePlain = Resources.ID_NULL;
+ private int mBadgeNoBackground = Resources.ID_NULL;
+
+ public Builder setName(String name) {
+ mName = name;
+ return this;
+ }
+
+ public Builder setEnabled(boolean enabled) {
+ mEnabled = enabled;
+ return this;
+ }
+
+ public Builder setMaxAllowed(int maxAllowed) {
+ mMaxAllowed = maxAllowed;
+ return this;
+ }
+
+ public Builder setMaxAllowedPerParent(int maxAllowedPerParent) {
+ mMaxAllowedPerParent = maxAllowedPerParent;
+ return this;
+ }
+
+ public Builder setBaseType(@UserInfoFlag int baseType) {
+ mBaseType = baseType;
+ return this;
+ }
+
+ public Builder setDefaultUserInfoPropertyFlags(@UserInfoFlag int flags) {
+ mDefaultUserInfoPropertyFlags = flags;
+ return this;
+ }
+
+ public Builder setBadgeLabels(int ... badgeLabels) {
+ mBadgeLabels = badgeLabels;
+ return this;
+ }
+
+ public Builder setBadgeColors(int ... badgeColors) {
+ mBadgeColors = badgeColors;
+ return this;
+ }
+
+ public Builder setIconBadge(int badgeIcon) {
+ mIconBadge = badgeIcon;
+ return this;
+ }
+
+ public Builder setBadgePlain(int badgePlain) {
+ mBadgePlain = badgePlain;
+ return this;
+ }
+
+ public Builder setBadgeNoBackground(int badgeNoBackground) {
+ mBadgeNoBackground = badgeNoBackground;
+ return this;
+ }
+
+ public Builder setLabel(int label) {
+ mLabel = label;
+ return this;
+ }
+
+ public Builder setDefaultRestrictions(ArrayList<String> restrictions) {
+ mDefaultRestrictions = restrictions;
+ return this;
+ }
+
+ public UserTypeDetails createUserTypeDetails() {
+ Preconditions.checkArgument(mName != null,
+ "Cannot create a UserTypeDetails with no name.");
+ Preconditions.checkArgument(hasValidBaseType(),
+ "UserTypeDetails " + mName + " has invalid baseType: " + mBaseType);
+ Preconditions.checkArgument(hasValidPropertyFlags(),
+ "UserTypeDetails " + mName + " has invalid flags: "
+ + Integer.toHexString(mDefaultUserInfoPropertyFlags));
+ if (hasBadge()) {
+ Preconditions.checkArgument(mBadgeLabels != null && mBadgeLabels.length != 0,
+ "UserTypeDetails " + mName + " has badge but no badgeLabels.");
+ Preconditions.checkArgument(mBadgeColors != null && mBadgeColors.length != 0,
+ "UserTypeDetails " + mName + " has badge but no badgeColors.");
+ }
+
+ return new UserTypeDetails(mName, mEnabled, mMaxAllowed, mBaseType,
+ mDefaultUserInfoPropertyFlags, mLabel, mMaxAllowedPerParent,
+ mIconBadge, mBadgePlain, mBadgeNoBackground, mBadgeLabels, mBadgeColors,
+ mDefaultRestrictions);
+ }
+
+ private boolean hasBadge() {
+ return mIconBadge != Resources.ID_NULL;
+ }
+
+ // TODO(b/143784345): Refactor this when we clean up UserInfo.
+ private boolean hasValidBaseType() {
+ return mBaseType == UserInfo.FLAG_FULL
+ || mBaseType == UserInfo.FLAG_PROFILE
+ || mBaseType == UserInfo.FLAG_SYSTEM
+ || mBaseType == (UserInfo.FLAG_FULL | UserInfo.FLAG_SYSTEM);
+ }
+
+ // TODO(b/143784345): Refactor this when we clean up UserInfo.
+ private boolean hasValidPropertyFlags() {
+ final int forbiddenMask =
+ UserInfo.FLAG_PRIMARY |
+ UserInfo.FLAG_ADMIN |
+ UserInfo.FLAG_INITIALIZED |
+ UserInfo.FLAG_QUIET_MODE |
+ UserInfo.FLAG_FULL |
+ UserInfo.FLAG_SYSTEM |
+ UserInfo.FLAG_PROFILE;
+ return (mDefaultUserInfoPropertyFlags & forbiddenMask) == 0;
+ }
+ }
+
+ /**
+ * Returns whether the user type is a managed profile
+ * (i.e. {@link UserManager#USER_TYPE_PROFILE_MANAGED}).
+ */
+ public boolean isManagedProfile() {
+ return UserManager.isUserTypeManagedProfile(mName);
+ }
+}
diff --git a/core/java/com/android/server/pm/UserTypeFactory.java b/core/java/com/android/server/pm/UserTypeFactory.java
new file mode 100644
index 0000000..43bbab1
--- /dev/null
+++ b/core/java/com/android/server/pm/UserTypeFactory.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2019 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.pm;
+
+import static android.content.pm.UserInfo.FLAG_DEMO;
+import static android.content.pm.UserInfo.FLAG_EPHEMERAL;
+import static android.content.pm.UserInfo.FLAG_FULL;
+import static android.content.pm.UserInfo.FLAG_GUEST;
+import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE;
+import static android.content.pm.UserInfo.FLAG_PROFILE;
+import static android.content.pm.UserInfo.FLAG_RESTRICTED;
+import static android.content.pm.UserInfo.FLAG_SYSTEM;
+import static android.os.UserManager.USER_TYPE_FULL_DEMO;
+import static android.os.UserManager.USER_TYPE_FULL_GUEST;
+import static android.os.UserManager.USER_TYPE_FULL_RESTRICTED;
+import static android.os.UserManager.USER_TYPE_FULL_SECONDARY;
+import static android.os.UserManager.USER_TYPE_FULL_SYSTEM;
+import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;
+import static android.os.UserManager.USER_TYPE_SYSTEM_HEADLESS;
+
+import static com.android.server.pm.UserTypeDetails.UNLIMITED_NUMBER_OF_USERS;
+
+import android.content.res.Resources;
+import android.os.UserManager;
+import android.util.ArrayMap;
+
+/**
+ * Class for creating all {@link UserTypeDetails} on the device.
+ *
+ * Tests are located in UserManagerServiceUserTypeTest.java.
+ * @hide
+ */
+public final class UserTypeFactory {
+
+ /** This is a utility class, so no instantiable constructor. */
+ private UserTypeFactory() {}
+
+ /**
+ * Obtains the user types (built-in and customized) for this device.
+ *
+ * @return mapping from the name of each user type to its {@link UserTypeDetails} object
+ */
+ public static ArrayMap<String, UserTypeDetails> getUserTypes() {
+ final ArrayMap<String, UserTypeDetails> map = new ArrayMap<>();
+ // TODO(b/142482943): Read an xml file for OEM customized types.
+ // Remember to disallow "android." namespace
+ // TODO(b/142482943): Read an xml file to get any overrides for the built-in types.
+ final int maxManagedProfiles = 1;
+ map.put(USER_TYPE_PROFILE_MANAGED,
+ getDefaultTypeProfileManaged().setMaxAllowedPerParent(maxManagedProfiles)
+ .createUserTypeDetails());
+ map.put(USER_TYPE_FULL_SYSTEM, getDefaultTypeSystemFull().createUserTypeDetails());
+ map.put(USER_TYPE_FULL_SECONDARY, getDefaultTypeFullSecondary().createUserTypeDetails());
+ map.put(USER_TYPE_FULL_GUEST, getDefaultTypeFullGuest().createUserTypeDetails());
+ map.put(USER_TYPE_FULL_DEMO, getDefaultTypeFullDemo().createUserTypeDetails());
+ map.put(USER_TYPE_FULL_RESTRICTED, getDefaultTypeFullRestricted().createUserTypeDetails());
+ map.put(USER_TYPE_SYSTEM_HEADLESS, getDefaultTypeSystemHeadless().createUserTypeDetails());
+ return map;
+ }
+
+ /**
+ * Returns the Builder for the default {@link UserManager#USER_TYPE_PROFILE_MANAGED}
+ * configuration.
+ */
+ private static UserTypeDetails.Builder getDefaultTypeProfileManaged() {
+ return new UserTypeDetails.Builder()
+ .setName(USER_TYPE_PROFILE_MANAGED)
+ .setBaseType(FLAG_PROFILE)
+ .setDefaultUserInfoPropertyFlags(FLAG_MANAGED_PROFILE)
+ .setMaxAllowedPerParent(1)
+ .setLabel(0)
+ .setIconBadge(com.android.internal.R.drawable.ic_corp_icon_badge_case)
+ .setBadgePlain(com.android.internal.R.drawable.ic_corp_badge_case)
+ .setBadgeNoBackground(com.android.internal.R.drawable.ic_corp_badge_no_background)
+ .setBadgeLabels(
+ com.android.internal.R.string.managed_profile_label_badge,
+ com.android.internal.R.string.managed_profile_label_badge_2,
+ com.android.internal.R.string.managed_profile_label_badge_3)
+ .setBadgeColors(
+ com.android.internal.R.color.profile_badge_1,
+ com.android.internal.R.color.profile_badge_2,
+ com.android.internal.R.color.profile_badge_3);
+ }
+
+ /**
+ * Returns the Builder for the default {@link UserManager#USER_TYPE_FULL_SECONDARY}
+ * configuration.
+ */
+ private static UserTypeDetails.Builder getDefaultTypeFullSecondary() {
+ return new UserTypeDetails.Builder()
+ .setName(USER_TYPE_FULL_SECONDARY)
+ .setBaseType(FLAG_FULL)
+ .setMaxAllowed(UNLIMITED_NUMBER_OF_USERS);
+ }
+
+ /**
+ * Returns the Builder for the default {@link UserManager#USER_TYPE_FULL_GUEST} configuration.
+ */
+ private static UserTypeDetails.Builder getDefaultTypeFullGuest() {
+ final boolean ephemeralGuests = Resources.getSystem()
+ .getBoolean(com.android.internal.R.bool.config_guestUserEphemeral);
+ final int flags = FLAG_GUEST | (ephemeralGuests ? FLAG_EPHEMERAL : 0);
+
+ // TODO(b/142482943): Put UMS.initDefaultGuestRestrictions() here; then fetch them from here
+
+ return new UserTypeDetails.Builder()
+ .setName(USER_TYPE_FULL_GUEST)
+ .setBaseType(FLAG_FULL)
+ .setDefaultUserInfoPropertyFlags(flags)
+ .setMaxAllowed(1);
+ }
+
+ /**
+ * Returns the Builder for the default {@link UserManager#USER_TYPE_FULL_DEMO} configuration.
+ */
+ private static UserTypeDetails.Builder getDefaultTypeFullDemo() {
+ return new UserTypeDetails.Builder()
+ .setName(USER_TYPE_FULL_DEMO)
+ .setBaseType(FLAG_FULL)
+ .setDefaultUserInfoPropertyFlags(FLAG_DEMO)
+ .setMaxAllowed(UNLIMITED_NUMBER_OF_USERS);
+ }
+
+ /**
+ * Returns the Builder for the default {@link UserManager#USER_TYPE_FULL_RESTRICTED}
+ * configuration.
+ */
+ private static UserTypeDetails.Builder getDefaultTypeFullRestricted() {
+ return new UserTypeDetails.Builder()
+ .setName(USER_TYPE_FULL_RESTRICTED)
+ .setBaseType(FLAG_FULL)
+ .setDefaultUserInfoPropertyFlags(FLAG_RESTRICTED)
+ .setMaxAllowed(UNLIMITED_NUMBER_OF_USERS);
+ }
+
+ /**
+ * Returns the Builder for the default {@link UserManager#USER_TYPE_FULL_SYSTEM} configuration.
+ */
+ private static UserTypeDetails.Builder getDefaultTypeSystemFull() {
+ return new UserTypeDetails.Builder()
+ .setName(USER_TYPE_FULL_SYSTEM)
+ .setBaseType(FLAG_SYSTEM | FLAG_FULL);
+ }
+
+ /**
+ * Returns the Builder for the default {@link UserManager#USER_TYPE_SYSTEM_HEADLESS}
+ * configuration.
+ */
+ private static UserTypeDetails.Builder getDefaultTypeSystemHeadless() {
+ return new UserTypeDetails.Builder()
+ .setName(USER_TYPE_SYSTEM_HEADLESS)
+ .setBaseType(FLAG_SYSTEM);
+ }
+}
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 541b937..01f9d0b0 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -2264,6 +2264,12 @@
return jStatus;
}
+static jboolean
+android_media_AudioSystem_isCallScreeningModeSupported(JNIEnv *env, jobject thiz)
+{
+ return AudioSystem::isCallScreenModeSupported();
+}
+
// ----------------------------------------------------------------------------
static const JNINativeMethod gMethods[] = {
@@ -2343,6 +2349,7 @@
{"setAllowedCapturePolicy", "(II)I", (void *)android_media_AudioSystem_setAllowedCapturePolicy},
{"setRttEnabled", "(Z)I", (void *)android_media_AudioSystem_setRttEnabled},
{"setAudioHalPids", "([I)I", (void *)android_media_AudioSystem_setAudioHalPids},
+ {"isCallScreeningModeSupported", "()Z", (void *)android_media_AudioSystem_isCallScreeningModeSupported},
};
static const JNINativeMethod gEventHandlerMethods[] = {
diff --git a/core/jni/android_os_GraphicsEnvironment.cpp b/core/jni/android_os_GraphicsEnvironment.cpp
index 7582cae..4f3f283 100644
--- a/core/jni/android_os_GraphicsEnvironment.cpp
+++ b/core/jni/android_os_GraphicsEnvironment.cpp
@@ -23,8 +23,8 @@
namespace {
-int getCanLoadSystemLibraries_native() {
- return android::GraphicsEnv::getInstance().getCanLoadSystemLibraries();
+bool isDebuggable_native() {
+ return android::GraphicsEnv::getInstance().isDebuggable();
}
void setDriverPathAndSphalLibraries_native(JNIEnv* env, jobject clazz, jstring path,
@@ -94,7 +94,7 @@
}
const JNINativeMethod g_methods[] = {
- { "getCanLoadSystemLibraries", "()I", reinterpret_cast<void*>(getCanLoadSystemLibraries_native) },
+ { "isDebuggable", "()Z", reinterpret_cast<void*>(isDebuggable_native) },
{ "setDriverPathAndSphalLibraries", "(Ljava/lang/String;Ljava/lang/String;)V", reinterpret_cast<void*>(setDriverPathAndSphalLibraries_native) },
{ "setGpuStats", "(Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;I)V", reinterpret_cast<void*>(setGpuStats_native) },
{ "setInjectLayersPrSetDumpable", "()Z", reinterpret_cast<void*>(setInjectLayersPrSetDumpable_native) },
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index 3c0971b..5c4dc23 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -556,7 +556,9 @@
assetmanager->SetConfiguration(configuration);
}
-static jobject NativeGetAssignedPackageIdentifiers(JNIEnv* env, jclass /*clazz*/, jlong ptr) {
+static jobject NativeGetAssignedPackageIdentifiers(JNIEnv* env, jclass /*clazz*/, jlong ptr,
+ jboolean includeOverlays,
+ jboolean includeLoaders) {
ScopedLock<AssetManager2> assetmanager(AssetManagerFromLong(ptr));
jobject sparse_array =
@@ -567,6 +569,10 @@
return nullptr;
}
+ // Optionally exclude overlays and loaders.
+ uint64_t exclusion_flags = ((includeOverlays) ? 0U : PROPERTY_OVERLAY)
+ | ((includeLoaders) ? 0U : PROPERTY_LOADER);
+
assetmanager->ForEachPackage([&](const std::string& package_name, uint8_t package_id) -> bool {
jstring jpackage_name = env->NewStringUTF(package_name.c_str());
if (jpackage_name == nullptr) {
@@ -577,7 +583,8 @@
env->CallVoidMethod(sparse_array, gSparseArrayOffsets.put, static_cast<jint>(package_id),
jpackage_name);
return true;
- });
+ }, exclusion_flags);
+
return sparse_array;
}
@@ -1591,7 +1598,7 @@
{"nativeSetApkAssets", "(J[Landroid/content/res/ApkAssets;Z)V", (void*)NativeSetApkAssets},
{"nativeSetConfiguration", "(JIILjava/lang/String;IIIIIIIIIIIIIII)V",
(void*)NativeSetConfiguration},
- {"nativeGetAssignedPackageIdentifiers", "(J)Landroid/util/SparseArray;",
+ {"nativeGetAssignedPackageIdentifiers", "(JZZ)Landroid/util/SparseArray;",
(void*)NativeGetAssignedPackageIdentifiers},
// AssetManager file methods.
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index d5cd278..f8a2744 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -274,7 +274,7 @@
static jobject nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject displayTokenObj,
jlong layerObject, jobject sourceCropObj, jfloat frameScale,
- jlongArray excludeObjectArray) {
+ jlongArray excludeObjectArray, jint format) {
auto layer = reinterpret_cast<SurfaceControl *>(layerObject);
if (layer == NULL) {
@@ -311,8 +311,9 @@
dataspace = pickDataspaceFromColorMode(colorMode);
}
status_t res = ScreenshotClient::captureChildLayers(layer->getHandle(), dataspace,
- ui::PixelFormat::RGBA_8888, sourceCrop,
- excludeHandles, frameScale, &buffer);
+ static_cast<ui::PixelFormat>(format),
+ sourceCrop, excludeHandles, frameScale,
+ &buffer);
if (res != NO_ERROR) {
return NULL;
}
@@ -545,6 +546,14 @@
transaction->setLayerStack(ctrl, layerStack);
}
+static void nativeSetShadowRadius(JNIEnv* env, jclass clazz, jlong transactionObj,
+ jlong nativeObject, jfloat shadowRadius) {
+ auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
+
+ const auto ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);
+ transaction->setShadowRadius(ctrl, shadowRadius);
+}
+
static jlongArray nativeGetPhysicalDisplayIds(JNIEnv* env, jclass clazz) {
const auto displayIds = SurfaceComposerClient::getPhysicalDisplayIds();
jlongArray array = env->NewLongArray(displayIds.size());
@@ -1308,6 +1317,8 @@
(void*)nativeSetCornerRadius },
{"nativeSetLayerStack", "(JJI)V",
(void*)nativeSetLayerStack },
+ {"nativeSetShadowRadius", "(JJF)V",
+ (void*)nativeSetShadowRadius },
{"nativeGetPhysicalDisplayIds", "()[J",
(void*)nativeGetPhysicalDisplayIds },
{"nativeGetPhysicalDisplayToken", "(J)Landroid/os/IBinder;",
@@ -1376,7 +1387,7 @@
(void*)nativeScreenshot },
{"nativeCaptureLayers",
"(Landroid/os/IBinder;JLandroid/graphics/Rect;"
- "F[J)"
+ "F[JI)"
"Landroid/view/SurfaceControl$ScreenshotGraphicBuffer;",
(void*)nativeCaptureLayers },
{"nativeSetInputWindowInfo", "(JJLandroid/view/InputWindowHandle;)V",
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto
index 97dae59..9e0c35a 100644
--- a/core/proto/android/app/settings_enums.proto
+++ b/core/proto/android/app/settings_enums.proto
@@ -2436,4 +2436,9 @@
// OS: R
INSTALL_CERTIFICATE_FROM_STORAGE = 1803;
+ // OPEN: Settings > Apps and notifications > Special app access > notification access >
+ // an app
+ // CATEGORY: SETTINGS
+ // OS: R
+ NOTIFICATION_ACCESS_DETAIL = 1804;
}
diff --git a/core/proto/android/server/powermanagerservice.proto b/core/proto/android/server/powermanagerservice.proto
index 091e1c2..c039570 100644
--- a/core/proto/android/server/powermanagerservice.proto
+++ b/core/proto/android/server/powermanagerservice.proto
@@ -172,6 +172,8 @@
repeated SuspendBlockerProto suspend_blockers = 48;
optional WirelessChargerDetectorProto wireless_charger_detector = 49;
optional BatterySaverStateMachineProto battery_saver_state_machine = 50;
+ // Attentive timeout in ms. The timeout is disabled if it is set to -1.
+ optional sint32 attentive_timeout_ms = 51;
}
// A com.android.server.power.PowerManagerService.SuspendBlockerImpl object.
@@ -310,6 +312,12 @@
optional bool is_vr_mode_enabled = 35;
// True if Sidekick is controlling the display and we shouldn't change its power mode.
optional bool draw_wake_lock_override_from_sidekick = 36;
+ // The attentive timeout setting value in milliseconds. Default value is -1.
+ optional sint32 attentive_timeout_setting_ms = 37;
+ // The attentive timeout config value in milliseconds.
+ optional sint32 attentive_timeout_config_ms = 38;
+ // The attentive warning duration config value in milliseconds.
+ optional sint32 attentive_warning_duration_config_ms = 39;
}
message BatterySaverStateMachineProto {
diff --git a/core/proto/android/server/syncstorageengine.proto b/core/proto/android/server/syncstorageengine.proto
new file mode 100644
index 0000000..87eb1b3
--- /dev/null
+++ b/core/proto/android/server/syncstorageengine.proto
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2019 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 = "proto2";
+package com.android.server.content;
+import "frameworks/base/core/proto/android/privacy.proto";
+
+option java_multiple_files = true;
+
+/**
+ * Stores relevant information from a DayStats object in SyncStorageEngine.
+ */
+message SyncStatisticsProto {
+
+ message DayStats {
+ optional int32 day = 1; // day of the year - defined by SyncStorageEngine#getCurrentDayLocked()
+ optional int32 success_count = 2;
+ optional int64 success_time = 3; // time since epoch
+ optional int32 failure_count = 4;
+ optional int64 failure_time = 5; // time since epoch
+ }
+
+ repeated DayStats stats = 1;
+}
+
+/**
+ * Stores relevant information from a SyncStatusInfo object.
+ */
+message SyncStatusProto {
+
+ message StatusInfo {
+
+ message Stats {
+ optional int64 total_elapsed_time = 1; // time since epoch
+ optional int32 num_syncs = 2;
+ optional int32 num_failures = 3;
+ optional int32 num_cancels = 4;
+ optional int32 num_source_other = 5;
+ optional int32 num_source_local = 6;
+ optional int32 num_source_poll = 7;
+ optional int32 num_source_user = 8;
+ optional int32 num_source_periodic = 9;
+ optional int32 num_source_feed = 10;
+ }
+
+ message LastEventInfo {
+ optional int64 last_event_time = 1; // time since epoch
+ optional string last_event = 2;
+ }
+
+ // Note: version doesn't need to be stored in proto because of how protos store information but
+ // leaving field number 1 open in case we find a usage for it in the future.
+ optional int32 authority_id = 2;
+ optional int64 last_success_time = 3; // time since epoch
+ optional int32 last_success_source = 4;
+ optional int64 last_failure_time = 5; // time since epoch
+ optional int32 last_failure_source = 6;
+ optional string last_failure_message = 7;
+ optional int64 initial_failure_time = 8; // time since epoch
+ optional bool pending = 9;
+ optional bool initialize = 10;
+ repeated int64 periodic_sync_times = 11; // times since epoch
+ repeated LastEventInfo last_event_info = 12;
+ optional int64 last_today_reset_time = 13; // time since epoch
+ optional Stats total_stats = 14;
+ optional Stats today_stats = 15;
+ optional Stats yesterday_stats = 16;
+ repeated int64 per_source_last_success_times = 17; // times since epoch
+ repeated int64 per_source_last_failure_times = 18; // times since epoch
+ }
+
+ repeated StatusInfo status = 1;
+}
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto
index c9a1829..653d381 100644
--- a/core/proto/android/server/windowmanagerservice.proto
+++ b/core/proto/android/server/windowmanagerservice.proto
@@ -385,12 +385,12 @@
optional .android.graphics.RectProto display_frame = 4;
optional .android.graphics.RectProto frame = 5;
optional .android.graphics.RectProto outset_frame = 6;
- optional .android.graphics.RectProto overscan_frame = 7;
+ optional .android.graphics.RectProto overscan_frame = 7 [deprecated=true];
optional .android.graphics.RectProto parent_frame = 8;
optional .android.graphics.RectProto visible_frame = 9;
optional .android.view.DisplayCutoutProto cutout = 10;
optional .android.graphics.RectProto content_insets = 11;
- optional .android.graphics.RectProto overscan_insets = 12;
+ optional .android.graphics.RectProto overscan_insets = 12 [deprecated=true];
optional .android.graphics.RectProto visible_insets = 13;
optional .android.graphics.RectProto stable_insets = 14;
optional .android.graphics.RectProto outsets = 15;
diff --git a/core/proto/android/service/package.proto b/core/proto/android/service/package.proto
index d010c8f..004b096 100644
--- a/core/proto/android/service/package.proto
+++ b/core/proto/android/service/package.proto
@@ -119,6 +119,9 @@
// The package that requested the installation of this one.
optional string initiating_package_name = 1;
+
+ // The package on behalf of which the initiiating package requested the install.
+ optional string originating_package_name = 2;
}
// Name of package. e.g. "com.android.providers.telephony".
diff --git a/tests/WindowManagerStressTest/Android.bp b/core/proto/android/stats/textclassifier/Android.bp
similarity index 74%
rename from tests/WindowManagerStressTest/Android.bp
rename to core/proto/android/stats/textclassifier/Android.bp
index 98749a7..bf90227 100644
--- a/tests/WindowManagerStressTest/Android.bp
+++ b/core/proto/android/stats/textclassifier/Android.bp
@@ -1,5 +1,4 @@
-//
-// Copyright (C) 2016 The Android Open Source Project
+// Copyright (C) 2019 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.
@@ -12,10 +11,13 @@
// 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.
-//
-android_test {
- name: "WindowManagerStressTest",
- srcs: ["**/*.java"],
- platform_apis: true,
-}
+java_library_static {
+ name: "textclassifierprotoslite",
+ proto: {
+ type: "lite",
+ },
+ srcs: [
+ "*.proto",
+ ],
+}
\ No newline at end of file
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 7d70fbc..545538b 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -142,7 +142,7 @@
<protected-broadcast android:name="android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED" />
<protected-broadcast android:name="android.bluetooth.device.action.UUID" />
<protected-broadcast android:name="android.bluetooth.device.action.MAS_INSTANCE" />
- <protected-broadcast android:name="android.bluetooth.device.action.ALIAS_CHANGED" />
+ <protected-broadcast android:name="android.bluetooth.action.ALIAS_CHANGED" />
<protected-broadcast android:name="android.bluetooth.device.action.FOUND" />
<protected-broadcast android:name="android.bluetooth.device.action.CLASS_CHANGED" />
<protected-broadcast android:name="android.bluetooth.device.action.ACL_CONNECTED" />
@@ -2007,7 +2007,7 @@
<eat-comment />
<!-- @SystemApi Allows granting runtime permissions to telephony related components.
- @hide Used internally. -->
+ @hide -->
<permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS"
android:protectionLevel="signature|telephony" />
diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml
index 17b5f50..6807f9a 100644
--- a/core/res/res/layout/chooser_grid.xml
+++ b/core/res/res/layout/chooser_grid.xml
@@ -55,15 +55,14 @@
android:layout_centerHorizontal="true"/>
</RelativeLayout>
- <ListView
+ <com.android.internal.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layoutManager="com.android.internal.widget.GridLayoutManager"
android:id="@+id/resolver_list"
android:clipToPadding="false"
android:background="?attr/colorBackgroundFloating"
android:scrollbars="none"
- android:listSelector="@color/transparent"
- android:divider="@null"
android:elevation="1dp"
android:nestedScrollingEnabled="true"/>
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index 2b20a6b..485162c 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Opgedateer deur jou administrateur"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Uitgevee deur jou administrateur"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Batterybespaarder doen die volgende om die batterylewe te verleng:\n·Skakel Donker-tema aan\n·Skakel agtergrondaktiwiteit, sommige visuele effekte en ander kenmerke, soos \"Hey Google\", af of beperk hulle\n\n"<annotation id="url">"Kom meer te wete"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Batterybespaarder doen die volgende om die batterylewe te verleng:\n·Skakel Donker-tema aan\n·Skakel agtergrondaktiwiteit, sommige visuele effekte en ander kenmerke, soos \"Hey Google\", af of beperk hulle"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Databespaarder verhoed sommige programme om data in die agtergrond te stuur of te aanvaar om datagebruik te help verminder. \'n Program wat jy tans gebruik kan by data ingaan, maar sal dit dalk minder gereeld doen. Dit kan byvoorbeeld beteken dat prente nie wys totdat jy op hulle tik nie."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Skakel Databespaarder aan?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Skakel aan"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Regstreekse deling is nie beskikbaar nie"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Programmelys"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Opneemtoestemming is nie aan hierdie program verleen nie, maar dit kan oudio deur hierdie USB-toestel opneem."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index 2588814..f0a4307 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"በእርስዎ አስተዳዳሪ ተዘምኗል"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"በእርስዎ አስተዳዳሪ ተሰርዟል"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"እሺ"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"የባትሪ ዕድሜን ለማራዘም፣ የባትሪ ቆጣቢ፦\n·ጨለማ ገጽታን ያበራል\n·የበስተጀርባ እንቅስቃሴን፣ አንዳንድ የሚታዩ ማሳመሪያዎችን፣ እና ሌሎች እንደ “Hey Google” ያሉ ባህሪያትን ያጠፋል ወይም ይገድባል\n\n"<annotation id="url">"የበለጠ ለመረዳት"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"የባትሪ ዕድሜን ለማራዘም፣ የባትሪ ቆጣቢ፦\n·ጨለማ ገጽታን ያበራል\n·የበስተጀርባ እንቅስቃሴን፣ አንዳንድ የሚታዩ ማሳመሪያዎችን፣ እና ሌሎች እንደ “Hey Google” ያሉ ባህሪያትን ያጠፋል ወይም ይገድባል"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ቀጥታ ማጋራት አይገኝም"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"የመተግበሪያዎች ዝርዝር"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ይህ መተግበሪያ የመቅረጽ ፈቃድ አልተሰጠውም፣ ነገር ግን በዚህ ዩኤስቢ መሣሪያ በኩል ኦዲዮን መቅረጽ ይችላል።"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index 162c066..4ecf6e7 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -1863,10 +1863,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"تم التحديث بواسطة المشرف"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"تم الحذف بواسطة المشرف"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"موافق"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"لإطالة عمر البطارية، \"توفير شحن البطارية\":\n·تفعيل \"التصميم الداكن\"\n إيقاف النشاط في الخلفية أو تقييده وأيضًا بعض التأثيرات المرئية والميزات الأخرى، مثلاً \"Ok Google\"\n\n"<annotation id="url">"مزيد من المعلومات"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"لإطالة عمر البطارية، \"توفير شحن البطارية\":\n·تفعيل \"التصميم الداكن\"\n إيقاف النشاط في الخلفية أو تقييده وأيضًا بعض التأثيرات المرئية والميزات الأخرى، مثلاً \"Ok Google\"."</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>
@@ -2144,4 +2142,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"لا تتوفّر إمكانية المشاركة المباشرة."</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"قائمة التطبيقات"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"لم يتم منح هذا التطبيق إذن تسجيل، ولكن يمكنه تسجيل الصوت من خلال جهاز USB هذا."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml
index 2ae2ad4..81a04b7 100644
--- a/core/res/res/values-as/strings.xml
+++ b/core/res/res/values-as/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"পোনপটীয়া শ্বেয়াৰৰ সুবিধা নাই"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"এপ্সমূহৰ সূচী"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"এই এপ্টোক ৰেকর্ড কৰাৰ অনুমতি দিয়া হোৱা নাই কিন্তু ই এই ইউএছবি ডিভাইচটোৰ জৰিয়তে অডিঅ\' ৰেকর্ড কৰিব পাৰে।"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml
index 2f8cd99..9f43c36 100644
--- a/core/res/res/values-az/strings.xml
+++ b/core/res/res/values-az/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Admin tərəfindən yeniləndi"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Admin tərəfindən silindi"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Batareyanın ömrünü artırmaq üçün Enerjiyə Qənaət xüsusiyyəti:\n·Qaranlıq temanı aktiv edir\n·Arxa fondakı fəaliyyəti, bəzi vizual effektləri və “Hey Google” kimi digər xüsusiyyətləri deaktiv edir və ya məhdudlaşdırır\n\n"<annotation id="url">"Ətraflı məlumat"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Batareyanın ömrünü artırmaq üçün Enerjiyə Qənaət xüsusiyyəti:\n·Qaranlıq temanı aktiv edir\n·Arxa fondakı fəaliyyəti, bəzi vizual effektləri və “Hey Google” kimi digər xüsusiyyətləri deaktiv edir və ya məhdudlaşdırır"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Data istifadəsini azalatmaq üçün, Data Qanaəti bəzi tətbiqlərin arxafonda data göndərməsini və qəbulunun qarşısını alır. Hazırda istifadə etdiyiniz tətbiq dataya daxil ola bilər, lakin bunu tez-tez edə bilməz. Bu o deməkdir ki, məsələn, Siz üzərinə tıklamadıqca o şəkillər göstərilməyəcək."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Data Qənaəti aktiv edilsin?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Aktivləşdirin"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Birbaşa paylaşım əlçatan deyil"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Tətbiq siyahısı"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Bu tətbiqə yazmaq icazəsi verilməyib, lakin, bu USB vasitəsilə səs yaza bilər."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml
index 9c13758..a6ad733 100644
--- a/core/res/res/values-b+sr+Latn/strings.xml
+++ b/core/res/res/values-b+sr+Latn/strings.xml
@@ -1794,10 +1794,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Ažurirao je administrator"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Izbrisao je administrator"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Potvrdi"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Radi dužeg trajanja baterije, ušteda baterije:\n·uključuje tamnu temu\n·isključuje ili ograničava aktivnosti u pozadini, neke vizuelne efekte i druge funkcije, na primer, „Ok Google“\n\n"<annotation id="url">"Saznajte više"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Radi dužeg trajanja baterije, ušteda baterije:\n·uključuje tamnu temu\n·isključuje ili ograničava aktivnosti u pozadini, neke vizuelne efekte i druge funkcije, na primer, „Ok Google“"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Da bi se smanjila potrošnja podataka, Ušteda podataka sprečava neke aplikacije da šalju ili primaju podatke u pozadini. Aplikacija koju trenutno koristite može da pristupa podacima, ali će to činiti ređe. Na primer, slike se neće prikazivati dok ih ne dodirnete."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Uključiti Uštedu podataka?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Uključi"</string>
@@ -2042,4 +2040,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direktno deljenje nije dostupno"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista aplikacija"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ova aplikacija nema dozvolu za snimanje, ali bi mogla da snima zvuk pomoću ovog USB uređaja."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index 48ca6df..92cad08 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Абноўлены вашым адміністратарам"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Выдалены вашым адміністратарам"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ОК"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Каб павялічыць тэрмін службы акумулятара, рэжым эканоміі зараду:\n·уключае цёмную тэму;\n·выключае ці абмяжоўвае дзеянні ў фонавым рэжыме, некаторыя візуальныя эфекты і іншыя функцыі, напрыклад \"Ok Google\"\n\n"<annotation id="url">"Даведацца больш"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Каб павялічыць тэрмін службы акумулятара, рэжым эканоміі зараду:\n·уключае цёмную тэму;\n·выключае ці абмяжоўвае дзеянні ў фонавым рэжыме, некаторыя візуальныя эфекты і іншыя функцыі, напрыклад \"Ok Google\""</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>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Непасрэднае абагульванне недаступнае"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Спіс праграм"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"У гэтай праграмы няма дазволу на запіс, аднак яна зможа запісваць аўдыя праз гэту USB-прыладу."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 1d6e7f1..9a4ca0c 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Актуализирано от администратора ви"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Изтрито от администратора ви"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ОК"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"С цел удължаване на живота на батерията режимът за запазването й:\n·включва тъмната тема;\n·изключва или ограничава активността на заден план, някои визуални ефекти и други функции, като например „Ok Google“.\n\n"<annotation id="url">"Научете повече"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"С цел удължаване на живота на батерията режимът за запазването й:\n·включва тъмната тема;\n·изключва или ограничава активността на заден план, някои визуални ефекти и други функции, като например „Ok Google“."</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Няма възможност за директно споделяне"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Списък с приложения"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Приложението няма разрешение за записване, но може да записва звук чрез това USB устройство."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml
index bdb5572..4dc5f5c 100644
--- a/core/res/res/values-bn/strings.xml
+++ b/core/res/res/values-bn/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"আপনার প্রশাসক আপডেট করেছেন"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"আপনার প্রশাসক মুছে দিয়েছেন"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ঠিক আছে"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"ব্যাটারি আরও বেশিক্ষণ চালাতে, ব্যাটারি সেভার:\n·গাঢ় থিম চালু করে\n·ব্যাকগ্রাউন্ড অ্যাক্টিভিটি, কিছু ভিজ্যুয়াল এফেক্ট, এবং “হ্যালো Google”-এর মতো অন্যান্য ফিচার বন্ধ বা সীমাবদ্ধ করে\n\n"<annotation id="url">"আরও জানুন"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"ব্যাটারি আরও বেশিক্ষণ চালাতে, ব্যাটারি সেভার:\n·গাঢ় থিম চালু করে\n·ব্যাকগ্রাউন্ড অ্যাক্টিভিটি, কিছু ভিজ্যুয়াল এফেক্ট, এবং “হ্যালো Google”-এর মতো অন্যান্য ফিচার বন্ধ বা সীমাবদ্ধ করে"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"সরাসরি শেয়ার করার সুবিধা নেই"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"অ্যাপের তালিকা"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"এই অ্যাপকে রেকর্ড করার অনুমতি দেওয়া হয়নি কিন্তু USB ডিভাইসের মাধ্যমে সেটি অডিও রেকর্ড করতে পারে।"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml
index 03a4cc5..ea4d209 100644
--- a/core/res/res/values-bs/strings.xml
+++ b/core/res/res/values-bs/strings.xml
@@ -1796,10 +1796,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Ažurirao je vaš administrator"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Izbrisao je vaš administrator"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Uredu"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Da bi se produljilo trajanje baterije, Štednja baterije:\n·Uključuje Tamnu temu.\n·Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\".\n\n"<annotation id="url">"Saznajte više"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Da bi se produljilo trajanje baterije, Štednja baterije:\n·Uključuje Tamnu temu.\n·Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\"."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Da bi se smanjio prijenos podataka, Ušteda podataka sprečava da neke aplikacije šalju ili primaju podatke u pozadini. Aplikacija koju trenutno koristite može pristupiti podacima, ali će to činiti rjeđe. To može značiti, naprimjer, da se slike ne prikazuju sve dok ih ne dodirnete."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Uključiti Uštedu podataka?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Uključi"</string>
@@ -2044,4 +2042,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direktno dijeljenje nije dostupno"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Spisak aplikacija"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ovoj aplikaciji nije dato odobrenje za snimanje, ali može snimati zvuk putem ovog USB uređaja."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index fd07668..4f9eeb8 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Actualitzat per l\'administrador"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Suprimit per l\'administrador"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"D\'acord"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Per allargar la durada de la bateria, el mode Estalvi de bateria fa el següent:\n Activa el tema fosc\n Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\"\n\n"<annotation id="url">"Més informació"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Per allargar la durada de la bateria, el mode Estalvi de bateria fa el següent:\n Activa el tema fosc\n Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\""</string>
<string name="data_saver_description" msgid="6015391409098303235">"Per reduir l\'ús de dades, la funció Economitzador de dades evita que determinades aplicacions enviïn o rebin dades en segon pla. L\'aplicació que estiguis fent servir podrà accedir a les dades, però menys sovint. Això vol dir, per exemple, que les imatges no es mostraran fins que no les toquis."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Activar Economitzador de dades?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Activa"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"La compartició directa no està disponible"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Llista d\'aplicacions"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Aquesta aplicació no té permís de gravació, però pot capturar àudio a través d\'aquest dispositiu USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index e2f03df..502a7a8 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Aktualizováno administrátorem"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Smazáno administrátorem"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Spořič baterie za účelem úspory energie:\n·zapne tmavý motiv,\n·vypne nebo omezí aktivitu na pozadí, některé vizuální efekty a další funkce jako „Hej Google“\n\n"<annotation id="url">"Další informace"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Spořič baterie za účelem úspory energie:\n·zapne tmavý motiv,\n·vypne nebo omezí aktivitu na pozadí, některé vizuální efekty a další funkce jako „Hej Google“"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Spořič dat z důvodu snížení využití dat některým aplikacím brání v odesílání nebo příjmu dat na pozadí. Aplikace, kterou právě používáte, data přenášet může, ale může tak činit méně často. V důsledku toho se například obrázky nemusejí zobrazit, dokud na ně neklepnete."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Chcete zapnout Spořič dat?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Zapnout"</string>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Přímé sdílení není k dispozici"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Seznam aplikací"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Tato aplikace nemá oprávnění k nahrávání, ale může zaznamenávat zvuk prostřednictvím tohoto zařízení USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 3916f1e..d347e35 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Opdateret af din administrator"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Slettet af din administrator"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Batterisparefunktionen gør følgende for at spare på batteriet:\n·Aktiverer Mørkt tema\n·Deaktiverer eller begrænser aktivitet i baggrunden, visse visuelle effekter og andre funktioner som f.eks. \"Hey Google\"\n\n"<annotation id="url">"Få flere oplysninger"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Batterisparefunktionen gør følgende for at spare på batteriet:\n·Aktiverer Mørkt tema\n·Deaktiverer eller begrænser aktivitet i baggrunden, visse visuelle effekter og andre funktioner som f.eks. \"Hey Google\""</string>
<string name="data_saver_description" msgid="6015391409098303235">"Datasparefunktionen forhindrer nogle apps i at sende eller modtage data i baggrunden for at reducere dataforbruget. En app, der er i brug, kan få adgang til data, men gør det måske ikke så ofte. Dette kan f.eks. betyde, at billeder ikke vises, før du trykker på dem."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Vil du slå Datasparefunktion til?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Slå til"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Det er ikke muligt at dele direkte"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Liste over apps"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Denne app har ikke fået tilladelse til at optage, men optager muligvis lyd via denne USB-enhed."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 9635b2d..b4b40ea 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direct Share nicht verfügbar"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Liste der Apps"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Diese App hat noch keine Berechtigung zum Aufnehmen erhalten, könnte aber Audioaufnahmen über dieses USB-Gerät machen."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 2766ce4..73828a1 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Ενημερώθηκε από τον διαχειριστή σας"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Διαγράφηκε από τον διαχειριστή σας"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Για την επέκταση της διάρκειας ζωής της μπαταρίας σας, η Εξοικονόμηση μπαταρίας:\n·Ενεργοποιεί το Σκούρο θέμα\n·Απενεργοποιεί ή περιορίζει τη δραστηριότητα παρασκηνίου, ορισμένα οπτικά εφέ και άλλες λειτουργίες όπως την εντολή \"Hey Google\".\n\n"<annotation id="url">"Μάθετε περισσότερα"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Για την επέκταση της διάρκειας ζωής της μπαταρίας σας, η Εξοικονόμηση μπαταρίας:\n·Ενεργοποιεί το Σκούρο θέμα\n·Απενεργοποιεί ή περιορίζει τη δραστηριότητα παρασκηνίου, ορισμένα οπτικά εφέ και άλλες λειτουργίες όπως την εντολή \"Hey Google\"."</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Η άμεση κοινοποίηση δεν είναι διαθέσιμη"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Λίστα εφαρμογών"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Δεν έχει εκχωρηθεί άδεια εγγραφής σε αυτήν την εφαρμογή, αλλά μέσω αυτής της συσκευής USB θα μπορεί να εγγράφει ήχο."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index dba1353..9163214 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -2006,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direct share not available"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Apps list"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"This app has not been granted record permission but could capture audio through this USB device."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml
index 4ecafc9..dff558f 100644
--- a/core/res/res/values-en-rCA/strings.xml
+++ b/core/res/res/values-en-rCA/strings.xml
@@ -2006,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direct share not available"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Apps list"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"This app has not been granted record permission but could capture audio through this USB device."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index dba1353..9163214 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -2006,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direct share not available"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Apps list"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"This app has not been granted record permission but could capture audio through this USB device."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index dba1353..9163214 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -2006,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direct share not available"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Apps list"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"This app has not been granted record permission but could capture audio through this USB device."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml
index 331133a..7519ad6 100644
--- a/core/res/res/values-en-rXC/strings.xml
+++ b/core/res/res/values-en-rXC/strings.xml
@@ -2006,4 +2006,13 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direct share not available"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Apps list"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"This app has not been granted record permission but could capture audio through this USB device."</string>
+ <string name="accessibility_system_action_home_label" msgid="6089400419441597916">"Home"</string>
+ <string name="accessibility_system_action_back_label" msgid="8986628898117178971">"Back"</string>
+ <string name="accessibility_system_action_recents_label" msgid="7607601657790855723">"Recent Apps"</string>
+ <string name="accessibility_system_action_notifications_label" msgid="1578681904050072545">"Notifications"</string>
+ <string name="accessibility_system_action_quick_settings_label" msgid="3885565587471448947">"Quick Settings"</string>
+ <string name="accessibility_system_action_power_dialog_label" msgid="2299530700682199873">"Power Dialog"</string>
+ <string name="accessibility_system_action_toggle_split_screen_label" msgid="2853334443686935668">"Toggle Split Screen"</string>
+ <string name="accessibility_system_action_lock_screen_label" msgid="2377933717780192594">"Lock Screen"</string>
+ <string name="accessibility_system_action_screenshot_label" msgid="1933564892301816480">"Screenshot"</string>
</resources>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index f5fc145..0381249 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Tu administrador actualizó este paquete"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Tu administrador borró este paquete"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Aceptar"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Para extender la duración de batería, el Ahorro de batería hace lo siguiente:\n·Activa el Tema oscuro.\n·Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Ok Google\".\n\n"<annotation id="url">"Más información"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Para extender la duración de batería, el Ahorro de batería hace lo siguiente:\n·Activa el Tema oscuro.\n·Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Ok Google\"."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Para reducir el uso de datos, Ahorro de datos evita que algunas apps envíen y reciban datos en segundo plano. La app que estés usando podrá acceder a los datos, pero con menor frecuencia. De esta forma, por ejemplo, las imágenes no se mostrarán hasta que las presiones."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"¿Activar Ahorro de datos?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Activar"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"No está disponible el uso compartido directo"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista de apps"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Aunque no se le otorgó permiso de grabación a esta app, puede capturar audio con este dispositivo USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index cfac5dc..7f152e1 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Actualizado por el administrador"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Eliminado por el administrador"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Aceptar"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Para que la batería dure más, Ahorro de batería:\nActiva el tema oscuro\nDesactiva o restringe actividad en segundo plano, algunos efectos visuales y otras funciones como \"Ok Google\"\n\n"<annotation id="url">"Más información"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Para que la batería dure más, Ahorro de batería:\nActiva el tema oscuro\nDesactiva o restringe actividad en segundo plano, algunos efectos visuales y otras funciones como \"Ok Google\""</string>
<string name="data_saver_description" msgid="6015391409098303235">"El ahorro de datos evita que algunas aplicaciones envíen o reciban datos en segundo plano, lo que permite reducir el uso de datos. Una aplicación activa podrá acceder a los datos, aunque con menos frecuencia. Esto significa que, por ejemplo, algunas imágenes no se mostrarán hasta que las toques."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"¿Activar ahorro de datos?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Activar"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"No se puede compartir directamente"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista de aplicaciones"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Esta aplicación no tiene permiso para grabar, pero podría registrar audio con este dispositivo USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml
index 8193339..a48c482 100644
--- a/core/res/res/values-et/strings.xml
+++ b/core/res/res/values-et/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Administraator on seda värskendanud"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Administraator on selle kustutanud"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Aku tööea pikendamiseks teeb akusäästja järgmist.\n·Lülitab sisse tumeda teema.\n·Lülitab välja akusäästja taustategevused, mõned visuaalsed efektid ja muud funktsioonid (nt „Hei Google”) või piirab neid.\n\n"<annotation id="url">"Lisateave"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Aku tööea pikendamiseks teeb akusäästja järgmist.\n·Lülitab sisse tumeda teema.\n·Lülitab välja akusäästja taustategevused, mõned visuaalsed efektid ja muud funktsioonid (nt „Hei Google”) või piirab neid."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Andmekasutuse vähendamiseks keelab andmemahu säästja mõne rakenduse puhul andmete taustal saatmise ja vastuvõtmise. Rakendus, mida praegu kasutate, pääseb andmesidele juurde, kuid võib seda teha väiksema sagedusega. Seetõttu võidakse näiteks pildid kuvada alles siis, kui neid puudutate."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Lül. andmemahu säästja sisse?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Lülita sisse"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Vahetu jagamine ei ole saadaval"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Rakenduste loend"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Sellele rakendusele pole antud salvestamise luba, kuid see saab heli jäädvustada selle USB-seadme kaudu."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml
index ca79d05..805df6e 100644
--- a/core/res/res/values-eu/strings.xml
+++ b/core/res/res/values-eu/strings.xml
@@ -70,7 +70,7 @@
<string name="ThreeWCMmi" msgid="9051047170321190368">"Hiru hizlaritako deiak"</string>
<string name="RuacMmi" msgid="7827887459138308886">"Nahigabeko dei gogaikarriak ukatzea"</string>
<string name="CndMmi" msgid="3116446237081575808">"Deitzailearen zenbakia ematea"</string>
- <string name="DndMmi" msgid="1265478932418334331">"Ez molestatu"</string>
+ <string name="DndMmi" msgid="1265478932418334331">"Ez molestatzeko modua"</string>
<string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"Deien identifikazio-zerbitzuaren balio lehenetsiak murriztapenak ezartzen ditu. Hurrengo deia: murriztapenekin"</string>
<string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"Deien identifikazio-zerbitzuaren balio lehenetsiak murriztapenak ezartzen ditu. Hurrengo deia: murriztapenik gabe"</string>
<string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"Deien identifikazio-zerbitzuaren balio lehenetsiak ez du murriztapenik ezartzen. Hurrengo deia: murriztapenekin"</string>
@@ -653,8 +653,8 @@
<string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Operadore baten mezularitza-zerbitzuaren goi-mailako interfazeari lotzea baimentzen die erabiltzaileei. Aplikazio normalek ez lukete inoiz beharko."</string>
<string name="permlab_bindCarrierServices" msgid="3233108656245526783">"lotu operadorearen zerbitzuei"</string>
<string name="permdesc_bindCarrierServices" msgid="1391552602551084192">"Operadorearen zerbitzuei lotzea baimentzen die titularrei. Aplikazio normalek ez dute baimen hau behar."</string>
- <string name="permlab_access_notification_policy" msgid="4247510821662059671">"atzitu \"Ez molestatu\" egoera"</string>
- <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"\"Ez molestatu\" konfigurazioa irakurtzeko eta bertan idazteko baimena ematen die aplikazioei."</string>
+ <string name="permlab_access_notification_policy" msgid="4247510821662059671">"atzitu ez molestatzeko modua"</string>
+ <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"Ez molestatzeko moduaren konfigurazioa irakurtzeko eta bertan idazteko baimena ematen die aplikazioei."</string>
<string name="permlab_startViewPermissionUsage" msgid="5484728591597709944">"hasi ikusteko baimena erabiltzen"</string>
<string name="permdesc_startViewPermissionUsage" msgid="4808345878203594428">"Aplikazioaren baimena erabiltzen hasteko baimena ematen die titularrei. Aplikazio normalek ez lukete beharko."</string>
<string name="policylab_limitPassword" msgid="4497420728857585791">"Ezarri pasahitzen arauak"</string>
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Administratzaileak eguneratu du"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Administratzaileak ezabatu du"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Ados"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Bateriaren iraupena luzatzeko, erabili Bateria-aurrezlea:\n·Gai iluna aktibatzen du\n Desaktibatu edo murriztu egiten ditu atzeko planoko jarduerak, zenbait efektu bisual eta beste eginbide batzuk, hala nola \"Ok Google\"\n\n"<annotation id="url">"Lortu informazio gehiago"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Bateriaren iraupena luzatzeko, erabili Bateria-aurrezlea:\n·Gai iluna aktibatzen du\n Desaktibatu edo murriztu egiten ditu atzeko planoko jarduerak, zenbait efektu bisual eta beste eginbide batzuk, hala nola \"Ok Google\""</string>
<string name="data_saver_description" msgid="6015391409098303235">"Datuen erabilera murrizteko, atzeko planoan datuak bidaltzea eta jasotzea galarazten die datu-aurrezleak aplikazio batzuei. Unean erabiltzen ari zaren aplikazioak atzitu egin ahal izango ditu datuak, baina baliteke maiztasun txikiagoarekin atzitzea. Horrela, adibidez, baliteke irudiak ez erakustea haiek sakatu arte."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Datu-aurrezlea aktibatu?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Aktibatu"</string>
@@ -1813,10 +1811,10 @@
<string name="zen_mode_until" msgid="7336308492289875088">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte"</string>
<string name="zen_mode_alarm" msgid="9128205721301330797">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte (hurrengo alarma)"</string>
<string name="zen_mode_forever" msgid="931849471004038757">"Zuk desaktibatu arte"</string>
- <string name="zen_mode_forever_dnd" msgid="3792132696572189081">"\"Ez molestatu\" desaktibatzen duzun arte"</string>
+ <string name="zen_mode_forever_dnd" msgid="3792132696572189081">"Ez molestatzeko modua desaktibatzen duzun arte"</string>
<string name="zen_mode_rule_name_combination" msgid="191109939968076477">"<xliff:g id="FIRST">%1$s</xliff:g> / <xliff:g id="REST">%2$s</xliff:g>"</string>
<string name="toolbar_collapse_description" msgid="2821479483960330739">"Tolestu"</string>
- <string name="zen_mode_feature_name" msgid="5254089399895895004">"Ez molestatu"</string>
+ <string name="zen_mode_feature_name" msgid="5254089399895895004">"Ez molestatzeko modua"</string>
<string name="zen_mode_downtime_feature_name" msgid="2626974636779860146">"Jarduerarik gabeko denbora"</string>
<string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Lanegunetako gaua"</string>
<string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Asteburua"</string>
@@ -1958,10 +1956,10 @@
<string name="volume_dialog_ringer_guidance_vibrate" msgid="8902050240801159042">"Dar-dar egingo du deiak eta jakinarazpenak jasotzean"</string>
<string name="volume_dialog_ringer_guidance_silent" msgid="2128975224280276122">"Ez da joko tonurik deiak eta jakinarazpenak jasotzean"</string>
<string name="notification_channel_system_changes" msgid="5072715579030948646">"Sistema-aldaketak"</string>
- <string name="notification_channel_do_not_disturb" msgid="6766940333105743037">"Ez molestatu"</string>
- <string name="zen_upgrade_notification_visd_title" msgid="3288313883409759733">"Berria: \"Ez molestatu\" modua jakinarazpenak ezkutatzen ari da"</string>
+ <string name="notification_channel_do_not_disturb" msgid="6766940333105743037">"Ez molestatzeko modua"</string>
+ <string name="zen_upgrade_notification_visd_title" msgid="3288313883409759733">"Berria: Ez molestatzeko modua jakinarazpenak ezkutatzen ari da"</string>
<string name="zen_upgrade_notification_visd_content" msgid="5533674060311631165">"Sakatu informazio gehiago lortzeko eta portaera aldatzeko."</string>
- <string name="zen_upgrade_notification_title" msgid="3799603322910377294">"\"Ez molestatu\" modua aldatu da"</string>
+ <string name="zen_upgrade_notification_title" msgid="3799603322910377294">"Ez molestatzeko modua aldatu da"</string>
<string name="zen_upgrade_notification_content" msgid="1794994264692424562">"Sakatu zer dagoen blokeatuta ikusteko."</string>
<string name="notification_app_name_system" msgid="4205032194610042794">"Sistema"</string>
<string name="notification_app_name_settings" msgid="7751445616365753381">"Ezarpenak"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Zuzenean partekatzeko aukera ez dago erabilgarri"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Aplikazioen zerrenda"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Aplikazioak ez du grabatzeko baimenik, baina baliteke audioa grabatzea USB bidezko gailu horren bidez."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index a9231e9..98044c6 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"توسط سرپرست سیستم بهروزرسانی شد"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"توسط سرپرست سیستم حذف شد"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"تأیید"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"برای افزایش عمر باتری، «بهینهسازی باتری»:\n «طرح زمینه تیره» را روشن میکند\n فعالیت پسزمینه، برخی جلوههای بصری، و دیگر ویژگیها مانند «Ok Google» را خاموش یا محدود میکند\n\n"<annotation id="url">"بیشتر بدانید"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"برای افزایش عمر باتری، «بهینهسازی باتری»:\n «طرح زمینه تیره» را روشن میکند\n فعالیت پسزمینه، برخی جلوههای بصری، و دیگر ویژگیها مانند «Ok Google» را خاموش یا محدود میکند"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"اشتراکگذاری مستقیم دردسترس نیست"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"فهرست برنامهها"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"مجوز ضبط به این برنامه داده نشده است اما میتواند صدا را ازطریق این دستگاه USB ضبط کند."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index 14ed7b7..3476bf5 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Järjestelmänvalvoja päivitti tämän."</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Järjestelmänvalvoja poisti tämän."</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Parantaakseen akunkestoa virransäästö\n·ottaa tumman teeman käyttöön\n·poistaa käytöstä tai rajoittaa taustatoimintoja, joitakin visuaalisia tehosteita ja muita ominaisuuksia (esim. Hei Google).\n\n"<annotation id="url">"Lue lisää"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Parantaakseen akunkestoa virransäästö\n·ottaa tumman teeman käyttöön\n·poistaa käytöstä tai rajoittaa taustatoimintoja, joitakin visuaalisia tehosteita ja muita ominaisuuksia (esim. Hei Google)."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Data Saver estää joitakin sovelluksia lähettämästä tai vastaanottamasta tietoja taustalla, jotta datan käyttöä voidaan vähentää. Käytössäsi oleva sovellus voi yhä käyttää dataa, mutta se saattaa tehdä niin tavallista harvemmin. Tämä voi tarkoittaa esimerkiksi sitä, että kuva ladataan vasta, kun kosketat sitä."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Otetaanko Data Saver käyttöön?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Ota käyttöön"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Suora jakaminen ei käytettävissä"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Sovellusluettelo"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Sovellus ei ole saanut tallennuslupaa mutta voi tallentaa ääntä tämän USB-laitteen avulla."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index 2c4362d..702ecc0 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Mise à jour par votre administrateur"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Supprimé par votre administrateur"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Pour prolonger l\'autonomie de la pile, l\'économiseur de pile effectue les actions suivantes :\n·Activer le thème sombre\n·Désactiver ou limiter l\'activité en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme « Hey Google »\n\n"<annotation id="url">"En savoir plus"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Pour prolonger l\'autonomie de la pile, l\'économiseur de pile effectue les actions suivantes :\n·Activer le thème sombre\n·Désactiver ou limiter l\'activité en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme « Hey Google »"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Pour aider à diminuer l\'utilisation des données, la fonction Économiseur de données empêche certaines applications d\'envoyer ou de recevoir des données en arrière-plan. Une application que vous utilisez actuellement peut accéder à des données, mais peut le faire moins souvent. Cela peut signifier, par exemple, que les images ne s\'affichent pas jusqu\'à ce que vous les touchiez."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Activer l\'Économiseur de données?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Activer"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Le partage direct n\'est pas disponible"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Liste des applications"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Cette application n\'a pas été autorisée à effectuer des enregistrements, mais elle pourrait capturer du contenu audio par l\'intermédiaire de cet appareil USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index cbb64e6..eb199de 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Le partage direct n\'est pas disponible"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Liste des applications"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Cette application n\'a pas reçu l\'autorisation d\'enregistrer des contenus audio, mais peut le faire via ce périphérique USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml
index 848cd0b..9659973 100644
--- a/core/res/res/values-gl/strings.xml
+++ b/core/res/res/values-gl/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Actualizado polo teu administrador"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Eliminado polo teu administrador"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Aceptar"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Para aumentar a duración da batería, a función Aforro de batería fai o seguinte:\n·Activa o tema escuro\n·Desactiva ou restrinxe a actividade en segundo plano, algúns efectos visuais e outras funcións, como \"Ok Google\"\n\n"<annotation id="url">"Máis información"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Para aumentar a duración da batería, a función Aforro de batería fai o seguinte:\n·Activa o tema escuro\n·Desactiva ou restrinxe a actividade en segundo plano, algúns efectos visuais e outras funcións, como \"Ok Google\""</string>
<string name="data_saver_description" msgid="6015391409098303235">"Para contribuír a reducir o uso de datos, o Economizador de datos impide que algunhas aplicacións envíen ou reciban datos en segundo plano. Cando esteas utilizando unha aplicación, esta poderá acceder aos datos, pero é posible que o faga con menos frecuencia. Por exemplo, é posible que as imaxes non se mostren ata que as toques."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Queres activar o economizador de datos?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Activar"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Non está dispoñible a función de compartir directamente"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista de aplicacións"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Esta aplicación non está autorizada a realizar gravacións, pero pode capturar audio a través deste dispositivo USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml
index 2a5536f..6dab622 100644
--- a/core/res/res/values-gu/strings.xml
+++ b/core/res/res/values-gu/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"તમારા વ્યવસ્થાપક દ્વારા અપડેટ કરવામાં આવેલ છે"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"તમારા વ્યવસ્થાપક દ્વારા કાઢી નાખવામાં આવેલ છે"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ઓકે"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"બૅટરીની આવરદા વધારવા માટે, બૅટરી સેવર:\n·ઘેરી થીમ ચાલુ કરે છે\n·બૅકગ્રાઉન્ડ પ્રવૃત્તિ, અમુક વિઝ્યુઅલ ઇફેક્ટ અને “હેય Google” જેવી અન્ય સુવિધાઓ બંધ અથવા પ્રતિબંધિત કરે છે\n\n"<annotation id="url">"વધુ જાણો"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"બૅટરીની આવરદા વધારવા માટે, બૅટરી સેવર:\n·ઘેરી થીમ ચાલુ કરે છે\n·બૅકગ્રાઉન્ડ પ્રવૃત્તિ, અમુક વિઝ્યુઅલ ઇફેક્ટ અને “હેય Google” જેવી અન્ય સુવિધાઓ બંધ અથવા પ્રતિબંધિત કરે છે"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ડાયરેક્ટ શેર કરવાનું ઉપલબ્ધ નથી"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ઍપની સૂચિ"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"આ ઍપને રેકૉર્ડ કરવાની પરવાનગી આપવામાં આવી નથી પરંતુ તે આ USB ડિવાઇસ મારફતે ઑડિયો કૅપ્ચર કરી શકે છે."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index 698a6a7..1a082b9 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"आपके व्यवस्थापक ने अपडेट किया है"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"आपके व्यवस्थापक ने हटा दिया है"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ठीक है"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"बैटरी लाइफ़ बढ़ाने के लिए बैटरी सेवर:\n·गहरे रंग वाली थीम चालू करता है\n·बैकग्राउंड की गतिविधि, कुछ विज़ुअल इफ़ेक्ट, और दूसरी सुविधाएं, जैसे कि \"Hey Google\" को इस्तेमाल करने से रोकता है या बंद करता है\n\n"<annotation id="url">"ज़्यादा जानें"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"बैटरी लाइफ़ बढ़ाने के लिए बैटरी सेवर:\n गहरे रंग वाली थीम चालू करता है\nबैकग्राउंड की गतिविधि, कुछ विज़ुअल इफ़ेक्ट, और दूसरी सुविधाएं, जैसे कि \"Hey Google\" को इस्तेमाल करने से रोकता है या बंद करता है"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"सीधे शेयर नहीं किया जा सकता"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ऐप्लिकेशन की सूची"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"इस ऐप्लिकेशन को रिकॉर्ड करने की अनुमति नहीं दी गई है. हालांकि, ऐप्लिकेशन इस यूएसबी डिवाइस से ऐसा कर सकता है."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 6a134dc..56d5b20 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -1794,10 +1794,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Ažurirao administrator"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Izbrisao administrator"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"U redu"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Da bi se produljilo trajanje baterije, Štednja baterije:\n·Uključuje Tamnu temu.\n·Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\".\n\n"<annotation id="url">"Saznajte više"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Da bi se produljilo trajanje baterije, Štednja baterije:\n·Uključuje Tamnu temu.\n·Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\"."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Da bi se smanjio podatkovni promet, značajka Štednja podatkovnog prometa onemogućuje nekim aplikacijama slanje ili primanje podataka u pozadini. Aplikacija koju trenutačno upotrebljavate može pristupiti podacima, no možda će to činiti rjeđe. To može značiti da se, na primjer, slike neće prikazivati dok ih ne dodirnete."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Uključiti Uštedu podataka?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Uključi"</string>
@@ -2042,4 +2040,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Izravno dijeljenje nije dostupno"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Popis aplikacija"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ta aplikacija nema dopuštenje za snimanje, no mogla bi primati zvuk putem ovog USB uređaja."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index 0cd3fec..184b66a 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"A rendszergazda által frissítve"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"A rendszergazda által törölve"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Az Akkumulátorkímélő mód az akkumulátor üzemidejének növelése érdekében a következőket teszi:\n Bekapcsolja a sötét témát.\n Kikapcsolja vagy korlátozza a háttérben futó tevékenységeket, egyes vizuális effekteket, az „Ok Google” parancsot és egyéb funkciókat.\n\n"<annotation id="url">"További információ"</annotation>"."</string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Az Akkumulátorkímélő mód az akkumulátor üzemidejének növelése érdekében a következőket teszi:\n Bekapcsolja a sötét témát.\n Kikapcsolja vagy korlátozza a háttérben futó tevékenységeket, egyes vizuális effekteket, az „Ok Google” parancsot és egyéb funkciókat."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Az adatforgalom csökkentése érdekében az Adatforgalom-csökkentő megakadályozza, hogy egyes alkalmazások adatokat küldjenek vagy fogadjanak a háttérben. Az Ön által aktuálisan használt alkalmazások hozzáférhetnek az adatokhoz, de csak ritkábban. Ez például azt jelentheti, hogy a képek csak rákoppintás után jelennek meg."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Bekapcsolja az Adatforgalom-csökkentőt?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Bekapcsolás"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"A közvetlen megosztás nem áll rendelkezésre"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Alkalmazások listája"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ez az alkalmazás nem rendelkezik rögzítési engedéllyel, de ezzel az USB-eszközzel képes a hangfelvételre."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml
index a923814..fef6f4e 100644
--- a/core/res/res/values-hy/strings.xml
+++ b/core/res/res/values-hy/strings.xml
@@ -2006,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direct Share գործառույթը հասանելի չէ"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Հավելվածների ցանկ"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Հավելվածը ձայնագրելու թույլտվություն չունի, սակայն կկարողանա գրանցել ձայնն այս USB սարքի միջոցով։"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index b25b643..87a8804 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Diupdate oleh admin Anda"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Dihapus oleh admin Anda"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Oke"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Untuk memperpanjang masa pakai baterai, Penghemat Baterai:\n·Mengaktifkan Tema gelap\n·Menonaktifkan atau membatasi aktivitas di latar belakang, beberapa efek visual, dan fitur lain seperti “Ok Google”\n\n"<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Untuk memperpanjang masa pakai baterai, Penghemat Baterai:\n·Mengaktifkan Tema gelap\n·Menonaktifkan atau membatasi aktivitas di latar belakang, beberapa efek visual, dan fitur lain seperti “Ok Google”"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Untuk membantu mengurangi penggunaan kuota, Penghemat Kuota Internet mencegah beberapa aplikasi mengirim atau menerima data di latar belakang. Aplikasi yang sedang digunakan dapat mengakses data, tetapi frekuensinya agak lebih jarang. Misalnya saja, gambar hanya akan ditampilkan setelah diketuk."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Aktifkan Penghemat Kuota?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Aktifkan"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Berbagi langsung tidak tersedia"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Daftar aplikasi"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Aplikasi ini tidak diberi izin merekam, tetapi dapat merekam audio melalui perangkat USB ini."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml
index c2ffddf..a37eda6 100644
--- a/core/res/res/values-is/strings.xml
+++ b/core/res/res/values-is/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Bein deiling er ekki tiltæk"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Forritalisti"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Þetta forrit hefur ekki fengið heimild fyrir upptöku en gæti tekið upp hljóð í gegnum þetta USB-tæki."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 2e672dc..2b780d0 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Aggiornato dall\'amministratore"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Eliminato dall\'amministratore"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Per estendere la durata della batteria, Risparmio energetico:\n·Attiva il Tema scuro\n·Disattiva o limita le attività in background, alcuni effetti visivi e altre funzionalità come \"Ok Google\"\n\n"<annotation id="url">"Ulteriori informazioni"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Per estendere la durata della batteria, Risparmio energetico:\n·Attiva il Tema scuro\n·Disattiva o limita le attività in background, alcuni effetti visivi e altre funzionalità come \"Ok Google\""</string>
<string name="data_saver_description" msgid="6015391409098303235">"Per contribuire a ridurre l\'utilizzo dei dati, la funzione Risparmio dati impedisce ad alcune app di inviare o ricevere dati in background. Un\'app in uso può accedere ai dati, ma potrebbe farlo con meno frequenza. Esempio: le immagini non vengono visualizzate finché non le tocchi."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Attivare Risparmio dati?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Attiva"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Condivisione diretta non disponibile"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Elenco di app"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"A questa app non è stata concessa l\'autorizzazione di registrazione, ma l\'app potrebbe acquisire l\'audio tramite questo dispositivo USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index fdf34e0..dfbf834 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"עודכנה על ידי מנהל המערכת"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"נמחקה על ידי מנהל המערכת"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"אישור"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"התכונה \'חיסכון בסוללה\':\n·מפעילה עיצוב כהה\n·מכבה או מגבילה פעילות ברקע, חלק מהאפקטים החזותיים ותכונות אחרות כמו \"Ok Google\", כדי להאריך את חיי הסוללה\n\n"<annotation id="url">"מידע נוסף"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"התכונה \'חיסכון בסוללה\':\n·מפעילה עיצוב כהה\n·מכבה או מגבילה פעילות ברקע, חלק מהאפקטים החזותיים ותכונות אחרות כמו \"Ok Google\", כדי להאריך את חיי הסוללה"</string>
<string name="data_saver_description" msgid="6015391409098303235">"כדי לסייע בהפחתת השימוש בנתונים, חוסך הנתונים (Data Saver) מונע מאפליקציות מסוימות שליחה או קבלה של נתונים ברקע. אפליקציה שבה נעשה שימוש כרגע יכולה לגשת לנתונים, אבל בתדירות נמוכה יותר. המשמעות היא, למשל, שתמונות יוצגו רק לאחר שמקישים עליהן."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"האם להפעיל את חוסך הנתונים (Data Saver)?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"הפעל"</string>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"שיתוף ישיר אינו זמין"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"רשימת האפליקציות"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"לאפליקציה זו לא ניתנה הרשאת הקלטה, אבל אפשר להקליט אודיו באמצעות התקן ה-USB הזה."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 07c8107..4776980 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"管理者により更新されています"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"管理者により削除されています"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"電池を長持ちさせるためにバッテリー セーバーが行う操作:\n·ダークテーマをオンにする\n·バックグラウンド アクティビティ、一部の視覚効果や、「OK Google」などの機能をオフにする、または制限する\n\n"<annotation id="url">"詳細"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"電池を長持ちさせるためにバッテリー セーバーが行う操作:\n·ダークテーマをオンにする\n·バックグラウンド アクティビティ、一部の視覚効果や、「OK Google」などの機能をオフにする、または制限する"</string>
<string name="data_saver_description" msgid="6015391409098303235">"データセーバーは、一部のアプリによるバックグラウンドでのデータ送受信を停止することでデータ使用量を抑制します。使用中のアプリからデータにアクセスすることはできますが、その頻度は低くなる場合があります。この影響として、たとえば画像はタップしないと表示されないようになります。"</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"データセーバーを ON にしますか？"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"ON にする"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ダイレクト シェアは利用できません"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"アプリのリスト"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"このアプリに録音権限は付与されていませんが、この USB デバイスから音声を収集できるようになります。"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml
index 87bd222..7f06b01 100644
--- a/core/res/res/values-ka/strings.xml
+++ b/core/res/res/values-ka/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"პირდაპირი გაზიარება მიუწვდომელია"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"აპების სია"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ამ აპს არ აქვს მინიჭებული ჩაწერის ნებართვა, მაგრამ შეუძლია ჩაიწეროს აუდიო ამ USB მოწყობილობის მეშვეობით."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml
index b3395df..65da546 100644
--- a/core/res/res/values-kk/strings.xml
+++ b/core/res/res/values-kk/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Әкімші жаңартқан"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Әкімші жойған"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Жарайды"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Батарея жұмысының ұзақтығын арттыру үшін Battery Saver:\n·Қараңғы тақырыпты іске қосады\n·фондық әрекеттерді, кейбір көрнекі әсерлерді және \"Ok Google\" сияқты басқа да функцияларды өшіреді немесе шектейді.\n\n"<annotation id="url">"Толығырақ"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Батарея жұмысының ұзақтығын арттыру үшін Battery Saver:\n·Қараңғы тақырыпты іске қосады\n·фондық әрекеттерді, кейбір көрнекі әсерлерді және \"Ok Google\" сияқты басқа да функцияларды өшіреді немесе шектейді."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Дерек шығынын азайту үшін Data Saver функциясы кейбір қолданбаларға деректерді фондық режимде жіберуге және алуға жол бермейді. Ашық тұрған қолданба деректерді пайдаланады, бірақ шектеулі шамада (мысалы, кескіндер оларды түрткенге дейін көрсетілмейді)."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Data Saver функциясын қосу керек пе?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Қосу"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Тікелей бөлісу мүмкін емес."</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Қолданбалар тізімі"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Қолданбаға жазу рұқсаты берілмеді, бірақ ол осы USB құрылғысы арқылы дыбыс жаза алады."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml
index 3eb71f6..32b3ee1 100644
--- a/core/res/res/values-km/strings.xml
+++ b/core/res/res/values-km/strings.xml
@@ -1773,10 +1773,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"ធ្វើបច្ចុប្បន្នភាពដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"លុបដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"យល់ព្រម"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"ដើម្បីបង្កើនកម្រិតថាមពលថ្ម កម្មវិធីសន្សំថ្ម៖\n·បើករចនាប័ទ្មងងឹត\n·បិទ ឬដាក់កំហិតលើសកម្មភាពផ្ទៃខាងក្រោយ ឥទ្ធិពលជារូបភាពមួយចំនួន និងមុខងារផ្សេងទៀតដូចជា “Hey Google” ជាដើម\n\n"<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"ដើម្បីបង្កើនកម្រិតថាមពលថ្ម កម្មវិធីសន្សំថ្ម៖\n·បើករចនាប័ទ្មងងឹត\n·បិទ ឬដាក់កំហិតលើសកម្មភាពផ្ទៃខាងក្រោយ ឥទ្ធិពលជារូបភាពមួយចំនួន និងមុខងារផ្សេងទៀតដូចជា “Hey Google” ជាដើម"</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>
@@ -2010,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"មិនមានការចែករំលែកដោយផ្ទាល់ទេ"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"បញ្ជីកម្មវិធី"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"កម្មវិធីនេះមិនទាន់បានទទួលសិទ្ធិថតសំឡេងនៅឡើយទេ ប៉ុន្តែអាចថតសំឡេងតាមរយៈឧបករណ៍ USB នេះបាន។"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml
index a1d993d..0fab683 100644
--- a/core/res/res/values-kn/strings.xml
+++ b/core/res/res/values-kn/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಂದ ಅಪ್ಡೇಟ್ ಮಾಡಲ್ಪಟ್ಟಿದೆ"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅಳಿಸಿದ್ದಾರೆ"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ಸರಿ"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಲು, ಬ್ಯಾಟರಿ ಸೇವರ್:\n·ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ\n·ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ, ಕೆಲವು ದೃಶ್ಯಾತ್ಮಕ ಎಫೆಕ್ಟ್ಗಳು ಮತ್ತು “ಹೇ Google” ನಂತಹ ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ ಅಥವಾ ನಿರ್ಬಂಧಿಸುತ್ತದೆ\n\n"<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಲು, ಬ್ಯಾಟರಿ ಸೇವರ್:\n·ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ\n·ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ, ಕೆಲವು ವಿಷುವಲ್ ಎಫೆಕ್ಟ್ಗಳು ಮತ್ತು “ಹೇ Google” ನಂತಹ ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ ಅಥವಾ ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ನೇರ ಹಂಚಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ಆ್ಯಪ್ಗಳ ಪಟ್ಟಿ"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ಈ ಆ್ಯಪ್ಗೆ ರೆಕಾರ್ಡ್ ಅನುಮತಿಯನ್ನು ನೀಡಲಾಗಿಲ್ಲ, ಆದರೆ ಈ USB ಸಾಧನದ ಮೂಲಕ ಆಡಿಯೊವನ್ನು ಸೆರೆಹಿಡಿಯಬಲ್ಲದು."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index bb1c1e7..f42a928 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"관리자에 의해 업데이트되었습니다."</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"관리자에 의해 삭제되었습니다."</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"확인"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"배터리 수명을 늘리기 위해 절전 모드가 다음과 같이 작동합니다.\n·어두운 테마를 사용 설정합니다.\n·백그라운드 활동, 일부 시각 효과 및 \'Hey Google\'과 같은 기타 기능을 사용 중지하거나 제한합니다.\n\n"<annotation id="url">"자세히 알아보기"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"배터리 수명을 늘리기 위해 절전 모드가 다음과 같이 작동합니다.\n·어두운 테마를 사용 설정합니다.\n·백그라운드 활동, 일부 시각 효과 및 \'Hey Google\'과 같은 기타 기능을 사용 중지하거나 제한합니다."</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"직접 공유가 지원되지 않음"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"앱 목록"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"이 앱에는 녹음 권한이 부여되지 않았지만, 이 USB 기기를 통해 오디오를 녹음할 수 있습니다."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml
index f8191de..82064b2 100644
--- a/core/res/res/values-ky/strings.xml
+++ b/core/res/res/values-ky/strings.xml
@@ -1772,10 +1772,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Администраторуңуз жаңыртып койгон"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Администраторуңуз жок кылып салган"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ЖАРАЙТ"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Батареянын кубатынын мөөнөтүн узартуу үчүн Батареяны үнөмдөгүч режими төмөнкүлөрдү аткарат:\n·Түнкү режимди күйгүзөт\n·Фондогу аракеттерди, айрым визуалдык эффекттерди жана \"Окей Google\" сыяктуу башка функцияларды өчүрөт же чектейт\n\n"<annotation id="url">"Кеңири маалымат"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Батареянын кубатынын мөөнөтүн узартуу үчүн Батареяны үнөмдөгүч режими төмөнкүлөрдү аткарат:\n·Түнкү режимди күйгүзөт\n·Фондогу аракеттерди, айрым визуалдык эффекттерди жана \"Окей Google\" сыяктуу башка функцияларды өчүрөт же чектейт"</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>
@@ -2009,4 +2007,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Түздөн-түз бөлүшүүгө болбойт"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Колдонмолордун тизмеси"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Бул колдонмонун жаздырууга уруксаты жок, бирок бул USB түзмөгү аркылуу аудиону жаздыра алат."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml
index d6150cb..3aa786e 100644
--- a/core/res/res/values-lo/strings.xml
+++ b/core/res/res/values-lo/strings.xml
@@ -2006,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ບໍ່ສາມາດແບ່ງປັນໂດຍກົງໄດ້"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ລາຍຊື່ແອັບ"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ແອັບນີ້ບໍ່ໄດ້ຮັບສິດອະນຸຍາດໃນການບັນທຶກ ແຕ່ສາມາດບັນທຶກສຽງໄດ້ຜ່ານອຸປະກອນ USB ນີ້."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 8bcb000..d4d19f4 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Atnaujino administratorius"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Ištrynė administratorius"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Gerai"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Kad akumuliatorius veiktų ilgiau, akumuliatoriaus tausojimo priemonė:\n·įjungia tamsiąją temą;\n·išjungia arba apriboja veiklą fone, kai kuriuos vaizdinius efektus ir kitas funkcijas, pvz., „Hey Google“.\n\n"<annotation id="url">"Sužinokite daugiau"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Kad akumuliatorius veiktų ilgiau, akumuliatoriaus tausojimo priemonė:\n·įjungia tamsiąją temą;\n·išjungia arba apriboja veiklą fone, kai kuriuos vaizdinius efektus ir kitas funkcijas, pvz., „Hey Google“."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Kad padėtų sumažinti duomenų naudojimą, Duomenų taupymo priemonė neleidžia kai kurioms programoms siųsti ar gauti duomenų fone. Šiuo metu naudojama programa gali pasiekti duomenis, bet tai bus daroma rečiau. Tai gali reikšti, kad, pvz., vaizdai nebus pateikiami, jei jų nepaliesite."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Įj. Duomenų taupymo priemonę?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Įjungti"</string>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Tiesioginio bendrinimo funkcija nepasiekiama"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Programų sąrašas"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Šiai programai nebuvo suteiktas leidimas įrašyti, bet ji gali užfiksuoti garsą per šį USB įrenginį."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index a936bcc..89a98dd 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -1794,10 +1794,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Atjaunināja administrators"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Dzēsa administrators"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Labi"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Lai pagarinātu akumulatora darbības ilgumu, akumulatora jaudas taupīšanas režīmā tiek veiktas tālāk norādītās darbības.\n·Tiek ieslēgts tumšais motīvs.\n·Tiek izslēgtas vai ierobežotas darbības fonā, daži vizuālie efekti un citas funkcijas, piemēram, “Hey Google”.\n\n"<annotation id="url">"Uzzināt vairāk"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Lai pagarinātu akumulatora darbības ilgumu, akumulatora jaudas taupīšanas režīmā tiek veiktas tālāk norādītās darbības.\n·Tiek ieslēgts tumšais motīvs.\n·Tiek izslēgtas vai ierobežotas darbības fonā, daži vizuālie efekti un citas funkcijas, piemēram, “Hey Google”."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Lai samazinātu datu lietojumu, datu lietojuma samazinātājs neļauj dažām lietotnēm fonā nosūtīt vai saņemt datus. Lietotne, kuru pašlaik izmantojat, var piekļūt datiem, bet, iespējams, piekļūs tiem retāk (piemēram, attēli tiks parādīti tikai tad, kad tiem pieskarsieties)."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Vai ieslēgt datu lietojuma samazinātāju?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Ieslēgt"</string>
@@ -2042,4 +2040,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Tiešā kopīgošana nav pieejama"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lietotņu saraksts"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Šai lietotnei nav piešķirta ierakstīšanas atļauja, taču tā varētu tvert audio, izmantojot šo USB ierīci."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml
index e4bfdf4..4396c08 100644
--- a/core/res/res/values-mk/strings.xml
+++ b/core/res/res/values-mk/strings.xml
@@ -1773,10 +1773,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Ажурирано од администраторот"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Избришано од администраторот"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Во ред"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"За да го продолжи траењето на батеријата, „Штедачот на батерија“:\n·вклучува темна тема\n·исклучува или ограничува активност во заднина, некои визуелни ефекти и други функции како „Hey Google“\n\n"<annotation id="url">"Дознајте повеќе"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"За да го продолжи траењето на батеријата, „Штедачот на батерија“:\n·вклучува темна тема\n·исклучува или ограничува активност во заднина, некои визуелни ефекти и други функции како „Hey Google“"</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>
@@ -2010,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Не е достапно директно споделување"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Список со апликации"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"На апликацијава не ѝ е доделена дозвола за снимање, но може да снима аудио преку овој USB-уред."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml
index 6957879..0b33971 100644
--- a/core/res/res/values-ml/strings.xml
+++ b/core/res/res/values-ml/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"നിങ്ങളുടെ അഡ്മിൻ അപ്ഡേറ്റ് ചെയ്യുന്നത്"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"നിങ്ങളുടെ അഡ്മിൻ ഇല്ലാതാക്കുന്നത്"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ശരി"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"ബാറ്ററി ലെെഫ് വികസിപ്പിക്കാൻ, \'ബാറ്ററി ലാഭിക്കൽ\':\n ഡാർക്ക് തീം ഓണാക്കും\nപശ്ചാത്തല പ്രവർത്തനം, ചില വിഷ്വൽ ഇഫക്റ്റുകൾ, “ഹേയ് Google” പോലുള്ള മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കുകയോ നിയന്ത്രിക്കുകയോ ചെയ്യും\n\n"<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"ബാറ്ററി ലെെഫ് വികസിപ്പിക്കാൻ, \'ബാറ്ററി ലാഭിക്കൽ\':\n ഡാർക്ക് തീം ഓണാക്കും\nപശ്ചാത്തല പ്രവർത്തനം, ചില വിഷ്വൽ ഇഫക്റ്റുകൾ, “ഹേയ് Google” പോലുള്ള മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കുകയോ നിയന്ത്രിക്കുകയോ ചെയ്യും"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"നേരിട്ടുള്ള പങ്കിടൽ ലഭ്യമല്ല"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ആപ്പുകളുടെ ലിസ്റ്റ്"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ഈ ആപ്പിന് റെക്കോർഡ് അനുമതി നൽകിയിട്ടില്ല, എന്നാൽ ഈ USB ഉപകരണത്തിലൂടെ ഓഡിയോ ക്യാപ്ചർ ചെയ്യാനാവും."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml
index f1077c5..990a4d0 100644
--- a/core/res/res/values-mn/strings.xml
+++ b/core/res/res/values-mn/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Таны админ шинэчилсэн"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Таны админ устгасан"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ОК"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Батарейны ажиллах хугацааг уртасгахын тулд Батарей хэмнэгч нь:\n·Бараан загварыг асаадаг\n·Арын үйл ажиллагаа, зарим визуал эффект болон “Hey Google” зэрэг бусад онцлогийг унтрааж эсвэл хязгаарладаг\n\n"<annotation id="url">"Нэмэлт мэдээлэл авах"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Батарейны ажиллах хугацааг уртасгахын тулд Батарей хэмнэгч нь:\n·Бараан загварыг асаадаг\n·Арын үйл ажиллагаа, зарим визуал эффект болон “Hey Google” зэрэг бусад онцлогийг унтрааж эсвэл хязгаарладаг"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Шууд хуваалцах боломжгүй"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Аппын жагсаалт"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Энэ апликейшнд бичих зөвшөөрөл олгогдоогүй ч энэ USB төхөөрөмжөөр дамжуулан аудио бичиж чадсан."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml
index 6b17e27..edc89a4 100644
--- a/core/res/res/values-mr/strings.xml
+++ b/core/res/res/values-mr/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"आपल्या प्रशासकाने अपडेट केले"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"आपल्या प्रशासकाने हटवले"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ओके"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"बॅटरी सेव्हर हे बॅटरीचे आयुष्य वाढवते:\n·गडद थीम सुरू करते \n· बॅकग्राउंड अॅक्टिव्हिटी, काही व्हिज्युअल इफेक्ट आणि \"Ok Google\" यासारखी वैशिष्ट्ये बंद किंवा मर्यादित करते.\n\n"<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"बॅटरी सेव्हर हे बॅटरीचे आयुष्य वाढवते:\n·गडद थीम सुरू करते \n· बॅकग्राउंड अॅक्टिव्हिटी, काही व्हिज्युअल इफेक्ट आणि \"Ok Google\" यासारखी वैशिष्ट्ये बंद किंवा मर्यादित करते."</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"थेट शेअर करणे उपलब्ध नाही"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"अॅप्स सूची"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"या अॅपला रेकॉर्ड करण्याची परवानगी दिली गेली नाही पण हे USB डिव्हाइस वापरून ऑडिओ कॅप्चर केला जाऊ शकतो."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml
index 37d5ef1..0c881c5 100644
--- a/core/res/res/values-ms/strings.xml
+++ b/core/res/res/values-ms/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Dikemas kini oleh pentadbir anda"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Dipadamkan oleh pentadbir anda"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Untuk melanjutkan hayat bateri, Penjimat Bateri:\n·Menghidupkan Tema gelap\n·Mematikan atau mengehadkan aktiviti latar belakang, sesetengah kesan visual dan ciri lain seperti “Hey Google”\n\n"<annotation id="url">"Ketahui lebih lanjut"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Untuk melanjutkan hayat bateri, Penjimat Bateri:\n·Menghidupkan Tema gelap\n·Mematikan atau mengehadkan aktiviti latar belakang, sesetengah kesan visual dan ciri lain seperti “Hey Google”"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Untuk membantu mengurangkan penggunaan data, Penjimat Data menghalang sesetengah apl daripada menghantar atau menerima data di latar. Apl yang sedang digunakan boleh mengakses data tetapi mungkin tidak secara kerap. Perkara ini mungkin bermaksud bahawa imej tidak dipaparkan sehingga anda mengetik pada imej itu, contohnya."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Hidupkan Penjimat Data?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Hidupkan"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Perkongsian langsung tidak tersedia"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Senarai apl"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Apl ini belum diberikan kebenaran merakam tetapi dapat merakam audio melalui peranti USB ini."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml
index 8e154b9..f5745b5 100644
--- a/core/res/res/values-my/strings.xml
+++ b/core/res/res/values-my/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"သင်၏ စီမံခန့်ခွဲသူက အပ်ဒိတ်လုပ်ထားသည်"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"သင်၏ စီမံခန့်ခွဲသူက ဖျက်လိုက်ပါပြီ"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"ဘက်ထရီသက်တမ်း ပိုရှည်စေရန် \'ဘက်ထရီအားထိန်း\' က \n·မှောင်သည့် အပြင်အဆင်ကို ဖွင့်သည် \n·နောက်ခံလုပ်ဆောင်ချက် အချို့ အမြင်အာရုံဆိုင်ရာ အထူးပြုလုပ်ချက်များနှင့် “Hey Google” ကဲ့သို့ အခြား ဝန်ဆောင်မှုများကို ပိတ်ခြင်း သို့မဟုတ် ကန့်သတ်ခြင်းတို့ ပြုလုပ်သည်။\n\n"<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"ဘက်ထရီသက်တမ်း ပိုရှည်စေရန် \'ဘက်ထရီအားထိန်း\' က \n·မှောင်သည့် အပြင်အဆင်ကို ဖွင့်သည် \n·နောက်ခံလုပ်ဆောင်ချက် အချို့ အမြင်အာရုံဆိုင်ရာ အထူးပြုလုပ်ချက်များနှင့် “Hey Google” ကဲ့သို့ အခြား ဝန်ဆောင်မှုများကို ပိတ်ခြင်း သို့မဟုတ် ကန့်သတ်ခြင်းတို့ ပြုလုပ်သည်။"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"တိုက်ရိုက်မျှဝေ၍ မရပါ"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"အက်ပ်စာရင်း"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ဤအက်ပ်ကို အသံဖမ်းခွင့် ပေးမထားသော်လည်း ၎င်းသည် ဤ USB စက်ပစ္စည်းမှတစ်ဆင့် အသံများကို ဖမ်းယူနိုင်ပါသည်။"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index d9d59ea..0359779 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Oppdatert av administratoren din"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Slettet av administratoren din"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"For å forlenge batterilevetiden slår Batterisparing\n·på mørkt tema\n·av eller begrenser bakgrunnsaktivitet, enkelte visuelle effekter og andre funksjoner, for eksempel «Hey Google»\n\n"<annotation id="url">"Finn ut mer"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"For å forlenge batterilevetiden slår Batterisparing\n·på mørkt tema\n·av eller begrenser bakgrunnsaktivitet, enkelte visuelle effekter og andre funksjoner, for eksempel «Hey Google»"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Datasparing hindrer noen apper fra å sende og motta data i bakgrunnen, for å redusere dataforbruket. Aktive apper kan bruke data, men kanskje ikke så mye som ellers – for eksempel vises ikke bilder før du trykker på dem."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Vil du slå på Datasparing?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Slå på"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Direktedeling er ikke tilgjengelig"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Appliste"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Denne appen har ikke fått tillatelse til å spille inn, men kan ta opp lyd med denne USB-enheten."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml
index 2b61999..2617086 100644
--- a/core/res/res/values-ne/strings.xml
+++ b/core/res/res/values-ne/strings.xml
@@ -2014,4 +2014,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"सीधै आदान प्रदान गर्ने सुविधा उपलब्ध छैन"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"अनुप्रयोगहरूको सूची"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"यो अनुप्रयोगलाई रेकर्ड गर्ने अनुमति प्रदान गरिएको छैन तर यसले यो USB यन्त्रमार्फत अडियो क्याप्चर गर्न सक्छ।"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index 5922388..43b4ede 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Geüpdatet door je beheerder"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Verwijderd door je beheerder"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Batterijbesparing doet het volgende om de batterijduur te verlengen:\n·Het donkere thema inschakelen\n·Achtergrondactiviteit, bepaalde visuele effecten en andere functies (zoals \'Hey Google\') uitschakelen of beperken\n\n"<annotation id="url">"Meer informatie"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Batterijbesparing doet het volgende om de batterijduur te verlengen:\n Het donkere thema inschakelen\n·Achtergrondactiviteit, bepaalde visuele effecten en andere functies (zoals \'Hey Google\') uitschakelen of beperken"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Databesparing beperkt het datagebruik door te voorkomen dat sommige apps gegevens verzenden of ontvangen op de achtergrond. De apps die je open hebt, kunnen nog steeds data verbruiken, maar doen dit minder vaak. Afbeeldingen worden dan bijvoorbeeld niet weergegeven totdat je erop tikt."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Databesparing inschakelen?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Inschakelen"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Rechtstreeks delen is niet beschikbaar"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lijst met apps"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Deze app heeft geen opnamerechten gekregen, maar zou audio kunnen vastleggen via dit USB-apparaat."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml
index 04d5652..68b76c8 100644
--- a/core/res/res/values-or/strings.xml
+++ b/core/res/res/values-or/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ସିଧାସଳଖ ସେୟାର୍ ସୁବିଧା ଉପଲବ୍ଧ ନାହିଁ"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ଆପ୍ସ ତାଲିକା"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ଏହି ଆପ୍କୁ ରେକର୍ଡ କରିବାକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ କିନ୍ତୁ ଏହି USB ଡିଭାଇସ୍ ଜରିଆରେ ଅଡିଓ କ୍ୟାପ୍ଚର୍ କରିପାରିବ।"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml
index 2cc004c..63b5f53 100644
--- a/core/res/res/values-pa/strings.xml
+++ b/core/res/res/values-pa/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਮਿਟਾਇਆ ਗਿਆ"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ਠੀਕ ਹੈ"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਉਣ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ:\n ਗੂੜ੍ਹਾ ਥੀਮ ਚਾਲੂ ਕਰਦਾ ਹੈ\n ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ, ਕੁਝ ਦ੍ਰਿਸ਼ ਪ੍ਰਭਾਵਾਂ, ਅਤੇ \"Hey Google\" ਵਰਗੀਆਂ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ ਜਾਂ ਉਹਨਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦਾ ਹੈ\n\n"<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਉਣ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ:\n ਗੂੜ੍ਹਾ ਥੀਮ ਚਾਲੂ ਕਰਦਾ ਹੈ\n ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ, ਕੁਝ ਦ੍ਰਿਸ਼ ਪ੍ਰਭਾਵਾਂ, ਅਤੇ \"Hey Google\" ਵਰਗੀਆਂ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ ਜਾਂ ਉਹਨਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦਾ ਹੈ"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ਸਿੱਧਾ ਸਾਂਝਾ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ਐਪ ਸੂਚੀ"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ਇਸ ਐਪ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਪਰ ਇਹ USB ਡੀਵਾਈਸ ਰਾਹੀਂ ਆਡੀਓ ਕੈਪਚਰ ਕਰ ਸਕਦੀ ਹੈ।"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index a5d8125..bd695a9 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Zaktualizowany przez administratora"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Usunięty przez administratora"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Aby wydłużyć czas pracy na baterii, Oszczędzanie baterii:\n włącza tryb ciemny, \nwyłącza lub ogranicza aktywność w tle, niektóre efekty wizualne oraz inne funkcje, np. „OK Google”.\n\n"<annotation id="url">"Więcej informacji"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Aby wydłużyć czas pracy na baterii, Oszczędzanie baterii:\n włącza tryb ciemny,\n wyłącza lub ogranicza aktywność w tle, niektóre efekty wizualne oraz inne funkcje, np. „OK Google”."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Oszczędzanie danych uniemożliwia niektórym aplikacjom wysyłanie i odbieranie danych w tle, zmniejszając w ten sposób ich użycie. Aplikacja, z której w tej chwili korzystasz, może uzyskiwać dostęp do danych, ale rzadziej. Może to powodować, że obrazy będą się wyświetlać dopiero po kliknięciu."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Włączyć Oszczędzanie danych?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Włącz"</string>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Udostępnianie bezpośrednie jest niedostępne"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista aplikacji"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ta aplikacja nie ma uprawnień do nagrywania, ale może rejestrować dźwięk za pomocą tego urządzenia USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml
index 9c44862..45a2abd2 100644
--- a/core/res/res/values-pt-rBR/strings.xml
+++ b/core/res/res/values-pt-rBR/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Atualizado pelo seu administrador"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Excluído pelo seu administrador"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Para aumentar a duração da bateria, a \"Economia de bateria: \n ativa o tema escuro;\n·desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\".\n\n"<annotation id="url">"Saiba mais"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Para aumentar a duração da bateria, a \"Economia de bateria\": \n ativa o tema escuro;\n desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\"."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Para ajudar a reduzir o uso de dados, a Economia de dados impede que alguns apps enviem ou recebam dados em segundo plano. Um app que você esteja usando no momento pode acessar dados, mas com menos frequência. Isso pode fazer com que imagens não sejam exibidas até que você toque nelas."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Ativar Economia de dados?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Ativar"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Compartilhamento direto indisponível"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista de apps"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Este app não tem permissão de gravação, mas pode capturar áudio pelo dispositivo USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 6a695a7..0fd303f 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Atualizado pelo seu gestor"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Eliminado pelo seu gestor"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Para prolongar a autonomia da bateria, a Poupança de bateria:\n·Ativa o tema escuro.\n·Desativa ou restringe a atividade em segundo plano, alguns efeitos visuais e outras funcionalidades como \"Ok Google\".\n\n"<annotation id="url">"Saber mais"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Para prolongar a autonomia da bateria, a Poupança de bateria:\n·Ativa o tema escuro.\n·Desativa ou restringe a atividade em segundo plano, alguns efeitos visuais e outras funcionalidades como \"Ok Google\"."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Para ajudar a reduzir a utilização de dados, a Poupança de dados impede que algumas aplicações enviem ou recebam dados em segundo plano. Uma determinada aplicação que esteja a utilizar atualmente pode aceder aos dados, mas é possível que o faça com menos frequência. Isto pode significar, por exemplo, que as imagens não são apresentadas até que toque nas mesmas."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Ativar a Poupança de dados?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Ativar"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"A partilha direta não está disponível."</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista de aplicações"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Esta aplicação não recebeu autorização de gravação, mas pode capturar áudio através deste dispositivo USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 9c44862..45a2abd2 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Atualizado pelo seu administrador"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Excluído pelo seu administrador"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Para aumentar a duração da bateria, a \"Economia de bateria: \n ativa o tema escuro;\n·desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\".\n\n"<annotation id="url">"Saiba mais"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Para aumentar a duração da bateria, a \"Economia de bateria\": \n ativa o tema escuro;\n desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\"."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Para ajudar a reduzir o uso de dados, a Economia de dados impede que alguns apps enviem ou recebam dados em segundo plano. Um app que você esteja usando no momento pode acessar dados, mas com menos frequência. Isso pode fazer com que imagens não sejam exibidas até que você toque nelas."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Ativar Economia de dados?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Ativar"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Compartilhamento direto indisponível"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista de apps"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Este app não tem permissão de gravação, mas pode capturar áudio pelo dispositivo USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 35ce5d6..a878628 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -1794,10 +1794,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Actualizat de administratorul dvs."</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Șters de administratorul dvs."</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Pentru a prelungi autonomia bateriei, Economisirea bateriei:\n·activează tema întunecată;\n·activează sau restricționează activitatea în fundal, unele efecte vizuale și alte funcții, cum ar fi „Ok Google”.\n\n"<annotation id="url">"Aflați mai multe"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Pentru a prelungi autonomia bateriei, Economisirea bateriei:\n·activează tema întunecată;\n·activează sau restricționează activitatea în fundal, unele efecte vizuale și alte funcții, cum ar fi „Ok Google”."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Pentru a contribui la reducerea utilizării de date, Economizorul de date împiedică unele aplicații să trimită sau să primească date în fundal. O aplicație pe care o folosiți poate accesa datele, însă mai rar. Aceasta poate însemna, de exemplu, că imaginile se afișează numai după ce le atingeți."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Activați Economizorul de date?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Activați"</string>
@@ -2042,4 +2040,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Trimiterea directă nu este disponibilă"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista de aplicații"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Permisiunea de înregistrare nu a fost acordată aplicației, dar aceasta poate să înregistreze conținut audio prin intermediul acestui dispozitiv USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 0fcb4c9..aa94aa6 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Обновлено администратором"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Удалено администратором"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ОК"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Чтобы продлить время работы от батареи, в режиме энергосбережения:\nвключается тёмная тема;\nотключаются или ограничиваются фоновые процессы, некоторые визуальные эффекты и другие функции (например, распознавание команды \"Окей, Google\").\n\n"<annotation id="url">"Подробнее…"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Чтобы продлить время работы от батареи, в режиме энергосбережения:\nвключается тёмная тема;\nотключаются или ограничиваются фоновые процессы, некоторые визуальные эффекты и другие функции (например, распознавание команды \"Окей, Google\")."</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>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Функция Direct Share недоступна."</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Список приложений"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Приложению не разрешено записывать звук, однако оно может делать это с помощью этого USB-устройства."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml
index aaff63f..ee261a54 100644
--- a/core/res/res/values-si/strings.xml
+++ b/core/res/res/values-si/strings.xml
@@ -1773,10 +1773,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"ඔබගේ පරිපාලක මඟින් යාවත්කාලීන කර ඇත"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"ඔබගේ පරිපාලක මඟින් මකා දමා ඇත"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"හරි"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"බැටරියේ ජීව කාලය දික් කිරීමට, බැටරි සුරැකුම:\n·අඳුරු තේමාව ක්රියාත්මක කරයි\n·පසුබිමේ ක්රියාකාරකම, සමහර දෘෂ්ය ප්රයෝග සහ “Hey Google” වැනි වෙනත් විශේෂාංග ක්රියාවිරහිත කරයි නැතහොත් අවහිර කරයි\n\n"<annotation id="url">"තව දැන ගන්න"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"බැටරියේ ජීව කාලය දික් කිරීමට, බැටරි සුරැකුම:\n·අඳුරු තේමාව ක්රියාත්මක කරයි\n·පසුබිමේ ක්රියාකාරකම, සමහර දෘෂ්ය ප්රයෝග සහ “Hey Google” වැනි වෙනත් විශේෂාංග ක්රියාවිරහිත කරයි නැතහොත් අවහිර කරයි"</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>
@@ -2010,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"ඍජු බෙදා ගැනීම නොලැබේ"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"යෙදුම් ලැයිස්තුව"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"මෙම යෙදුමට පටිගත කිරීම් අවසරයක් ලබා දී නොමැති නමුත් මෙම USB උපාංගය හරහා ශ්රව්ය ග්රහණය කර ගත හැකිය."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 84b2874..ed4f68c 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Aktualizoval správca"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Odstránil správca"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Šetrič batérie predlžuje výdrž batérie:\n·zapnutím tmavého motívu;\n·vypnutím alebo obmedzením aktivity na pozadí, niektorých vizuálnych efektov a ďalších funkcií, ako napríklad „Hej Google“.\n\n"<annotation id="url">"Ďalšie informácie"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Šetrič batérie predlžuje výdrž batérie:\n·zapnutím tmavého motívu;\n·vypnutím alebo obmedzením aktivity na pozadí, niektorých vizuálnych efektov a ďalších funkcií, ako napríklad „Hej Google“."</string>
<string name="data_saver_description" msgid="6015391409098303235">"S cieľom znížiť spotrebu dát bráni šetrič dát niektorým aplikáciám odosielať alebo prijímať dáta na pozadí. Aplikácia, ktorú práve používate, môže využívať dáta, ale možno to bude robiť menej často. Znamená to napríklad, že sa nezobrazia obrázky, kým na ne neklepnete."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Chcete zapnúť šetrič dát?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Zapnúť"</string>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Priame zdieľanie nie je k dispozícii"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Zoznam aplikácií"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Tejto aplikácii nebolo udelené povolenie na nahrávanie, ale môže nasnímať zvuk cez toto zariadenie USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index 4657001..dc162a8 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Posodobil skrbnik"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Izbrisal skrbnik"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"V redu"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Funkcija varčevanja z energijo baterije tako podaljša čas delovanja baterije:\n·Vklopi temno temo,\n·izklopi ali omeji izvajanje dejavnosti v ozadju, nekaterih vizualnih učinkov in drugih funkcij, kot je »Hey Google«.\n\n"<annotation id="url">"Več o tem"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Funkcija varčevanja z energijo baterije tako podaljša čas delovanja baterije:\n·Vklopi temno temo,\n·izklopi ali omeji izvajanje dejavnosti v ozadju, nekaterih vizualnih učinkov in drugih funkcij, kot je »Hey Google«."</string>
<string name="data_saver_description" msgid="6015391409098303235">"Zaradi zmanjševanja prenesene količine podatkov varčevanje s podatki nekaterim aplikacijam preprečuje, da bi v ozadju pošiljale ali prejemale podatke. Aplikacija, ki jo trenutno uporabljate, lahko prenaša podatke, vendar to morda počne manj pogosto. To na primer pomeni, da se slike ne prikažejo, dokler se jih ne dotaknete."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Vklop varčevanja s podatki?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Vklop"</string>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Neposredna skupna raba ni na voljo"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Seznam aplikacij"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ta aplikacija sicer nima dovoljenja za snemanje, vendar bi lahko zajemala zvok prek te naprave USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml
index cdef310..4973f9f 100644
--- a/core/res/res/values-sq/strings.xml
+++ b/core/res/res/values-sq/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Ndarja e drejtpërdrejtë nuk ofrohet"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Lista e aplikacioneve"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Këtij aplikacioni nuk i është dhënë leje për regjistrim, por mund të regjistrojë audio përmes kësaj pajisjeje USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index c953e5e..48658bb 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -1794,10 +1794,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Ажурирао је администратор"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Избрисао је администратор"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Потврди"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Ради дужег трајања батерије, уштеда батерије:\n·укључује тамну тему\n·искључује или ограничава активности у позадини, неке визуелне ефекте и друге функције, на пример, „Ок Google“\n\n"<annotation id="url">"Сазнајте више"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Ради дужег трајања батерије, уштеда батерије:\n·укључује тамну тему\n·искључује или ограничава активности у позадини, неке визуелне ефекте и друге функције, на пример, „Ок Google“"</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>
@@ -2042,4 +2040,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Директно дељење није доступно"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Листа апликација"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ова апликација нема дозволу за снимање, али би могла да снима звук помоћу овог USB уређаја."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 32cd878..09a2513 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -1414,7 +1414,7 @@
<string name="permission_request_notification_title" msgid="6486759795926237907">"Begärd behörighet"</string>
<string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Begärd behörighet\nför kontot <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
<string name="forward_intent_to_owner" msgid="1207197447013960896">"Du använder den här appen i din arbetsprofil"</string>
- <string name="forward_intent_to_work" msgid="621480743856004612">"Du använder den här appen i din profil"</string>
+ <string name="forward_intent_to_work" msgid="621480743856004612">"Du använder den här appen i din jobbprofil"</string>
<string name="input_method_binding_label" msgid="1283557179944992649">"Indatametod"</string>
<string name="sync_binding_label" msgid="3687969138375092423">"Synkronisera"</string>
<string name="accessibility_binding_label" msgid="4148120742096474641">"Tillgänglighet"</string>
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Administratören uppdaterade paketet"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Administratören raderade paketet"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"I syfte att förlänga batteritiden sker följande i batterisparläget:\n·mörkt tema aktiveras\n·aktivitet i bakgrunden, vissa visuella effekter och andra funktioner, som ”Hey Google”, inaktiveras eller begränsas\n\n"<annotation id="url">"Läs mer"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"I syfte att förlänga batteritiden sker följande i batterisparläget:\n·mörkt tema aktiveras\n·aktivitet i bakgrunden, vissa visuella effekter och andra funktioner, som ”Hey Google”, inaktiveras eller begränsas"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Med databesparing kan du minska dataanvändningen genom att hindra en del appar från att skicka eller ta emot data i bakgrunden. Appar som du använder kan komma åt data, men det sker kanske inte lika ofta. Detta innebär t.ex. att bilder inte visas förrän du trycker på dem."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Aktivera Databesparing?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Aktivera"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Dela direkt är inte tillgängligt"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Applista"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Appen har inte fått inspelningsbehörighet men kan spela in ljud via denna USB-enhet."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index 15bb4bf..483c39f 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Imesasishwa na msimamizi wako"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Imefutwa na msimamizi wako"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Sawa"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Ili kuongeza muda wa matumizi ya betri, Kiokoa Betri:\n.Huwasha Mandhari meusi\n. Huzima au kuzuia shughuli za chinichini, baadhi ya madoido yanayoonekana na vipengele vingine kama vile \"Ok Google\"\n\n"<annotation id="url">"Pata maelezo zaidi"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Ili kuongeza muda wa matumizi ya betri, Kiokoa Betri:\n.Huwasha Mandhari meusi\n. Huzima au kuzuia shughuli za chinichini, baadhi ya madoido yanayoonekana na vipengele vingine kama vile \"Ok Google\""</string>
<string name="data_saver_description" msgid="6015391409098303235">"Ili kusaidia kupunguza matumizi ya data, Kiokoa Data huzuia baadhi ya programu kupokea na kutuma data chinichini. Programu ambayo unatumia sasa inaweza kufikia data, lakini si kila wakati. Kwa mfano, haitaonyesha picha hadi utakapozifungua."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Ungependa Kuwasha Kiokoa Data?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Washa"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Huwezi kushiriki moja kwa moja"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Orodha ya programu"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Programu hii haijapewa ruhusa ya kurekodi lakini inaweza kurekodi sauti kupitia kifaa hiki cha USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml
index e2629df..0c4e20e 100644
--- a/core/res/res/values-ta/strings.xml
+++ b/core/res/res/values-ta/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"உங்கள் நிர்வாகி புதுப்பித்துள்ளார்"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"உங்கள் நிர்வாகி நீக்கியுள்ளார்"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"சரி"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"பேட்டரி நிலையை நீட்டிப்பதற்காக, பேட்டரி சேமிப்பான்:\n·டார்க் தீமினை ஆன் செய்யும்\n·“Hey Google” போன்ற பிற அம்சங்கள், பின்னணி செயல்பாடுகள், சில விஷுவல் எஃபெக்ட்கள், ஆகியவற்றை ஆஃப் செய்யும் அல்லது கட்டுப்படுத்தும்\n\n"<annotation id="url">"மேலும் அறிக"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"பேட்டரி நிலையை நீட்டிப்பதற்காக, பேட்டரி சேமிப்பான்:\n·டார்க் தீமினை ஆன் செய்யும்\n·“Hey Google” போன்ற பிற அம்சங்கள், பின்னணி செயல்பாடுகள், சில விஷுவல் எஃபெக்ட்கள், ஆகியவற்றை ஆஃப் செய்யும் அல்லது கட்டுப்படுத்தும்"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"நேரடிப் பகிர்வு இல்லை"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ஆப்ஸ் பட்டியல்"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"இந்த ஆப்ஸிற்கு ரெக்கார்டு செய்வதற்கான அனுமதி வழங்கப்படவில்லை, எனினும் இந்த USB சாதனம் மூலம் ஆடியோவைப் பதிவுசெய்ய முடியும்."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml
index 6718470..1b3df6e 100644
--- a/core/res/res/values-te/strings.xml
+++ b/core/res/res/values-te/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"డైరెక్ట్ షేర్ అందుబాటులో లేదు"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"యాప్ల జాబితా"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"ఈ యాప్కు రికార్డ్ చేసే అనుమతి మంజూరు కాలేదు, అయినా ఈ USB పరికరం ద్వారా ఆడియోను క్యాప్చర్ చేయగలదు."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-television/config.xml b/core/res/res/values-television/config.xml
index 3ecb1dd..655d4dd 100644
--- a/core/res/res/values-television/config.xml
+++ b/core/res/res/values-television/config.xml
@@ -42,4 +42,8 @@
<!-- Allow SystemUI to show the shutdown dialog -->
<bool name="config_showSysuiShutdown">true</bool>
+
+ <!-- The time in milliseconds of prolonged user inactivity after which device goes to sleep,
+ even if wakelocks are held. On TVs, this defaults to 4 hours. -->
+ <integer name="config_attentiveTimeout">14400000</integer>
</resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index 2f59711..ff1ea21 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"อัปเดตโดยผู้ดูแลระบบ"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"ลบโดยผู้ดูแลระบบ"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ตกลง"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"โหมดประหยัดแบตเตอรี่จะดำเนินการดังต่อไปนี้เพื่อยืดอายุการใช้งานแบตเตอรี่\n·เปิดธีมมืด\n·ปิดหรือจำกัดกิจกรรมในเบื้องหลัง เอฟเฟกต์ภาพบางอย่าง และฟีเจอร์อื่นๆ อย่างเช่น “Hey Google”\n\n"<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"โหมดประหยัดแบตเตอรี่จะดำเนินการดังต่อไปนี้เพื่อยืดอายุการใช้งานแบตเตอรี่\n·เปิดธีมมืด\n·ปิดหรือจำกัดกิจกรรมในเบื้องหลัง เอฟเฟกต์ภาพบางอย่าง และฟีเจอร์อื่นๆ อย่างเช่น “Hey Google”"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"การแชร์โดยตรงไม่พร้อมใช้งาน"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"รายชื่อแอป"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"แอปนี้ไม่ได้รับอนุญาตให้บันทึกเสียงแต่จะบันทึกเสียงผ่านอุปกรณ์ USB นี้ได้"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index 0fc1014..79c040f 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Na-update ng iyong admin"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Na-delete ng iyong admin"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Para patagalin ang baterya, ginagawa ng Pangtipid sa Baterya na:\n·I-on ang Madilim na tema\n·I-off o paghigpitan ang aktibidad sa background, ilang visual effect, at iba pang feature gaya ng “Hey Google”\n\n"<annotation id="url">"Matuto pa"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Para patagalin ang baterya, ginagawa ng Pangtipid sa Baterya na:\n·I-on ang Madilim na tema\n·I-off o paghigpitan ang aktibidad sa background, ilang visual effect, at iba pang feature gaya ng “Hey Google”"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Upang makatulong na mabawasan ang paggamit ng data, pinipigilan ng Data Saver ang ilang app na magpadala o makatanggap ng data sa background. Maaaring mag-access ng data ang isang app na ginagamit mo sa kasalukuyan, ngunit mas bihira na nito magagawa iyon. Halimbawa, maaaring hindi lumabas ang mga larawan hangga\'t hindi mo nata-tap ang mga ito."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"I-on ang Data Saver?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"I-on"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Hindi available ang direktang pagbabahagi"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Listahan ng mga app"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Hindi nabigyan ng pahintulot ang app na ito para mag-record pero nakakapag-capture ito ng audio sa pamamagitan ng USB device na ito."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index f95d836..d6841f0 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Yöneticiniz tarafından güncellendi"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Yöneticiniz tarafından silindi"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"Tamam"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Pil ömrünü uzatmak için Pil Tasarrufu:\n·Koyu temayı açar\n·Arka plan etkinliğini, bazı görsel efektleri ve \"Hey Google\" gibi diğer özellikleri kapatır veya kısıtlar\n\n"<annotation id="url">"Daha fazla bilgi"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Pil ömrünü uzatmak için Pil Tasarrufu:\n·Koyu temayı açar\n·Arka plan etkinliğini, bazı görsel efektleri ve \"Hey Google\" gibi diğer özellikleri kapatır veya kısıtlar"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Veri kullanımını azaltmaya yardımcı olması için Veri Tasarrufu, bazı uygulamaların arka planda veri göndermesini veya almasını engeller. Şu anda kullandığınız bir uygulama veri bağlantısına erişebilir, ancak bunu daha seyrek yapabilir. Bu durumda örneğin, siz resimlere dokunmadan resimler görüntülenmez."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Veri Tasarrufu açılsın mı?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Aç"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Doğrudan paylaşım mevcut değil"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Uygulama listesi"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Bu uygulamaya ses kaydetme izni verilmedi ancak bu USB cihazı üzerinden sesleri yakalayabilir."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index d5cdb32..3412eb2 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -1817,10 +1817,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Оновлено адміністратором"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Видалено адміністратором"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ОК"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Щоб подовжити час роботи акумулятора, режим енергозбереження:\n·вмикає темну тему;\n·припиняє або обмежує фонову активність, вимикає деякі візуальні ефекти й інші енергозатратні функції, зокрема Ok Google.\n\n"<annotation id="url">"Докладніше"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Щоб подовжити час роботи акумулятора, режим енергозбереження:\n·вмикає темну тему;\n·припиняє або обмежує фонову активність, вимикає деякі візуальні ефекти й інші енергозатратні функції, зокрема Ok Google."</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>
@@ -2076,4 +2074,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Прямий обмін даними недоступний"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Список додатків"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Цей додаток не має дозволу на запис, але він може фіксувати звук через цей USB-пристрій."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml
index ab2a83c..003fd54 100644
--- a/core/res/res/values-ur/strings.xml
+++ b/core/res/res/values-ur/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"آپ کے منتظم کے ذریعے اپ ڈیٹ کیا گیا"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"آپ کے منتظم کے ذریعے حذف کیا گیا"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"ٹھیک ہے"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"بیٹری لائف کو بڑھانے کے لیے، بیٹری سیور:\n گہری تھیم کو آن کرتی ہے\n پس منظر کی سرگرمی، کچھ بصری اثرات اور دیگر خصوصیات جیسے کہ \"Ok Google\" کو آف یا محدود کرتی ہے\n\n"<annotation id="url">"مزید جانیں"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"بیٹری لائف کو بڑھانے کے لیے، بیٹری سیور:\n گہری تھیم کو آن کرتی ہے\n پس منظر کی سرگرمی، کچھ بصری اثرات اور دیگر خصوصیات جیسے کہ \"Ok Google\" کو آف یا محدود کرتی ہے"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"بلاواسطہ اشتراک دستیاب نہیں ہے"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"ایپس کی فہرست"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"اس ایپ کو ریکارڈ کرنے کی اجازت عطا نہیں کی گئی ہے مگر اس USB آلہ کے ذریعے آڈیو کیپچر کر سکتی ہے۔"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml
index d618d99..83e99b9 100644
--- a/core/res/res/values-uz/strings.xml
+++ b/core/res/res/values-uz/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Administrator tomonidan yangilangan"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Administrator tomonidan o‘chirilgan"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Batareya quvvatini uzaytirish uchun Quvvat tejash funksiyasi:\n·Tungi mavzuni yoqadi\n·Fondagi harakatlar, vizual effektlar va “Hey Google” kabi boshqa funksiyalarni faolsizlantiradi\n\n"<annotation id="url">"Batafsil"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Batareya quvvatini uzaytirish uchun Quvvat tejash funksiyasi:\n·Tungi mavzuni yoqadi\n·Fondagi harakatlar, vizual effektlar va “Hey Google” kabi boshqa funksiyalarni faolsizlantiradi"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Trafik tejash rejimida ayrim ilovalar uchun orqa fonda internetdan foydalanish imkoniyati cheklanadi. Siz ishlatayotgan ilova zaruratga qarab internet-trafik sarflashi mumkin, biroq cheklangan miqdorda. Masalan, rasmlar ustiga bosmaguningizcha ular yuklanmaydi."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Trafik tejash yoqilsinmi?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Yoqish"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Bevosita ulashuv ishlamaydi"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Ilovalar roʻyxati"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Bu ilovaga yozib olish ruxsati berilmagan, lekin shu USB orqali ovozlarni yozib olishi mumkin."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index 9880890..7b17de7 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Do quản trị viên của bạn cập nhật"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Do quản trị viên của bạn xóa"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"OK"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Để tăng thời lượng pin, Trình tiết kiệm pin:\n·Bật Giao diện tối\n·Tắt hoặc hạn chế hoạt động chạy trong nền, một số hiệu ứng hình ảnh và các tính năng khác như lệnh “Ok Google”\n\n"<annotation id="url">"Tìm hiểu thêm"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Để tăng thời lượng pin, Trình tiết kiệm pin:\n·Bật Giao diện tối\n·Tắt hoặc hạn chế hoạt động chạy trong nền, một số hiệu ứng hình ảnh và các tính năng khác như lệnh “Ok Google”"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Để giúp giảm mức sử dụng dữ liệu, Trình tiết kiệm dữ liệu sẽ chặn một số ứng dụng gửi hoặc nhận dữ liệu trong nền. Ứng dụng mà bạn hiện sử dụng có thể dùng dữ liệu nhưng tần suất sẽ giảm. Ví dụ: hình ảnh sẽ không hiển thị cho đến khi bạn nhấn vào hình ảnh đó."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Bật Trình tiết kiệm dữ liệu?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Bật"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Không thể chia sẻ trực tiếp"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Danh sách ứng dụng"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Ứng dụng này chưa được cấp quyền ghi âm nhưng vẫn có thể ghi âm thông qua thiết bị USB này."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 1a9eec8..e29898f 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -2008,4 +2008,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"无法使用直接分享功能"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"应用列表"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"此应用未获得录音权限，但能通过此 USB 设备录制音频。"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index a69e357..40f0c94 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"已由您的管理員更新"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"已由您的管理員刪除"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"好"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"為延長電池壽命，「省電模式」會：\n開啟深色主題背景\n關閉或限制背景活動、某些視覺效果和其他功能 (例如「Hey Google」)\n\n"<annotation id="url">"瞭解詳情"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"為延長電池壽命，「省電模式」會：\n開啟深色主題背景\n關閉或限制背景活動、某些視覺效果和其他功能 (例如「Hey Google」)"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"無法直接分享"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"應用程式清單"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"此應用程式尚未獲授予錄音權限，但可透過此 USB 裝置記錄音訊。"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index 507f696..2fb155e 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"已由你的管理員更新"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"已由你的管理員刪除"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"確定"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"為了延長電池續航力，節約耗電量功能會執行以下動作：\n開啟深色主題\n關閉或限制背景活動、部分視覺效果和其他功能，例如「Hey Google」\n\n"<annotation id="url">"瞭解詳情"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"為了延長電池續航力，節約耗電量功能會執行以下動作：\n開啟深色主題\n關閉或限制背景活動、部分視覺效果和其他功能，例如「Hey Google」"</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>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"無法使用直接分享功能"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"應用程式清單"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"這個應用程式未取得錄製內容的權限，但可以透過這部 USB 裝置錄製音訊。"</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index c15224a..2ecc835 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -1771,10 +1771,8 @@
<string name="package_updated_device_owner" msgid="1847154566357862089">"Kubuyekezwe umlawuli wakho"</string>
<string name="package_deleted_device_owner" msgid="2307122077550236438">"Kususwe umlawuli wakho"</string>
<string name="confirm_battery_saver" msgid="639106420541753635">"KULUNGILE"</string>
- <!-- no translation found for battery_saver_description_with_learn_more (1002571337088673987) -->
- <skip />
- <!-- no translation found for battery_saver_description (2307555792915978653) -->
- <skip />
+ <string name="battery_saver_description_with_learn_more" msgid="1002571337088673987">"Ukuze unwebise impilo yebhethri, Isilondolozi Sebhethri:\n·Sivula itimu emnyama\n·Sivala noma sikhawulela umsebenzi wangasemuva, eminye imithelela yokubuka, nezinye izici ezifana nokuthi “Hey Google”\n\n"<annotation id="url">"Funda kabanzi"</annotation></string>
+ <string name="battery_saver_description" msgid="2307555792915978653">"Ukuze unwebise impilo yebhethri, Isilondolozi sebhethri:\n·Vula itimu emnyama\n·Vala noma ukhawulele umsebenzi wangasemuva, eminye imithelela yokubuka, nezinye izici ezifana nokuthi “Hey Google”"</string>
<string name="data_saver_description" msgid="6015391409098303235">"Ukusiza ukwehlisa ukusetshenziswa kwedatha, iseva yedatha igwema ezinye izinhlelo zokusebenza ukuthi zithumele noma zamukele idatha ngasemuva. Uhlelo lokusebenza olisebenzisa okwamanje lingafinyelela idatha, kodwa lingenza kanjalo kancane. Lokhu kungachaza, isibonelo, ukuthi izithombe azibonisi uze uzithephe."</string>
<string name="data_saver_enable_title" msgid="4674073932722787417">"Vula iseva yedatha?"</string>
<string name="data_saver_enable_button" msgid="7147735965247211818">"Vula"</string>
@@ -2008,4 +2006,22 @@
<string name="chooser_no_direct_share_targets" msgid="997970693708458895">"Ukwabelana okuqondile akutholakali"</string>
<string name="chooser_all_apps_button_label" msgid="3631524352936289457">"Uhlu lwezinhlelo zokusebenza"</string>
<string name="usb_device_resolve_prompt_warn" msgid="5701272284724577469">"Lolu hlelo lokusebenza alunikeziwe imvume yokurekhoda kodwa lungathwebula umsindo ngale divayisi ye-USB."</string>
+ <!-- no translation found for accessibility_system_action_home_label (6089400419441597916) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_back_label (8986628898117178971) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_recents_label (7607601657790855723) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_notifications_label (1578681904050072545) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_quick_settings_label (3885565587471448947) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_power_dialog_label (2299530700682199873) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_toggle_split_screen_label (2853334443686935668) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_lock_screen_label (2377933717780192594) -->
+ <skip />
+ <!-- no translation found for accessibility_system_action_screenshot_label (1933564892301816480) -->
+ <skip />
</resources>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index bad5d64..642dc92 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -359,7 +359,9 @@
to {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN}. -->
<attr name="windowFullscreen" format="boolean" />
<!-- Flag indicating whether this window should extend into overscan region. Corresponds
- to {@link android.view.WindowManager.LayoutParams#FLAG_LAYOUT_IN_OVERSCAN}. -->
+ to {@link android.view.WindowManager.LayoutParams#FLAG_LAYOUT_IN_OVERSCAN}.
+ @deprecated Overscan areas aren't set by any Android product anymore.
+ -->
<attr name="windowOverscan" format="boolean" />
<!-- Flag indicating whether this is a floating window. -->
<attr name="windowIsFloating" format="boolean" />
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index efa42e5..e6f038a 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -959,6 +959,14 @@
The default is false. -->
<bool name="config_suspendWhenScreenOffDueToProximity">false</bool>
+ <!-- The time in milliseconds of prolonged user inactivity after which device goes to sleep,
+ even if wakelocks are held. -->
+ <integer name="config_attentiveTimeout">-1</integer>
+
+ <!-- How long to show a warning message to user before the device goes to sleep after prolonged
+ user inactivity. -->
+ <integer name="config_attentiveWarningDuration">30000</integer>
+
<!-- Control the behavior when the user long presses the power button.
0 - Nothing
1 - Global actions menu
@@ -2652,6 +2660,9 @@
<!-- The amount to scale fullscreen snapshots for Overview and snapshot starting windows. -->
<item name="config_fullTaskSnapshotScale" format="float" type="dimen">1.0</item>
+ <!-- Feature flag to store TaskSnapshot in 16 bit pixel format to save memory. -->
+ <bool name="config_use16BitTaskSnapshotPixelFormat">false</bool>
+
<!-- Determines whether recent tasks are provided to the user. Default device has recents
property. If this is false, then the following recents config flags are ignored. -->
<bool name="config_hasRecents">true</bool>
diff --git a/core/res/res/values/config_material.xml b/core/res/res/values/config_material.xml
index 840a551..64483f1 100644
--- a/core/res/res/values/config_material.xml
+++ b/core/res/res/values/config_material.xml
@@ -29,9 +29,6 @@
<!-- The alert controller to use for alert dialogs. -->
<integer name="config_alertDialogController">0</integer>
- <!-- True if windowOverscan should be on by default. -->
- <bool name="config_windowOverscanByDefault">false</bool>
-
<!-- True if preference fragment should clip to padding. -->
<bool name="config_preferenceFragmentClipToPadding">true</bool>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 2cab446..42e62d7 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -720,8 +720,8 @@
<!-- Message shown to the user when the apps requests permission to use the location while app is in foreground and background. If ever possible this should stay below 80 characters (assuming the parameters takes 20 characters). Don't abbreviate until the message reaches 120 characters though. [CHAR LIMIT=120] -->
<string name="permgroupbackgroundrequest_location">Allow
<b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g></b> to access this device\u2019s location <b>all the time</b>?</string>
- <!-- Subtitle of the message shown to the user when the apps requests permission to use the location while app is in foreground and background [CHAR LIMIT=150] -->
- <string name="permgroupbackgroundrequestdetail_location">App currently can access location only while you\u2019re using the app</string>
+ <!-- Subtitle of the message shown to the user when the apps requests permission to use the location while app is in foreground and background. Try to keep the link annotation at the end of the string [CHAR LIMIT=150] -->
+ <string name="permgroupbackgroundrequestdetail_location">This app may want to access your location all the time, even when you\u2019re not using the app. Allow in <annotation id="link">settings</annotation>.</string>
<!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permgrouplab_calendar">Calendar</string>
@@ -5238,13 +5238,6 @@
<!-- Application name displayed in notifications [CHAR LIMIT=60] -->
<string name="notification_app_name_settings">Settings</string>
- <!-- Title of the overlay warning the user to interact with the device or it will go into standby. [CHAR LIMIT=25] -->
- <string name="standby_warning_title">Standby</string>
- <!-- Message of the overlay warning the user to interact with the device or it will go into standby. [CHAR LIMIT=NONE] -->
- <string name="standby_warning_message" product="tv">The Android TV device will soon turn off; press a button to keep it on.</string>
- <!-- Message of the overlay warning the user to interact with the device or it will go into standby. [CHAR LIMIT=NONE] -->
- <string name="standby_warning_message" product="default">The device will soon turn off; press to keep it on.</string>
-
<!-- Active Permission - accessibility support -->
<!-- Content description of the camera icon in the notification. [CHAR LIMIT=NONE] -->
<string name="notification_appops_camera_active">Camera</string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 91a8ba4..e56bbf6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -356,6 +356,7 @@
<java-symbol type="bool" name="config_enableNewAutoSelectNetworkUI"/>
<java-symbol type="bool" name="config_disableUsbPermissionDialogs"/>
<java-symbol type="dimen" name="config_fullTaskSnapshotScale" />
+ <java-symbol type="bool" name="config_use16BitTaskSnapshotPixelFormat" />
<java-symbol type="bool" name="config_lowRamTaskSnapshotsAndRecents" />
<java-symbol type="bool" name="config_hasRecents" />
<java-symbol type="string" name="config_recentsComponentName" />
@@ -2116,6 +2117,8 @@
<java-symbol type="integer" name="config_minimumScreenOffTimeout" />
<java-symbol type="integer" name="config_maximumScreenDimDuration" />
<java-symbol type="fraction" name="config_maximumScreenDimRatio" />
+ <java-symbol type="integer" name="config_attentiveTimeout" />
+ <java-symbol type="integer" name="config_attentiveWarningDuration" />
<java-symbol type="string" name="config_customAdbPublicKeyConfirmationComponent" />
<java-symbol type="string" name="config_customAdbPublicKeyConfirmationSecondaryUserComponent" />
<java-symbol type="string" name="config_customVpnConfirmDialogComponent" />
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 78d218f..f3905e9 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -162,7 +162,6 @@
<item name="windowFrame">@null</item>
<item name="windowNoTitle">@bool/config_windowNoTitleDefault</item>
<item name="windowFullscreen">false</item>
- <item name="windowOverscan">@bool/config_windowOverscanByDefault</item>
<item name="windowIsFloating">false</item>
<item name="windowContentOverlay">@null</item>
<item name="windowShowWallpaper">false</item>
@@ -536,7 +535,6 @@
<item name="windowFrame">@null</item>
<item name="windowNoTitle">@bool/config_windowNoTitleDefault</item>
<item name="windowFullscreen">false</item>
- <item name="windowOverscan">@bool/config_windowOverscanByDefault</item>
<item name="windowIsFloating">false</item>
<item name="windowContentOverlay">@null</item>
<item name="windowShowWallpaper">false</item>
@@ -963,10 +961,11 @@
<!-- Variant of the material (dark) theme that has no title bar and fills
the entire screen and extends into the display overscan region. This theme
sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
- to true. -->
+ to true.
+ @deprecated Overscan areas aren't set by any Android product anymore.
+ -->
<style name="Theme.Material.NoActionBar.Overscan">
<item name="windowFullscreen">true</item>
- <item name="windowOverscan">true</item>
<item name="windowContentOverlay">@null</item>
</style>
@@ -996,10 +995,11 @@
<!-- Variant of the material (light) theme that has no title bar and fills
the entire screen and extends into the display overscan region. This theme
sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
- to true. -->
+ to true.
+ @deprecated Overscan areas aren't set by any Android product anymore.
+ -->
<style name="Theme.Material.Light.NoActionBar.Overscan">
<item name="windowFullscreen">true</item>
- <item name="windowOverscan">true</item>
<item name="windowContentOverlay">@null</item>
</style>
diff --git a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java
index 22b2314..1bc46a7 100644
--- a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java
+++ b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java
@@ -19,6 +19,7 @@
import android.content.pm.UserInfo;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.os.UserManager;
import androidx.test.filters.LargeTest;
@@ -40,6 +41,6 @@
@Override
protected UserInfo createUser() throws RemoteException {
return mUm.createProfileForUser("Managed user",
- UserInfo.FLAG_MANAGED_PROFILE, UserHandle.myUserId());
+ UserManager.USER_TYPE_PROFILE_MANAGED, /* flags */ 0, UserHandle.myUserId());
}
}
diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
index c2fa8b2b..17fe61d 100644
--- a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
+++ b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
@@ -32,7 +32,6 @@
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
import com.google.common.truth.Truth;
@@ -43,6 +42,7 @@
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.Collections;
@@ -54,10 +54,19 @@
* Tests are skipped if such a textclassifier does not exist.
*/
@SmallTest
-@RunWith(AndroidJUnit4.class)
+@RunWith(Parameterized.class)
public class TextClassifierTest {
+ private static final String LOCAL = "local";
+ private static final String SESSION = "session";
- // TODO: Implement TextClassifierService testing.
+ // TODO: Add SYSTEM, which tests TextClassifier.SYSTEM.
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object> textClassifierTypes() {
+ return Arrays.asList(LOCAL, SESSION);
+ }
+
+ @Parameterized.Parameter
+ public String mTextClassifierType;
private static final TextClassificationConstants TC_CONSTANTS =
new TextClassificationConstants(() -> "");
@@ -72,7 +81,17 @@
public void setup() {
mContext = InstrumentationRegistry.getTargetContext();
mTcm = mContext.getSystemService(TextClassificationManager.class);
- mClassifier = mTcm.getTextClassifier(TextClassifier.LOCAL);
+
+ if (mTextClassifierType.equals(LOCAL)) {
+ mClassifier = mTcm.getTextClassifier(TextClassifier.LOCAL);
+ } else {
+ mClassifier = mTcm.createTextClassificationSession(
+ new TextClassificationContext.Builder(
+ "android",
+ TextClassifier.WIDGET_TYPE_NOTIFICATION)
+ .build(),
+ mTcm.getTextClassifier(TextClassifier.LOCAL));
+ }
}
@Test
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 77b0dba..d2ce4e0 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -95,6 +95,9 @@
<privapp-permissions package="com.android.mtp">
<permission name="android.permission.ACCESS_MTP"/>
<permission name="android.permission.MANAGE_USB"/>
+ <permission name="android.permission.MANAGE_USERS"/>
+ <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+ <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
</privapp-permissions>
<privapp-permissions package="com.android.musicfx">
@@ -207,6 +210,7 @@
<permission name="android.permission.USE_RESERVED_DISK"/>
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
<permission name="android.permission.WATCH_APPOPS"/>
+ <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
<permission name="android.permission.UPDATE_DEVICE_STATS"/>
</privapp-permissions>
diff --git a/data/sounds/AudioPackage11.mk b/data/sounds/AudioPackage11.mk
index 99dfd0a..2392b33 100644
--- a/data/sounds/AudioPackage11.mk
+++ b/data/sounds/AudioPackage11.mk
@@ -32,7 +32,7 @@
$(LOCAL_PATH)/effects/ogg/Lock_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \
$(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \
- $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/ChargingStarted.ogg \.
+ $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/ChargingStarted.ogg \
$(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/InCallNotification.ogg \
$(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/WirelessChargingStarted.ogg \
$(LOCAL_PATH)/notifications/ogg/Adara.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Adara.ogg \
diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java
index 3658f89..c2e3c64 100644
--- a/graphics/java/android/graphics/drawable/Icon.java
+++ b/graphics/java/android/graphics/drawable/Icon.java
@@ -92,11 +92,17 @@
* @see #getType
*/
public static final int TYPE_ADAPTIVE_BITMAP = 5;
+ /**
+ * An icon that was created using {@link Icon#createWithAdaptiveBitmapContentUri}.
+ * @see #getType
+ */
+ public static final int TYPE_URI_ADAPTIVE_BITMAP = 6;
/**
* @hide
*/
- @IntDef({TYPE_BITMAP, TYPE_RESOURCE, TYPE_DATA, TYPE_URI, TYPE_ADAPTIVE_BITMAP})
+ @IntDef({TYPE_BITMAP, TYPE_RESOURCE, TYPE_DATA, TYPE_URI, TYPE_ADAPTIVE_BITMAP,
+ TYPE_URI_ADAPTIVE_BITMAP})
public @interface IconType {
}
@@ -113,12 +119,14 @@
// based on the value of mType.
// TYPE_BITMAP: Bitmap
+ // TYPE_ADAPTIVE_BITMAP: Bitmap
// TYPE_RESOURCE: Resources
// TYPE_DATA: DataBytes
private Object mObj1;
// TYPE_RESOURCE: package name
// TYPE_URI: uri string
+ // TYPE_URI_ADAPTIVE_BITMAP: uri string
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
private String mString1;
@@ -141,7 +149,8 @@
}
/**
- * @return The {@link android.graphics.Bitmap} held by this {@link #TYPE_BITMAP} Icon.
+ * @return The {@link android.graphics.Bitmap} held by this {@link #TYPE_BITMAP} or
+ * {@link #TYPE_ADAPTIVE_BITMAP} Icon.
* @hide
*/
@UnsupportedAppUsage
@@ -243,11 +252,12 @@
}
/**
- * @return The URI (as a String) for this {@link #TYPE_URI} Icon.
+ * @return The URI (as a String) for this {@link #TYPE_URI} or {@link #TYPE_URI_ADAPTIVE_BITMAP}
+ * Icon.
* @hide
*/
public String getUriString() {
- if (mType != TYPE_URI) {
+ if (mType != TYPE_URI && mType != TYPE_URI_ADAPTIVE_BITMAP) {
throw new IllegalStateException("called getUriString() on " + this);
}
return mString1;
@@ -256,7 +266,7 @@
/**
* Gets the uri used to create this icon.
* <p>
- * Only valid for icons of type {@link #TYPE_URI}.
+ * Only valid for icons of type {@link #TYPE_URI} and {@link #TYPE_URI_ADAPTIVE_BITMAP}.
* Note: This uri may not be available in the future, and it is
* up to the caller to ensure safety if this uri is re-used and/or persisted.
*/
@@ -272,6 +282,7 @@
case TYPE_DATA: return "DATA";
case TYPE_RESOURCE: return "RESOURCE";
case TYPE_URI: return "URI";
+ case TYPE_URI_ADAPTIVE_BITMAP: return "URI_MASKABLE";
default: return "UNKNOWN";
}
}
@@ -380,28 +391,39 @@
BitmapFactory.decodeByteArray(getDataBytes(), getDataOffset(), getDataLength())
);
case TYPE_URI:
- final Uri uri = getUri();
- final String scheme = uri.getScheme();
- InputStream is = null;
- if (ContentResolver.SCHEME_CONTENT.equals(scheme)
- || ContentResolver.SCHEME_FILE.equals(scheme)) {
- try {
- is = context.getContentResolver().openInputStream(uri);
- } catch (Exception e) {
- Log.w(TAG, "Unable to load image from URI: " + uri, e);
- }
- } else {
- try {
- is = new FileInputStream(new File(mString1));
- } catch (FileNotFoundException e) {
- Log.w(TAG, "Unable to load image from path: " + uri, e);
- }
- }
+ InputStream is = getUriInputStream(context);
if (is != null) {
return new BitmapDrawable(context.getResources(),
BitmapFactory.decodeStream(is));
}
break;
+ case TYPE_URI_ADAPTIVE_BITMAP:
+ is = getUriInputStream(context);
+ if (is != null) {
+ return new AdaptiveIconDrawable(null, new BitmapDrawable(context.getResources(),
+ BitmapFactory.decodeStream(is)));
+ }
+ break;
+ }
+ return null;
+ }
+
+ private InputStream getUriInputStream(Context context) {
+ final Uri uri = getUri();
+ final String scheme = uri.getScheme();
+ if (ContentResolver.SCHEME_CONTENT.equals(scheme)
+ || ContentResolver.SCHEME_FILE.equals(scheme)) {
+ try {
+ return context.getContentResolver().openInputStream(uri);
+ } catch (Exception e) {
+ Log.w(TAG, "Unable to load image from URI: " + uri, e);
+ }
+ } else {
+ try {
+ return new FileInputStream(new File(mString1));
+ } catch (FileNotFoundException e) {
+ Log.w(TAG, "Unable to load image from path: " + uri, e);
+ }
}
return null;
}
@@ -475,6 +497,7 @@
dataStream.writeInt(getResId());
break;
case TYPE_URI:
+ case TYPE_URI_ADAPTIVE_BITMAP:
dataStream.writeUTF(getUriString());
break;
}
@@ -513,6 +536,9 @@
case TYPE_URI:
final String uriOrPath = inputStream.readUTF();
return createWithContentUri(uriOrPath);
+ case TYPE_URI_ADAPTIVE_BITMAP:
+ final String uri = inputStream.readUTF();
+ return createWithAdaptiveBitmapContentUri(uri);
}
}
return null;
@@ -545,6 +571,7 @@
return getResId() == otherIcon.getResId()
&& Objects.equals(getResPackage(), otherIcon.getResPackage());
case TYPE_URI:
+ case TYPE_URI_ADAPTIVE_BITMAP:
return Objects.equals(getUriString(), otherIcon.getUriString());
}
return false;
@@ -665,12 +692,40 @@
if (uri == null) {
throw new IllegalArgumentException("Uri must not be null.");
}
- final Icon rep = new Icon(TYPE_URI);
- rep.mString1 = uri.toString();
+ return createWithContentUri(uri.toString());
+ }
+
+ /**
+ * Create an Icon pointing to an image file specified by URI. Image file should follow the icon
+ * design guideline defined by {@link AdaptiveIconDrawable}.
+ *
+ * @param uri A uri referring to local content:// or file:// image data.
+ */
+ @NonNull
+ public static Icon createWithAdaptiveBitmapContentUri(@NonNull String uri) {
+ if (uri == null) {
+ throw new IllegalArgumentException("Uri must not be null.");
+ }
+ final Icon rep = new Icon(TYPE_URI_ADAPTIVE_BITMAP);
+ rep.mString1 = uri;
return rep;
}
/**
+ * Create an Icon pointing to an image file specified by URI. Image file should follow the icon
+ * design guideline defined by {@link AdaptiveIconDrawable}.
+ *
+ * @param uri A uri referring to local content:// or file:// image data.
+ */
+ @NonNull
+ public static Icon createWithAdaptiveBitmapContentUri(@NonNull Uri uri) {
+ if (uri == null) {
+ throw new IllegalArgumentException("Uri must not be null.");
+ }
+ return createWithAdaptiveBitmapContentUri(uri.toString());
+ }
+
+ /**
* Store a color to use whenever this Icon is drawn.
*
* @param tint a color, as in {@link Drawable#setTint(int)}
@@ -758,6 +813,7 @@
}
break;
case TYPE_URI:
+ case TYPE_URI_ADAPTIVE_BITMAP:
sb.append(" uri=").append(getUriString());
break;
}
@@ -809,6 +865,7 @@
mObj1 = a;
break;
case TYPE_URI:
+ case TYPE_URI_ADAPTIVE_BITMAP:
final String uri = in.readString();
mString1 = uri;
break;
@@ -840,6 +897,7 @@
dest.writeBlob(getDataBytes(), getDataOffset(), getDataLength());
break;
case TYPE_URI:
+ case TYPE_URI_ADAPTIVE_BITMAP:
dest.writeString(getUriString());
break;
}
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index 538319c..a7e17d1 100644
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -55,8 +55,8 @@
import java.util.Collection;
import java.util.List;
import java.util.Locale;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
import javax.security.auth.x500.X500Principal;
@@ -811,27 +811,22 @@
throw new NullPointerException("context == null");
}
ensureNotOnMainThread(context);
- final BlockingQueue<IKeyChainService> q = new LinkedBlockingQueue<IKeyChainService>(1);
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+ final AtomicReference<IKeyChainService> keyChainService = new AtomicReference<>();
ServiceConnection keyChainServiceConnection = new ServiceConnection() {
volatile boolean mConnectedAtLeastOnce = false;
@Override public void onServiceConnected(ComponentName name, IBinder service) {
if (!mConnectedAtLeastOnce) {
mConnectedAtLeastOnce = true;
- try {
- q.put(IKeyChainService.Stub.asInterface(Binder.allowBlocking(service)));
- } catch (InterruptedException e) {
- // will never happen, since the queue starts with one available slot
- }
+ keyChainService.set(
+ IKeyChainService.Stub.asInterface(Binder.allowBlocking(service)));
+ countDownLatch.countDown();
}
}
@Override public void onBindingDied(ComponentName name) {
if (!mConnectedAtLeastOnce) {
mConnectedAtLeastOnce = true;
- try {
- q.put(null);
- } catch (InterruptedException e) {
- // will never happen, since the queue starts with one available slot
- }
+ countDownLatch.countDown();
}
}
@Override public void onServiceDisconnected(ComponentName name) {}
@@ -843,7 +838,8 @@
intent, keyChainServiceConnection, Context.BIND_AUTO_CREATE, user)) {
throw new AssertionError("could not bind to KeyChainService");
}
- IKeyChainService service = q.take();
+ countDownLatch.await();
+ IKeyChainService service = keyChainService.get();
if (service != null) {
return new KeyChainConnection(context, keyChainServiceConnection, service);
} else {
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index ee8cc40..3c47835 100644
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -1067,6 +1067,17 @@
return onUserPasswordChanged(UserHandle.getUserId(Process.myUid()), newPassword);
}
+ /**
+ * Notify keystore about the latest user locked state. This is to support keyguard-bound key.
+ */
+ public void onUserLockedStateChanged(int userHandle, boolean locked) {
+ try {
+ mBinder.onKeyguardVisibilityChanged(locked, userHandle);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed to update user locked state " + userHandle, e);
+ }
+ }
+
private class KeyAttestationCallbackResult {
private KeystoreResponse keystoreResponse;
private KeymasterCertificateChain certificateChain;
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
index 234615d..2cdd000 100644
--- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
@@ -17,6 +17,7 @@
package android.security.keystore;
import android.annotation.NonNull;
+import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.security.KeyStore;
import android.security.keymaster.ExportResult;
@@ -52,8 +53,9 @@
*
* @hide
*/
+@SystemApi
public class AndroidKeyStoreProvider extends Provider {
- public static final String PROVIDER_NAME = "AndroidKeyStore";
+ private static final String PROVIDER_NAME = "AndroidKeyStore";
// IMPLEMENTATION NOTE: Class names are hard-coded in this provider to avoid loading these
// classes when this provider is instantiated and installed early on during each app's
@@ -68,6 +70,7 @@
private static final String DESEDE_SYSTEM_PROPERTY =
"ro.hardware.keystore_desede";
+ /** @hide **/
public AndroidKeyStoreProvider() {
super(PROVIDER_NAME, 1.0, "Android KeyStore security provider");
@@ -111,6 +114,7 @@
/**
* Installs a new instance of this provider (and the
* {@link AndroidKeyStoreBCWorkaroundProvider}).
+ * @hide
*/
public static void install() {
Provider[] providers = Security.getProviders();
@@ -156,6 +160,7 @@
* @throws IllegalArgumentException if the provided primitive is not supported or is not backed
* by AndroidKeyStore provider.
* @throws IllegalStateException if the provided primitive is not initialized.
+ * @hide
*/
@UnsupportedAppUsage
public static long getKeyStoreOperationHandle(Object cryptoPrimitive) {
@@ -183,6 +188,7 @@
return ((KeyStoreCryptoOperation) spi).getOperationHandle();
}
+ /** @hide **/
@NonNull
public static AndroidKeyStorePublicKey getAndroidKeyStorePublicKey(
@NonNull String alias,
@@ -279,6 +285,7 @@
privateKeyAlias, uid, jcaKeyAlgorithm, x509EncodedPublicKey);
}
+ /** @hide **/
@NonNull
public static AndroidKeyStorePublicKey loadAndroidKeyStorePublicKeyFromKeystore(
@NonNull KeyStore keyStore, @NonNull String privateKeyAlias, int uid)
@@ -300,6 +307,7 @@
return new KeyPair(publicKey, privateKey);
}
+ /** @hide **/
@NonNull
public static KeyPair loadAndroidKeyStoreKeyPairFromKeystore(
@NonNull KeyStore keyStore, @NonNull String privateKeyAlias, int uid)
@@ -318,6 +326,7 @@
return (AndroidKeyStorePrivateKey) keyPair.getPrivate();
}
+ /** @hide **/
@NonNull
public static AndroidKeyStorePrivateKey loadAndroidKeyStorePrivateKeyFromKeystore(
@NonNull KeyStore keyStore, @NonNull String privateKeyAlias, int uid)
@@ -357,6 +366,7 @@
return new AndroidKeyStoreSecretKey(secretKeyAlias, uid, keyAlgorithmString);
}
+ /** @hide **/
@NonNull
public static AndroidKeyStoreKey loadAndroidKeyStoreKeyFromKeystore(
@NonNull KeyStore keyStore, @NonNull String userKeyAlias, int uid)
@@ -390,7 +400,9 @@
*
* <p>Note: the returned {@code KeyStore} is already initialized/loaded. Thus, there is
* no need to invoke {@code load} on it.
+ * @hide
*/
+ @SystemApi
@NonNull
public static java.security.KeyStore getKeyStoreForUid(int uid)
throws KeyStoreException, NoSuchProviderException {
diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java
index bd6ce7e..6df3b8c 100644
--- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java
+++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java
@@ -19,6 +19,7 @@
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.app.KeyguardManager;
@@ -808,10 +809,14 @@
/**
* Sets the UID which will own the key.
*
+ * Such cross-UID access is permitted to a few system UIDs and only to a few other UIDs
+ * (e.g., Wi-Fi, VPN) all of which are system.
+ *
* @param uid UID or {@code -1} for the UID of the current process.
*
* @hide
*/
+ @SystemApi
@NonNull
public Builder setUid(int uid) {
mUid = uid;
@@ -1256,6 +1261,7 @@
*
* Sets whether to include a temporary unique ID field in the attestation certificate.
*/
+ @UnsupportedAppUsage
@TestApi
@NonNull
public Builder setUniqueIdIncluded(boolean uniqueIdIncluded) {
diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp
index 16dbbf6..18934fd 100644
--- a/libs/androidfw/ApkAssets.cpp
+++ b/libs/androidfw/ApkAssets.cpp
@@ -43,20 +43,22 @@
ApkAssets::ApkAssets(ZipArchiveHandle unmanaged_handle,
const std::string& path,
time_t last_mod_time,
- bool for_loader)
+ package_property_t property_flags)
: zip_handle_(unmanaged_handle, ::CloseArchive), path_(path), last_mod_time_(last_mod_time),
- for_loader_(for_loader) {
+ property_flags_(property_flags) {
}
std::unique_ptr<const ApkAssets> ApkAssets::Load(const std::string& path, bool system,
bool for_loader) {
- return LoadImpl({} /*fd*/, path, nullptr, nullptr, system, false /*load_as_shared_library*/,
- for_loader);
+ package_property_t flags = (system ? PROPERTY_SYSTEM : 0U) |
+ (for_loader ? PROPERTY_LOADER : 0U);
+ return LoadImpl({} /*fd*/, path, nullptr, nullptr, flags);
}
std::unique_ptr<const ApkAssets> ApkAssets::LoadAsSharedLibrary(const std::string& path,
bool system) {
- return LoadImpl({} /*fd*/, path, nullptr, nullptr, system, true /*load_as_shared_library*/);
+ package_property_t flags = PROPERTY_DYNAMIC | (system ? PROPERTY_SYSTEM : 0U);
+ return LoadImpl({} /*fd*/, path, nullptr, nullptr, flags);
}
std::unique_ptr<const ApkAssets> ApkAssets::LoadOverlay(const std::string& idmap_path,
@@ -74,27 +76,33 @@
LOG(ERROR) << "failed to load IDMAP " << idmap_path;
return {};
}
- return LoadImpl({} /*fd*/, loaded_idmap->OverlayApkPath(), std::move(idmap_asset),
- std::move(loaded_idmap), system, true /*load_as_shared_library*/);
+
+ return LoadImpl({} /*fd*/, loaded_idmap->OverlayApkPath(),
+ std::move(idmap_asset),
+ std::move(loaded_idmap),
+ PROPERTY_OVERLAY | (system ? PROPERTY_SYSTEM : 0U));
}
std::unique_ptr<const ApkAssets> ApkAssets::LoadFromFd(unique_fd fd,
const std::string& friendly_name,
bool system, bool force_shared_lib,
bool for_loader) {
+ package_property_t flags = (system ? PROPERTY_SYSTEM : 0U) |
+ (force_shared_lib ? PROPERTY_DYNAMIC : 0U) |
+ (for_loader ? PROPERTY_LOADER : 0U);
return LoadImpl(std::move(fd), friendly_name, nullptr /*idmap_asset*/, nullptr /*loaded_idmap*/,
- system, force_shared_lib, for_loader);
+ flags);
}
std::unique_ptr<const ApkAssets> ApkAssets::LoadArsc(const std::string& path,
bool for_loader) {
- return LoadArscImpl({} /*fd*/, path, for_loader);
+ return LoadArscImpl({} /*fd*/, path, for_loader ? PROPERTY_LOADER : 0U);
}
std::unique_ptr<const ApkAssets> ApkAssets::LoadArsc(unique_fd fd,
const std::string& friendly_name,
bool for_loader) {
- return LoadArscImpl(std::move(fd), friendly_name, for_loader);
+ return LoadArscImpl(std::move(fd), friendly_name, for_loader ? PROPERTY_LOADER : 0U);
}
std::unique_ptr<Asset> ApkAssets::CreateAssetFromFile(const std::string& path) {
@@ -120,8 +128,7 @@
std::unique_ptr<const ApkAssets> ApkAssets::LoadImpl(
unique_fd fd, const std::string& path, std::unique_ptr<Asset> idmap_asset,
- std::unique_ptr<const LoadedIdmap> loaded_idmap, bool system, bool load_as_shared_library,
- bool for_loader) {
+ std::unique_ptr<const LoadedIdmap> loaded_idmap, package_property_t property_flags) {
::ZipArchiveHandle unmanaged_handle;
int32_t result;
if (fd >= 0) {
@@ -141,7 +148,7 @@
// Wrap the handle in a unique_ptr so it gets automatically closed.
std::unique_ptr<ApkAssets>
- loaded_apk(new ApkAssets(unmanaged_handle, path, last_mod_time, for_loader));
+ loaded_apk(new ApkAssets(unmanaged_handle, path, last_mod_time, property_flags));
// Find the resource table.
::ZipEntry entry;
@@ -170,9 +177,8 @@
const StringPiece data(
reinterpret_cast<const char*>(loaded_apk->resources_asset_->getBuffer(true /*wordAligned*/)),
loaded_apk->resources_asset_->getLength());
- loaded_apk->loaded_arsc_ =
- LoadedArsc::Load(data, loaded_apk->loaded_idmap_.get(), system, load_as_shared_library,
- for_loader);
+ loaded_apk->loaded_arsc_ = LoadedArsc::Load(data, loaded_apk->loaded_idmap_.get(),
+ property_flags);
if (loaded_apk->loaded_arsc_ == nullptr) {
LOG(ERROR) << "Failed to load '" << kResourcesArsc << "' in APK '" << path << "'.";
return {};
@@ -184,7 +190,7 @@
std::unique_ptr<const ApkAssets> ApkAssets::LoadArscImpl(unique_fd fd,
const std::string& path,
- bool for_loader) {
+ package_property_t property_flags) {
std::unique_ptr<Asset> resources_asset;
if (fd >= 0) {
@@ -201,13 +207,14 @@
time_t last_mod_time = getFileModDate(path.c_str());
- std::unique_ptr<ApkAssets> loaded_apk(new ApkAssets(nullptr, path, last_mod_time, for_loader));
+ std::unique_ptr<ApkAssets> loaded_apk(
+ new ApkAssets(nullptr, path, last_mod_time, property_flags));
loaded_apk->resources_asset_ = std::move(resources_asset);
const StringPiece data(
reinterpret_cast<const char*>(loaded_apk->resources_asset_->getBuffer(true /*wordAligned*/)),
loaded_apk->resources_asset_->getLength());
- loaded_apk->loaded_arsc_ = LoadedArsc::Load(data, nullptr, false, false, for_loader);
+ loaded_apk->loaded_arsc_ = LoadedArsc::Load(data, nullptr, property_flags);
if (loaded_apk->loaded_arsc_ == nullptr) {
LOG(ERROR) << "Failed to load '" << kResourcesArsc << path;
return {};
@@ -320,8 +327,8 @@
}
bool ApkAssets::IsUpToDate() const {
- // Loaders are invalidated by the app, not the system, so assume up to date
- if (for_loader_) {
+ if (IsLoader()) {
+ // Loaders are invalidated by the app, not the system, so assume up to date.
return true;
}
diff --git a/libs/androidfw/Idmap.cpp b/libs/androidfw/Idmap.cpp
index 2b69c92..773353d 100644
--- a/libs/androidfw/Idmap.cpp
+++ b/libs/androidfw/Idmap.cpp
@@ -44,8 +44,8 @@
}
OverlayStringPool::OverlayStringPool(const LoadedIdmap* loaded_idmap)
- : data_header_(loaded_idmap->data_header_),
- idmap_string_pool_(loaded_idmap->string_pool_.get()) { };
+ : data_header_(loaded_idmap->data_header_),
+ idmap_string_pool_(loaded_idmap->string_pool_.get()) { };
OverlayStringPool::~OverlayStringPool() {
uninit();
@@ -188,11 +188,12 @@
const Idmap_data_header* data_header,
const Idmap_target_entry* target_entries,
const Idmap_overlay_entry* overlay_entries,
- ResStringPool* string_pool) : header_(header),
- data_header_(data_header),
- target_entries_(target_entries),
- overlay_entries_(overlay_entries),
- string_pool_(string_pool) {
+ ResStringPool* string_pool)
+ : header_(header),
+ data_header_(data_header),
+ target_entries_(target_entries),
+ overlay_entries_(overlay_entries),
+ string_pool_(string_pool) {
size_t length = strnlen(reinterpret_cast<const char*>(header_->overlay_path),
arraysize(header_->overlay_path));
@@ -264,7 +265,7 @@
}
}
- // Can't use make_unique because LoadedImpl constructor is private.
+ // Can't use make_unique because LoadedIdmap constructor is private.
std::unique_ptr<LoadedIdmap> loaded_idmap = std::unique_ptr<LoadedIdmap>(
new LoadedIdmap(header, data_header, target_entries, overlay_entries,
idmap_string_pool.release()));
diff --git a/libs/androidfw/LoadedArsc.cpp b/libs/androidfw/LoadedArsc.cpp
index c896241..e35c024 100644
--- a/libs/androidfw/LoadedArsc.cpp
+++ b/libs/androidfw/LoadedArsc.cpp
@@ -397,9 +397,7 @@
}
std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk,
- bool system,
- bool load_as_shared_library,
- bool for_loader) {
+ package_property_t property_flags) {
ATRACE_NAME("LoadedPackage::Load");
std::unique_ptr<LoadedPackage> loaded_package(new LoadedPackage());
@@ -413,17 +411,24 @@
return {};
}
- loaded_package->system_ = system;
+ if ((property_flags & PROPERTY_SYSTEM) != 0) {
+ loaded_package->property_flags_ |= PROPERTY_SYSTEM;
+ }
+
+ if ((property_flags & PROPERTY_LOADER) != 0) {
+ loaded_package->property_flags_ |= PROPERTY_LOADER;
+ }
+
+ if ((property_flags & PROPERTY_OVERLAY) != 0) {
+ // Overlay resources must have an exclusive resource id space for referencing internal
+ // resources.
+ loaded_package->property_flags_ |= PROPERTY_OVERLAY | PROPERTY_DYNAMIC;
+ }
loaded_package->package_id_ = dtohl(header->id);
if (loaded_package->package_id_ == 0 ||
- (loaded_package->package_id_ == kAppPackageId && load_as_shared_library)) {
- // Package ID of 0 means this is a shared library.
- loaded_package->dynamic_ = true;
- }
-
- if (for_loader) {
- loaded_package->custom_loader_ = true;
+ (loaded_package->package_id_ == kAppPackageId && (property_flags & PROPERTY_DYNAMIC) != 0)) {
+ loaded_package->property_flags_ |= PROPERTY_DYNAMIC;
}
if (header->header.headerSize >= sizeof(ResTable_package)) {
@@ -677,7 +682,7 @@
}
bool LoadedArsc::LoadTable(const Chunk& chunk, const LoadedIdmap* loaded_idmap,
- bool load_as_shared_library, bool for_loader) {
+ package_property_t property_flags) {
const ResTable_header* header = chunk.header<ResTable_header>();
if (header == nullptr) {
LOG(ERROR) << "RES_TABLE_TYPE too small.";
@@ -720,7 +725,7 @@
packages_seen++;
std::unique_ptr<const LoadedPackage> loaded_package =
- LoadedPackage::Load(child_chunk, system_, load_as_shared_library, for_loader);
+ LoadedPackage::Load(child_chunk, property_flags);
if (!loaded_package) {
return false;
}
@@ -744,24 +749,18 @@
std::unique_ptr<const LoadedArsc> LoadedArsc::Load(const StringPiece& data,
const LoadedIdmap* loaded_idmap,
- bool system,
- bool load_as_shared_library,
- bool for_loader) {
+ package_property_t property_flags) {
ATRACE_NAME("LoadedArsc::Load");
// Not using make_unique because the constructor is private.
std::unique_ptr<LoadedArsc> loaded_arsc(new LoadedArsc());
- loaded_arsc->system_ = system;
ChunkIterator iter(data.data(), data.size());
while (iter.HasNext()) {
const Chunk chunk = iter.Next();
switch (chunk.type()) {
case RES_TABLE_TYPE:
- if (!loaded_arsc->LoadTable(chunk,
- loaded_idmap,
- load_as_shared_library,
- for_loader)) {
+ if (!loaded_arsc->LoadTable(chunk, loaded_idmap, property_flags)) {
return {};
}
break;
diff --git a/libs/androidfw/include/androidfw/ApkAssets.h b/libs/androidfw/include/androidfw/ApkAssets.h
index 2047287..af802b0 100644
--- a/libs/androidfw/include/androidfw/ApkAssets.h
+++ b/libs/androidfw/include/androidfw/ApkAssets.h
@@ -76,10 +76,10 @@
// Takes ownership of the file descriptor.
static std::unique_ptr<const ApkAssets> LoadArsc(base::unique_fd fd,
const std::string& friendly_name,
- bool resource_loader = false);
+ bool for_loader = false);
// Creates a totally empty ApkAssets with no resources table and no file entries.
- static std::unique_ptr<const ApkAssets> LoadEmpty(bool resource_loader = false);
+ static std::unique_ptr<const ApkAssets> LoadEmpty(bool for_loader = false);
std::unique_ptr<Asset> Open(const std::string& path,
Asset::AccessMode mode = Asset::AccessMode::ACCESS_RANDOM) const;
@@ -100,12 +100,12 @@
return loaded_idmap_.get();
}
- inline bool IsOverlay() const {
- return idmap_asset_.get() != nullptr;
+ inline bool IsLoader() const {
+ return (property_flags_ & PROPERTY_LOADER) != 0;
}
- inline bool IsLoader() const {
- return for_loader_;
+ inline bool IsOverlay() const {
+ return (property_flags_ & PROPERTY_OVERLAY) != 0;
}
bool IsUpToDate() const;
@@ -119,24 +119,23 @@
static std::unique_ptr<const ApkAssets> LoadImpl(base::unique_fd fd, const std::string& path,
std::unique_ptr<Asset> idmap_asset,
std::unique_ptr<const LoadedIdmap> loaded_idmap,
- bool system, bool load_as_shared_library,
- bool resource_loader = false);
+ package_property_t property_flags);
static std::unique_ptr<const ApkAssets> LoadArscImpl(base::unique_fd fd,
const std::string& path,
- bool resource_loader = false);
+ package_property_t property_flags);
ApkAssets(ZipArchiveHandle unmanaged_handle,
const std::string& path,
time_t last_mod_time,
- bool for_loader = false);
+ package_property_t property_flags);
using ZipArchivePtr = std::unique_ptr<ZipArchive, void (*)(ZipArchiveHandle)>;
ZipArchivePtr zip_handle_;
const std::string path_;
time_t last_mod_time_;
- bool for_loader_;
+ package_property_t property_flags_ = 0U;
std::unique_ptr<Asset> resources_asset_;
std::unique_ptr<Asset> idmap_asset_;
std::unique_ptr<const LoadedArsc> loaded_arsc_;
diff --git a/libs/androidfw/include/androidfw/AssetManager2.h b/libs/androidfw/include/androidfw/AssetManager2.h
index 20e4023..00cbbca 100644
--- a/libs/androidfw/include/androidfw/AssetManager2.h
+++ b/libs/androidfw/include/androidfw/AssetManager2.h
@@ -263,10 +263,13 @@
// Creates a new Theme from this AssetManager.
std::unique_ptr<Theme> NewTheme();
- void ForEachPackage(const std::function<bool(const std::string&, uint8_t)> func) const {
+ void ForEachPackage(const std::function<bool(const std::string&, uint8_t)> func,
+ package_property_t excluded_property_flags = 0U) const {
for (const PackageGroup& package_group : package_groups_) {
- if (!func(package_group.packages_.front().loaded_package_->GetPackageName(),
- package_group.dynamic_ref_table->mAssignedPackageId)) {
+ const auto loaded_package = package_group.packages_.front().loaded_package_;
+ if ((loaded_package->GetPropertyFlags() & excluded_property_flags) == 0U
+ && !func(loaded_package->GetPackageName(),
+ package_group.dynamic_ref_table->mAssignedPackageId)) {
return;
}
}
diff --git a/libs/androidfw/include/androidfw/LoadedArsc.h b/libs/androidfw/include/androidfw/LoadedArsc.h
index ba1beaa..6cbda07 100644
--- a/libs/androidfw/include/androidfw/LoadedArsc.h
+++ b/libs/androidfw/include/androidfw/LoadedArsc.h
@@ -69,6 +69,14 @@
}
};
+using package_property_t = uint32_t;
+enum : package_property_t {
+ PROPERTY_DYNAMIC = 1,
+ PROPERTY_LOADER = 2,
+ PROPERTY_OVERLAY = 4,
+ PROPERTY_SYSTEM = 8,
+};
+
// TypeSpecPtr points to a block of memory that holds a TypeSpec struct, followed by an array of
// ResTable_type pointers.
// TypeSpecPtr is a managed pointer that knows how to delete itself.
@@ -131,9 +139,8 @@
return iterator(this, resource_ids_.size() + 1, 0);
}
- static std::unique_ptr<const LoadedPackage> Load(const Chunk& chunk, bool system,
- bool load_as_shared_library,
- bool load_as_custom_loader);
+ static std::unique_ptr<const LoadedPackage> Load(const Chunk& chunk,
+ package_property_t property_flags);
~LoadedPackage();
@@ -170,17 +177,26 @@
// Returns true if this package is dynamic (shared library) and needs to have an ID assigned.
inline bool IsDynamic() const {
- return dynamic_;
+ return (property_flags_ & PROPERTY_DYNAMIC) != 0;
+ }
+
+ // Returns true if this package is a Runtime Resource Overlay.
+ inline bool IsOverlay() const {
+ return (property_flags_ & PROPERTY_OVERLAY) != 0;
}
// Returns true if this package originates from a system provided resource.
inline bool IsSystem() const {
- return system_;
+ return (property_flags_ & PROPERTY_SYSTEM) != 0;
}
- // Returns true if this package is a custom loader and should behave like an overlay
+ // Returns true if this package is a custom loader and should behave like an overlay.
inline bool IsCustomLoader() const {
- return custom_loader_;
+ return (property_flags_ & PROPERTY_LOADER) != 0;
+ }
+
+ inline package_property_t GetPropertyFlags() const {
+ return property_flags_;
}
// Returns the map of package name to package ID used in this LoadedPackage. At runtime, a
@@ -248,12 +264,10 @@
ResStringPool type_string_pool_;
ResStringPool key_string_pool_;
std::string package_name_;
+ bool defines_overlayable_ = false;
int package_id_ = -1;
int type_id_offset_ = 0;
- bool dynamic_ = false;
- bool system_ = false;
- bool custom_loader_ = false;
- bool defines_overlayable_ = false;
+ package_property_t property_flags_ = 0U;
ByteBucketArray<TypeSpecPtr> type_specs_;
ByteBucketArray<uint32_t> resource_ids_;
@@ -274,9 +288,7 @@
// ID.
static std::unique_ptr<const LoadedArsc> Load(const StringPiece& data,
const LoadedIdmap* loaded_idmap = nullptr,
- bool system = false,
- bool load_as_shared_library = false,
- bool for_loader = false);
+ package_property_t property_flags = 0U);
// Create an empty LoadedArsc. This is used when an APK has no resources.arsc.
static std::unique_ptr<const LoadedArsc> CreateEmpty();
@@ -296,28 +308,15 @@
return packages_;
}
- // Returns true if this is a system provided resource.
- inline bool IsSystem() const {
- return system_;
- }
-
private:
DISALLOW_COPY_AND_ASSIGN(LoadedArsc);
LoadedArsc() = default;
- bool LoadTable(const Chunk& chunk, const LoadedIdmap* loaded_idmap, bool load_as_shared_library,
- bool for_loader);
-
- static std::unique_ptr<const LoadedArsc> LoadData(std::unique_ptr<LoadedArsc>& loaded_arsc,
- const char* data,
- size_t length,
- const LoadedIdmap* loaded_idmap = nullptr,
- bool load_as_shared_library = false,
- bool for_loader = false);
+ bool LoadTable(
+ const Chunk& chunk, const LoadedIdmap* loaded_idmap, package_property_t property_flags);
std::unique_ptr<ResStringPool> global_string_pool_ = util::make_unique<ResStringPool>();
std::vector<std::unique_ptr<const LoadedPackage>> packages_;
- bool system_ = false;
};
} // namespace android
diff --git a/libs/androidfw/tests/LoadedArsc_test.cpp b/libs/androidfw/tests/LoadedArsc_test.cpp
index 82dd335..8615069 100644
--- a/libs/androidfw/tests/LoadedArsc_test.cpp
+++ b/libs/androidfw/tests/LoadedArsc_test.cpp
@@ -144,8 +144,7 @@
"resources.arsc", &contents));
std::unique_ptr<const LoadedArsc> loaded_arsc =
- LoadedArsc::Load(StringPiece(contents), nullptr /* loaded_idmap */, false /*system*/,
- true /*load_as_shared_library*/);
+ LoadedArsc::Load(StringPiece(contents), nullptr /* loaded_idmap */, PROPERTY_DYNAMIC);
ASSERT_THAT(loaded_arsc, NotNull());
const auto& packages = loaded_arsc->GetPackages();
@@ -227,9 +226,7 @@
ASSERT_TRUE(ReadFileFromZipToString(GetTestDataPath() + "/overlayable/overlayable.apk",
"resources.arsc", &contents));
- std::unique_ptr<const LoadedArsc> loaded_arsc =
- LoadedArsc::Load(StringPiece(contents), nullptr /* loaded_idmap */, false /*system*/,
- false /*load_as_shared_library*/);
+ std::unique_ptr<const LoadedArsc> loaded_arsc = LoadedArsc::Load(StringPiece(contents));
ASSERT_THAT(loaded_arsc, NotNull());
const LoadedPackage* package = loaded_arsc->GetPackageById(
@@ -346,7 +343,7 @@
asset->getLength());
std::unique_ptr<const LoadedArsc> loaded_arsc =
- LoadedArsc::Load(data, nullptr, false, false, true);
+ LoadedArsc::Load(data, nullptr, PROPERTY_LOADER);
ASSERT_THAT(loaded_arsc, NotNull());
const LoadedPackage* package =
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 826a8ea..f086768 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -147,7 +147,6 @@
mNativeSurface = new ReliableSurface{std::move(surface)};
// TODO: Fix error handling & re-shorten timeout
ANativeWindow_setDequeueTimeout(mNativeSurface.get(), 4000_ms);
- mNativeSurface->enableFrameTimestamps(true);
} else {
mNativeSurface = nullptr;
}
@@ -169,6 +168,10 @@
if (hasSurface) {
mHaveNewSurface = true;
mSwapHistory.clear();
+ // Enable frame stats after the surface has been bound to the appropriate graphics API.
+ // Order is important when new and old surfaces are the same, because old surface has
+ // its frame stats disabled automatically.
+ mNativeSurface->enableFrameTimestamps(true);
} else {
mRenderThread.removeFrameCallback(this);
mGenerationID++;
diff --git a/libs/services/Android.bp b/libs/services/Android.bp
index 1b9939d..b0fad57d 100644
--- a/libs/services/Android.bp
+++ b/libs/services/Android.bp
@@ -22,6 +22,7 @@
"src/os/DropBoxManager.cpp",
"src/os/StatsDimensionsValue.cpp",
"src/os/StatsLogEventWrapper.cpp",
+ "src/util/StatsEvent.cpp",
],
shared_libs: [
diff --git a/libs/services/include/android/util/StatsEvent.h b/libs/services/include/android/util/StatsEvent.h
new file mode 100644
index 0000000..4863117
--- /dev/null
+++ b/libs/services/include/android/util/StatsEvent.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 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 STATS_EVENT_H
+#define STATS_EVENT_H
+
+#include <binder/Parcel.h>
+#include <binder/Parcelable.h>
+#include <binder/Status.h>
+#include <vector>
+
+namespace android {
+namespace util {
+class StatsEvent : public android::Parcelable {
+ public:
+ StatsEvent();
+
+ StatsEvent(StatsEvent&& in) = default;
+
+ android::status_t writeToParcel(android::Parcel* out) const;
+
+ android::status_t readFromParcel(const android::Parcel* in);
+
+ private:
+ int mAtomTag;
+ std::vector<uint8_t> mBuffer;
+};
+} // Namespace util
+} // Namespace android
+
+#endif // STATS_ EVENT_H
\ No newline at end of file
diff --git a/libs/services/src/util/StatsEvent.cpp b/libs/services/src/util/StatsEvent.cpp
new file mode 100644
index 0000000..8b85791
--- /dev/null
+++ b/libs/services/src/util/StatsEvent.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2019 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 <android/util/StatsEvent.h>
+
+#include <binder/Parcel.h>
+#include <binder/Parcelable.h>
+#include <binder/Status.h>
+#include <vector>
+
+using android::Parcel;
+using android::Parcelable;
+using android::status_t;
+using std::vector;
+
+namespace android {
+namespace util {
+
+StatsEvent::StatsEvent(){};
+
+status_t StatsEvent::writeToParcel(Parcel* out) const {
+ // Implement me if desired. We don't currently use this.
+ ALOGE("Cannot do c++ StatsEvent.writeToParcel(); it is not implemented.");
+ (void)out; // To prevent compile error of unused parameter 'out'
+ return UNKNOWN_ERROR;
+};
+
+status_t StatsEvent::readFromParcel(const Parcel* in) {
+ status_t res = OK;
+ if (in == NULL) {
+ ALOGE("statsd received parcel argument was NULL.");
+ return BAD_VALUE;
+ }
+ if ((res = in->readInt32(&mAtomTag)) != OK) {
+ ALOGE("statsd could not read atom tag from parcel");
+ return res;
+ }
+ if ((res = in->readByteVector(&mBuffer)) != OK) {
+ ALOGE("statsd could not read buffer from parcel");
+ return res;
+ }
+ return NO_ERROR;
+};
+
+} // Namespace util
+} // Namespace android
diff --git a/location/TEST_MAPPING b/location/TEST_MAPPING
deleted file mode 100644
index 2f38627..0000000
--- a/location/TEST_MAPPING
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "presubmit": [
- {
- "name": "CtsLocationCoarseTestCases"
- },
- {
- "name": "CtsLocationNoneTestCases"
- }
- ]
-}
diff --git a/location/java/android/location/GnssStatus.java b/location/java/android/location/GnssStatus.java
index 211a0cb..2f1eeda 100644
--- a/location/java/android/location/GnssStatus.java
+++ b/location/java/android/location/GnssStatus.java
@@ -16,18 +16,28 @@
package android.location;
+import android.annotation.FloatRange;
import android.annotation.IntDef;
+import android.annotation.IntRange;
import android.annotation.NonNull;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
/**
- * This class represents the current state of the GNSS engine.
- * This class is used in conjunction with the {@link GnssStatus.Callback}.
+ * This class represents the current state of the GNSS engine and is used in conjunction with
+ * {@link GnssStatus.Callback}.
+ *
+ * @see LocationManager#registerGnssStatusCallback
+ * @see GnssStatus.Callback
*/
public final class GnssStatus {
+
// these must match the definitions in gps.h
+ //
+ // Note: these constants are also duplicated in GnssStatusCompat.java in the androidx support
+ // library. if adding a constellation, please update that file as well.
/** Unknown constellation type. */
public static final int CONSTELLATION_UNKNOWN = 0;
@@ -48,75 +58,88 @@
/** @hide */
public static final int CONSTELLATION_COUNT = 8;
- /** @hide */
- public static final int GNSS_SV_FLAGS_NONE = 0;
- /** @hide */
- public static final int GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA = (1 << 0);
- /** @hide */
- public static final int GNSS_SV_FLAGS_HAS_ALMANAC_DATA = (1 << 1);
- /** @hide */
- public static final int GNSS_SV_FLAGS_USED_IN_FIX = (1 << 2);
- /** @hide */
- public static final int GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY = (1 << 3);
+ private static final int SVID_FLAGS_NONE = 0;
+ private static final int SVID_FLAGS_HAS_EPHEMERIS_DATA = (1 << 0);
+ private static final int SVID_FLAGS_HAS_ALMANAC_DATA = (1 << 1);
+ private static final int SVID_FLAGS_USED_IN_FIX = (1 << 2);
+ private static final int SVID_FLAGS_HAS_CARRIER_FREQUENCY = (1 << 3);
- /** @hide */
- public static final int SVID_SHIFT_WIDTH = 8;
- /** @hide */
- public static final int CONSTELLATION_TYPE_SHIFT_WIDTH = 4;
- /** @hide */
- public static final int CONSTELLATION_TYPE_MASK = 0xf;
+ private static final int SVID_SHIFT_WIDTH = 8;
+ private static final int CONSTELLATION_TYPE_SHIFT_WIDTH = 4;
+ private static final int CONSTELLATION_TYPE_MASK = 0xf;
/**
* Used for receiving notifications when GNSS events happen.
+ *
+ * @see LocationManager#registerGnssStatusCallback
*/
public static abstract class Callback {
/**
* Called when GNSS system has started.
*/
- public void onStarted() {}
+ public void onStarted() {
+ }
/**
* Called when GNSS system has stopped.
*/
- public void onStopped() {}
+ public void onStopped() {
+ }
/**
* Called when the GNSS system has received its first fix since starting.
+ *
* @param ttffMillis the time from start to first fix in milliseconds.
*/
- public void onFirstFix(int ttffMillis) {}
+ public void onFirstFix(int ttffMillis) {
+ }
/**
* Called periodically to report GNSS satellite status.
+ *
* @param status the current status of all satellites.
*/
- public void onSatelliteStatusChanged(GnssStatus status) {}
+ public void onSatelliteStatusChanged(@NonNull GnssStatus status) {
+ }
}
/**
* Constellation type.
+ *
* @hide
*/
@Retention(RetentionPolicy.SOURCE)
@IntDef({CONSTELLATION_UNKNOWN, CONSTELLATION_GPS, CONSTELLATION_SBAS, CONSTELLATION_GLONASS,
CONSTELLATION_QZSS, CONSTELLATION_BEIDOU, CONSTELLATION_GALILEO, CONSTELLATION_IRNSS})
- public @interface ConstellationType {}
-
- final int[] mSvidWithFlags;
- final float[] mCn0DbHz;
- final float[] mElevations;
- final float[] mAzimuths;
- final int mSvCount;
- final float[] mCarrierFrequencies;
+ public @interface ConstellationType {
+ }
/**
+ * Create a GnssStatus that wraps the given arguments without any additional overhead. Callers
+ * are responsible for guaranteeing that the arguments are never modified after calling this
+ * method.
+ *
* @hide
*/
- public GnssStatus(int svCount, int[] svidWithFlags, float[] cn0s, float[] elevations,
+ @NonNull
+ public static GnssStatus wrap(int svCount, int[] svidWithFlags, float[] cn0DbHzs,
+ float[] elevations, float[] azimuths, float[] carrierFrequencies) {
+ return new GnssStatus(svCount, svidWithFlags, cn0DbHzs, elevations, azimuths,
+ carrierFrequencies);
+ }
+
+ private final int mSvCount;
+ private final int[] mSvidWithFlags;
+ private final float[] mCn0DbHzs;
+ private final float[] mElevations;
+ private final float[] mAzimuths;
+ private final float[] mCarrierFrequencies;
+
+ private GnssStatus(int svCount, int[] svidWithFlags, float[] cn0DbHzs, float[] elevations,
float[] azimuths, float[] carrierFrequencies) {
mSvCount = svCount;
mSvidWithFlags = svidWithFlags;
- mCn0DbHz = cn0s;
+ mCn0DbHzs = cn0DbHzs;
mElevations = elevations;
mAzimuths = azimuths;
mCarrierFrequencies = carrierFrequencies;
@@ -125,6 +148,7 @@
/**
* Gets the total number of satellites in satellite list.
*/
+ @IntRange(from = 0)
public int getSatelliteCount() {
return mSvCount;
}
@@ -132,11 +156,11 @@
/**
* Retrieves the constellation type of the satellite at the specified index.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
@ConstellationType
- public int getConstellationType(int satIndex) {
- return ((mSvidWithFlags[satIndex] >> CONSTELLATION_TYPE_SHIFT_WIDTH)
+ public int getConstellationType(@IntRange(from = 0) int satelliteIndex) {
+ return ((mSvidWithFlags[satelliteIndex] >> CONSTELLATION_TYPE_SHIFT_WIDTH)
& CONSTELLATION_TYPE_MASK);
}
@@ -154,110 +178,113 @@
* <li>SBAS: 120-151, 183-192</li>
* <li>GLONASS: One of: OSN, or FCN+100
* <ul>
- * <li>1-24 as the orbital slot number (OSN) (preferred, if known)</li>
- * <li>93-106 as the frequency channel number (FCN) (-7 to +6) plus 100.
- * i.e. encode FCN of -7 as 93, 0 as 100, and +6 as 106</li>
+ * <li>1-24 as the orbital slot number (OSN) (preferred, if known)</li>
+ * <li>93-106 as the frequency channel number (FCN) (-7 to +6) plus 100.
+ * i.e. encode FCN of -7 as 93, 0 as 100, and +6 as 106</li>
* </ul></li>
* <li>QZSS: 193-200</li>
* <li>Galileo: 1-36</li>
* <li>Beidou: 1-37</li>
* </ul>
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public int getSvid(int satIndex) {
- return mSvidWithFlags[satIndex] >> SVID_SHIFT_WIDTH;
+ @IntRange(from = 1, to = 200)
+ public int getSvid(@IntRange(from = 0) int satelliteIndex) {
+ return mSvidWithFlags[satelliteIndex] >> SVID_SHIFT_WIDTH;
}
/**
* Retrieves the carrier-to-noise density at the antenna of the satellite at the specified index
* in dB-Hz.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public float getCn0DbHz(int satIndex) {
- return mCn0DbHz[satIndex];
+ @FloatRange(from = 0, to = 63)
+ public float getCn0DbHz(@IntRange(from = 0) int satelliteIndex) {
+ return mCn0DbHzs[satelliteIndex];
}
/**
* Retrieves the elevation of the satellite at the specified index.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public float getElevationDegrees(int satIndex) {
- return mElevations[satIndex];
+ @FloatRange(from = -90, to = 90)
+ public float getElevationDegrees(@IntRange(from = 0) int satelliteIndex) {
+ return mElevations[satelliteIndex];
}
/**
* Retrieves the azimuth the satellite at the specified index.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public float getAzimuthDegrees(int satIndex) {
- return mAzimuths[satIndex];
+ @FloatRange(from = 0, to = 360)
+ public float getAzimuthDegrees(@IntRange(from = 0) int satelliteIndex) {
+ return mAzimuths[satelliteIndex];
}
/**
* Reports whether the satellite at the specified index has ephemeris data.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public boolean hasEphemerisData(int satIndex) {
- return (mSvidWithFlags[satIndex] & GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA) != 0;
+ public boolean hasEphemerisData(@IntRange(from = 0) int satelliteIndex) {
+ return (mSvidWithFlags[satelliteIndex] & SVID_FLAGS_HAS_EPHEMERIS_DATA) != 0;
}
/**
* Reports whether the satellite at the specified index has almanac data.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public boolean hasAlmanacData(int satIndex) {
- return (mSvidWithFlags[satIndex] & GNSS_SV_FLAGS_HAS_ALMANAC_DATA) != 0;
+ public boolean hasAlmanacData(@IntRange(from = 0) int satelliteIndex) {
+ return (mSvidWithFlags[satelliteIndex] & SVID_FLAGS_HAS_ALMANAC_DATA) != 0;
}
/**
* Reports whether the satellite at the specified index was used in the calculation of the most
* recent position fix.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public boolean usedInFix(int satIndex) {
- return (mSvidWithFlags[satIndex] & GNSS_SV_FLAGS_USED_IN_FIX) != 0;
+ public boolean usedInFix(@IntRange(from = 0) int satelliteIndex) {
+ return (mSvidWithFlags[satelliteIndex] & SVID_FLAGS_USED_IN_FIX) != 0;
}
/**
- * Reports whether a valid {@link #getCarrierFrequencyHz(int satIndex)} is available.
+ * Reports whether a valid {@link #getCarrierFrequencyHz(int satelliteIndex)} is available.
*
- * @param satIndex the index of the satellite in the list.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public boolean hasCarrierFrequencyHz(int satIndex) {
- return (mSvidWithFlags[satIndex] & GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY) != 0;
+ public boolean hasCarrierFrequencyHz(@IntRange(from = 0) int satelliteIndex) {
+ return (mSvidWithFlags[satelliteIndex] & SVID_FLAGS_HAS_CARRIER_FREQUENCY) != 0;
}
/**
* Gets the carrier frequency of the signal tracked.
*
- * <p>For example it can be the GPS central frequency for L1 = 1575.45 MHz, or L2 = 1227.60 MHz,
- * L5 = 1176.45 MHz, varying GLO channels, etc. If the field is not set, it is the primary
+ * <p>For example it can be the GPS central frequency for L1 = 1575.45 MHz, or L2 = 1227.60
+ * MHz, L5 = 1176.45 MHz, varying GLO channels, etc. If the field is not set, it is the primary
* common use central frequency, e.g. L1 = 1575.45 MHz for GPS.
*
* For an L1, L5 receiver tracking a satellite on L1 and L5 at the same time, two measurements
- * will be reported for this same satellite, in one all the values related to L1 will be filled,
- * and in the other all of the values related to L5 will be filled.
+ * will be reported for this same satellite, in one all the values related to L1 will be
+ * filled, and in the other all of the values related to L5 will be filled.
*
- * <p>The value is only available if {@link #hasCarrierFrequencyHz(int satIndex)} is {@code true}.
+ * <p>The value is only available if {@link #hasCarrierFrequencyHz(int satelliteIndex)} is
+ * {@code true}.
*
- * @param satIndex the index of the satellite in the list.
- *
- * @return the carrier frequency of the signal tracked in Hz.
+ * @param satelliteIndex An index from zero to {@link #getSatelliteCount()} - 1
*/
- public float getCarrierFrequencyHz(int satIndex) {
- return mCarrierFrequencies[satIndex];
+ @FloatRange(from = 0)
+ public float getCarrierFrequencyHz(@IntRange(from = 0) int satelliteIndex) {
+ return mCarrierFrequencies[satelliteIndex];
}
/**
- * Returns the string representation of a constellation type. For example,
- * {@link #CONSTELLATION_GPS} is represented by the string GPS.
+ * Returns the string representation of a constellation type.
*
* @param constellationType the constellation type.
* @return the string representation.
@@ -286,4 +313,108 @@
return Integer.toString(constellationType);
}
}
+
+ /**
+ * Builder class to help create new GnssStatus instances.
+ */
+ public static final class Builder {
+
+ private final ArrayList<GnssSvInfo> mSatellites = new ArrayList<>();
+
+ /**
+ * Adds a new satellite to the Builder.
+ *
+ * @param constellationType one of the CONSTELLATION_* constants
+ * @param svid the space vehicle identifier
+ * @param cn0DbHz carrier-to-noise density at the antenna in dB-Hz
+ * @param elevation satellite elevation in degrees
+ * @param azimuth satellite azimuth in degrees
+ * @param hasEphemeris whether the satellite has ephemeris data
+ * @param hasAlmanac whether the satellite has almanac data
+ * @param usedInFix whether the satellite was used in the most recent location fix
+ * @param hasCarrierFrequency whether carrier frequency data is available
+ * @param carrierFrequency satellite carrier frequency in Hz
+ */
+ @NonNull
+ public Builder addSatellite(@ConstellationType int constellationType,
+ @IntRange(from = 1, to = 200) int svid,
+ @FloatRange(from = 0, to = 63) float cn0DbHz,
+ @FloatRange(from = -90, to = 90) float elevation,
+ @FloatRange(from = 0, to = 360) float azimuth,
+ boolean hasEphemeris,
+ boolean hasAlmanac,
+ boolean usedInFix,
+ boolean hasCarrierFrequency,
+ @FloatRange(from = 0) float carrierFrequency) {
+ mSatellites.add(new GnssSvInfo(constellationType, svid, cn0DbHz, elevation, azimuth,
+ hasEphemeris, hasAlmanac, usedInFix, hasCarrierFrequency, carrierFrequency));
+ return this;
+ }
+
+ /**
+ * Clears all satellites in the Builder.
+ */
+ @NonNull
+ public Builder clearSatellites() {
+ mSatellites.clear();
+ return this;
+ }
+
+ /**
+ * Builds a new GnssStatus based on the satellite information in the Builder.
+ */
+ @NonNull
+ public GnssStatus build() {
+ int svCount = mSatellites.size();
+ int[] svidWithFlags = new int[svCount];
+ float[] cn0DbHzs = new float[svCount];
+ float[] elevations = new float[svCount];
+ float[] azimuths = new float[svCount];
+ float[] carrierFrequencies = new float[svCount];
+
+ for (int i = 0; i < svidWithFlags.length; i++) {
+ svidWithFlags[i] = mSatellites.get(i).mSvidWithFlags;
+ }
+ for (int i = 0; i < cn0DbHzs.length; i++) {
+ cn0DbHzs[i] = mSatellites.get(i).mCn0DbHz;
+ }
+ for (int i = 0; i < elevations.length; i++) {
+ elevations[i] = mSatellites.get(i).mElevation;
+ }
+ for (int i = 0; i < azimuths.length; i++) {
+ azimuths[i] = mSatellites.get(i).mAzimuth;
+ }
+ for (int i = 0; i < carrierFrequencies.length; i++) {
+ carrierFrequencies[i] = mSatellites.get(i).mCarrierFrequency;
+ }
+
+ return wrap(svCount, svidWithFlags, cn0DbHzs, elevations, azimuths,
+ carrierFrequencies);
+ }
+ }
+
+ private static class GnssSvInfo {
+
+ private final int mSvidWithFlags;
+ private final float mCn0DbHz;
+ private final float mElevation;
+ private final float mAzimuth;
+ private final float mCarrierFrequency;
+
+ private GnssSvInfo(int constellationType, int svid, float cn0DbHz,
+ float elevation, float azimuth, boolean hasEphemeris, boolean hasAlmanac,
+ boolean usedInFix, boolean hasCarrierFrequency, float carrierFrequency) {
+ mSvidWithFlags = (svid << SVID_SHIFT_WIDTH)
+ | ((constellationType & CONSTELLATION_TYPE_MASK)
+ << CONSTELLATION_TYPE_SHIFT_WIDTH)
+ | (hasEphemeris ? SVID_FLAGS_HAS_EPHEMERIS_DATA : SVID_FLAGS_NONE)
+ | (hasAlmanac ? SVID_FLAGS_HAS_ALMANAC_DATA : SVID_FLAGS_NONE)
+ | (usedInFix ? SVID_FLAGS_USED_IN_FIX : SVID_FLAGS_NONE)
+ | (hasCarrierFrequency ? SVID_FLAGS_HAS_CARRIER_FREQUENCY : SVID_FLAGS_NONE);
+ mCn0DbHz = cn0DbHz;
+ mElevation = elevation;
+ mAzimuth = azimuth;
+ mCarrierFrequency = carrierFrequency;
+ }
+ }
}
diff --git a/location/java/android/location/GpsStatus.java b/location/java/android/location/GpsStatus.java
index 609a15e..496885c 100644
--- a/location/java/android/location/GpsStatus.java
+++ b/location/java/android/location/GpsStatus.java
@@ -16,8 +16,7 @@
package android.location;
-import android.annotation.UnsupportedAppUsage;
-import android.os.Build;
+import android.annotation.NonNull;
import android.util.SparseArray;
import java.util.Iterator;
@@ -25,20 +24,18 @@
/**
- * This class represents the current state of the GPS engine.
+ * This class represents the current state of the GPS engine and is used in conjunction with {@link
+ * GpsStatus.Listener}.
*
- * <p>This class is used in conjunction with the {@link Listener} interface.
- *
- * @deprecated use {@link GnssStatus} and {@link GnssStatus.Callback}.
+ * @deprecated Use {@link GnssStatus} instead.
*/
@Deprecated
public final class GpsStatus {
- private static final int NUM_SATELLITES = 255;
+ private static final int MAX_SATELLITES = 255;
private static final int GLONASS_SVID_OFFSET = 64;
private static final int BEIDOU_SVID_OFFSET = 200;
private static final int SBAS_SVID_OFFSET = -87;
- /* These package private values are modified by the LocationManager class */
private int mTimeToFirstFix;
private final SparseArray<GpsSatellite> mSatellites = new SparseArray<>();
@@ -80,12 +77,7 @@
}
}
- private Iterable<GpsSatellite> mSatelliteList = new Iterable<GpsSatellite>() {
- @Override
- public Iterator<GpsSatellite> iterator() {
- return new SatelliteIterator();
- }
- };
+ private Iterable<GpsSatellite> mSatelliteList = SatelliteIterator::new;
/**
* Event sent when the GPS system has started.
@@ -111,7 +103,8 @@
/**
* Used for receiving notifications when GPS status has changed.
- * @deprecated use {@link GnssStatus.Callback} instead.
+ *
+ * @deprecated Use {@link GnssStatus.Callback} instead.
*/
@Deprecated
public interface Listener {
@@ -148,17 +141,31 @@
void onNmeaReceived(long timestamp, String nmea);
}
- // For API-compat a public ctor() is not available
- GpsStatus() {}
+ /**
+ * Builds a GpsStatus from the given GnssStatus.
+ */
+ @NonNull
+ public static GpsStatus create(@NonNull GnssStatus gnssStatus, int timeToFirstFix) {
+ GpsStatus status = new GpsStatus();
+ status.setStatus(gnssStatus, timeToFirstFix);
+ return status;
+ }
- private void setStatus(int svCount, int[] svidWithFlags, float[] cn0s, float[] elevations,
- float[] azimuths) {
- clearSatellites();
- for (int i = 0; i < svCount; i++) {
- final int constellationType =
- (svidWithFlags[i] >> GnssStatus.CONSTELLATION_TYPE_SHIFT_WIDTH)
- & GnssStatus.CONSTELLATION_TYPE_MASK;
- int prn = svidWithFlags[i] >> GnssStatus.SVID_SHIFT_WIDTH;
+ private GpsStatus() {
+ }
+
+ /**
+ * @hide
+ */
+ void setStatus(GnssStatus status, int timeToFirstFix) {
+ for (int i = 0; i < mSatellites.size(); i++) {
+ mSatellites.valueAt(i).mValid = false;
+ }
+
+ mTimeToFirstFix = timeToFirstFix;
+ for (int i = 0; i < status.getSatelliteCount(); i++) {
+ int constellationType = status.getConstellationType(i);
+ int prn = status.getSvid(i);
// Other satellites passed through these APIs before GnssSvStatus was availble.
// GPS, SBAS & QZSS can pass through at their nominally
// assigned prn number (as long as it fits in the valid 0-255 range below.)
@@ -175,45 +182,27 @@
(constellationType != GnssStatus.CONSTELLATION_QZSS)) {
continue;
}
- if (prn > 0 && prn <= NUM_SATELLITES) {
- GpsSatellite satellite = mSatellites.get(prn);
- if (satellite == null) {
- satellite = new GpsSatellite(prn);
- mSatellites.put(prn, satellite);
- }
-
- satellite.mValid = true;
- satellite.mSnr = cn0s[i];
- satellite.mElevation = elevations[i];
- satellite.mAzimuth = azimuths[i];
- satellite.mHasEphemeris =
- (svidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA) != 0;
- satellite.mHasAlmanac =
- (svidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_ALMANAC_DATA) != 0;
- satellite.mUsedInFix =
- (svidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0;
+ if (prn <= 0 || prn > MAX_SATELLITES) {
+ continue;
}
+
+ GpsSatellite satellite = mSatellites.get(prn);
+ if (satellite == null) {
+ satellite = new GpsSatellite(prn);
+ mSatellites.put(prn, satellite);
+ }
+
+ satellite.mValid = true;
+ satellite.mSnr = status.getCn0DbHz(i);
+ satellite.mElevation = status.getElevationDegrees(i);
+ satellite.mAzimuth = status.getAzimuthDegrees(i);
+ satellite.mHasEphemeris = status.hasEphemerisData(i);
+ satellite.mHasAlmanac = status.hasAlmanacData(i);
+ satellite.mUsedInFix = status.usedInFix(i);
}
}
/**
- * Copies GPS satellites information from GnssStatus object.
- * Since this method is only used within {@link LocationManager#getGpsStatus},
- * it does not need to be synchronized.
- * @hide
- */
- void setStatus(GnssStatus status, int timeToFirstFix) {
- mTimeToFirstFix = timeToFirstFix;
- setStatus(status.mSvCount, status.mSvidWithFlags, status.mCn0DbHz, status.mElevations,
- status.mAzimuths);
- }
-
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
- void setTimeToFirstFix(int ttff) {
- mTimeToFirstFix = ttff;
- }
-
- /**
* Returns the time required to receive the first fix since the most recent
* restart of the GPS engine.
*
@@ -240,14 +229,7 @@
* @return the maximum number of satellites
*/
public int getMaxSatellites() {
- return NUM_SATELLITES;
+ return mSatellites.size();
}
- private void clearSatellites() {
- int satellitesCount = mSatellites.size();
- for (int i = 0; i < satellitesCount; i++) {
- GpsSatellite satellite = mSatellites.valueAt(i);
- satellite.mValid = false;
- }
- }
}
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index c48f6e8..75e1cd4 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -435,7 +435,7 @@
* {@link SecurityException} if the location permissions were not sufficient to use the
* specified provider.
*
- * @param provider the name of the provider
+ * @param provider a provider listed by {@link #getAllProviders()}
* @return true if the provider exists and is enabled
*
* @throws IllegalArgumentException if provider is null
@@ -453,7 +453,7 @@
* {@link SecurityException} if the location permissions were not sufficient to use the
* specified provider.
*
- * @param provider the name of the provider
+ * @param provider a provider listed by {@link #getAllProviders()}
* @param userHandle the user to query
* @return true if the provider exists and is enabled
*
@@ -477,8 +477,8 @@
* functions as a best effort. It should not be relied on in any meaningful sense as providers
* may no longer be enabled or disabled by clients.
*
- * @param provider the name of the provider
- * @param enabled true to enable the provider. false to disable the provider
+ * @param provider a provider listed by {@link #getAllProviders()}
+ * @param enabled whether to enable or disable the provider
* @param userHandle the user to set
* @return true if the value was set, false otherwise
*
@@ -534,7 +534,7 @@
* will always attempt to return a current location, but will potentially use additional power
* in the course of the attempt as compared to this method.
*
- * @param provider the name of the provider
+ * @param provider a provider listed by {@link #getAllProviders()}
* @return the last known location for the given provider, or null if not available
* @throws SecurityException if no suitable permission is present
* @throws IllegalArgumentException if provider is null or doesn't exist
@@ -587,7 +587,7 @@
* determine a valid location fix more often than while in the foreground. Background
* applications may be throttled in their location accesses to some degree.
*
- * @param provider the name of the provider with which to register
+ * @param provider a provider listed by {@link #getAllProviders()}
* @param cancellationSignal an optional signal that allows for cancelling this call
* @param executor the callback will take place on this {@link Executor}
* @param consumer the callback invoked with either a {@link Location} or null
@@ -667,7 +667,7 @@
* <p>See {@link #requestLocationUpdates(String, long, float, LocationListener, Looper)} for
* more detail on how to use this method.
*
- * @param provider the name of the provider with which to register
+ * @param provider a provider listed by {@link #getAllProviders()}
* @param listener the listener to receive location updates
* @param looper the looper handling listener callbacks, or null to use the looper of the
* calling thread
@@ -729,7 +729,7 @@
* <p>See {@link #requestLocationUpdates(long, float, Criteria, PendingIntent)} for more detail
* on how to use this method.
*
- * @param provider the name of the provider with which to register
+ * @param provider a provider listed by {@link #getAllProviders()}
* @param pendingIntent the pending intent to send location updates
*
* @throws IllegalArgumentException if provider is null or doesn't exist
@@ -829,10 +829,10 @@
*
* <p>To unregister for location updates, use {@link #removeUpdates(LocationListener)}.
*
- * @param provider the name of the provider with which to register
- * @param minTimeMs minimum time interval between location updates in milliseconds
+ * @param provider a provider listed by {@link #getAllProviders()}
+ * @param minTimeMs minimum time interval between location updates in milliseconds
* @param minDistanceM minimum distance between location updates in meters
- * @param listener the listener to receive location updates
+ * @param listener the listener to receive location updates
*
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if listener is null
@@ -857,12 +857,12 @@
* <p>See {@link #requestLocationUpdates(String, long, float, LocationListener)}
* for more detail on how this method works.
*
- * @param provider the name of the provider with which to register
- * @param minTimeMs minimum time interval between location updates in milliseconds
+ * @param provider a provider listed by {@link #getAllProviders()}
+ * @param minTimeMs minimum time interval between location updates in milliseconds
* @param minDistanceM minimum distance between location updates in meters
- * @param listener the listener to receive location updates
- * @param looper the looper handling listener callbacks, or null to use the looper of the
- * calling thread
+ * @param listener the listener to receive location updates
+ * @param looper the looper handling listener callbacks, or null to use the looper of the
+ * calling thread
*
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if listener is null
@@ -886,11 +886,11 @@
* <p>See {@link #requestLocationUpdates(String, long, float, LocationListener)}
* for more detail on how this method works.
*
- * @param provider the name of the provider with which to register
- * @param minTimeMs minimum time interval between location updates in milliseconds
+ * @param provider a provider listed by {@link #getAllProviders()}
+ * @param minTimeMs minimum time interval between location updates in milliseconds
* @param minDistanceM minimum distance between location updates in meters
- * @param executor the executor handling listener callbacks
- * @param listener the listener to receive location updates
+ * @param executor the executor handling listener callbacks
+ * @param listener the listener to receive location updates
*
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if executor is null
@@ -980,9 +980,9 @@
* <p>See {@link #requestLocationUpdates(String, long, float, LocationListener)}
* for more detail on how this method works.
*
- * @param provider the name of the provider with which to register
- * @param minTimeMs minimum time interval between location updates in milliseconds
- * @param minDistanceM minimum distance between location updates in meters
+ * @param provider a provider listed by {@link #getAllProviders()}
+ * @param minTimeMs minimum time interval between location updates in milliseconds
+ * @param minDistanceM minimum distance between location updates in meters
* @param pendingIntent the pending intent to send location updates
*
* @throws IllegalArgumentException if provider is null or doesn't exist
@@ -1317,7 +1317,7 @@
* Returns the information about the location provider with the given name, or null if no
* provider exists by that name.
*
- * @param provider the provider name
+ * @param provider a provider listed by {@link #getAllProviders()}
* @return location provider information, or null if provider does not exist
*
* @throws IllegalArgumentException if provider is null
@@ -1374,7 +1374,7 @@
* Sends additional commands to a location provider. Can be used to support provider specific
* extensions to the Location Manager API.
*
- * @param provider name of the location provider
+ * @param provider a provider listed by {@link #getAllProviders()}
* @param command name of the command to send to the provider
* @param extras optional arguments for the command, or null
* @return true always, the return value may be ignored
@@ -1810,15 +1810,22 @@
@Deprecated
@RequiresPermission(ACCESS_FINE_LOCATION)
public @Nullable GpsStatus getGpsStatus(@Nullable GpsStatus status) {
- if (status == null) {
- status = new GpsStatus();
+ UnsupportedOperationException ex = new UnsupportedOperationException(
+ "GpsStatus APIs not supported in S and above, use GnssStatus APIs instead");
+ if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.R) {
+ throw ex;
+ } else {
+ Log.w(TAG, ex);
}
- // When mGnssStatus is null, that means that this method is called outside
- // onGpsStatusChanged(). Return an empty status to maintain backwards compatibility.
+
GnssStatus gnssStatus = mGnssStatusListenerManager.getGnssStatus();
int ttff = mGnssStatusListenerManager.getTtff();
if (gnssStatus != null) {
- status.setStatus(gnssStatus, ttff);
+ if (status == null) {
+ status = GpsStatus.create(gnssStatus, ttff);
+ } else {
+ status.setStatus(gnssStatus, ttff);
+ }
}
return status;
}
@@ -1837,8 +1844,8 @@
@RequiresPermission(ACCESS_FINE_LOCATION)
public boolean addGpsStatusListener(GpsStatus.Listener listener) {
UnsupportedOperationException ex = new UnsupportedOperationException(
- "GpsStatus APIs not supported in R and above, use GnssStatus APIs instead");
- if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R) {
+ "GpsStatus APIs not supported in S and above, use GnssStatus APIs instead");
+ if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.R) {
throw ex;
} else {
Log.w(TAG, ex);
@@ -1862,8 +1869,8 @@
@Deprecated
public void removeGpsStatusListener(GpsStatus.Listener listener) {
UnsupportedOperationException ex = new UnsupportedOperationException(
- "GpsStatus APIs not supported in R and above, use GnssStatus APIs instead");
- if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R) {
+ "GpsStatus APIs not supported in S and above, use GnssStatus APIs instead");
+ if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.R) {
throw ex;
} else {
Log.w(TAG, ex);
@@ -1955,23 +1962,21 @@
/**
* No-op method to keep backward-compatibility.
*
- * @deprecated use {@link #addNmeaListener(OnNmeaMessageListener)} instead.
- * @removed
+ * @deprecated Use {@link #addNmeaListener} instead.
*/
@Deprecated
@RequiresPermission(ACCESS_FINE_LOCATION)
- public boolean addNmeaListener(GpsStatus.NmeaListener listener) {
+ public boolean addNmeaListener(@NonNull GpsStatus.NmeaListener listener) {
return false;
}
/**
* No-op method to keep backward-compatibility.
*
- * @deprecated use {@link #removeNmeaListener(OnNmeaMessageListener)} instead.
- * @removed
+ * @deprecated Use {@link #removeNmeaListener(OnNmeaMessageListener)} instead.
*/
@Deprecated
- public void removeNmeaListener(GpsStatus.NmeaListener listener) {}
+ public void removeNmeaListener(@NonNull GpsStatus.NmeaListener listener) {}
/**
* Adds an NMEA listener.
@@ -2636,10 +2641,47 @@
@Override
public void onRemoved() {
- unregister();
- synchronized (mListeners) {
- mListeners.remove(mListener, this);
+ // TODO: onRemoved is necessary to GC hanging listeners, but introduces some interesting
+ // broken edge cases. luckily these edge cases are quite unlikely. consider the
+ // following interleaving for instance:
+ // 1) client adds single shot location request (A)
+ // 2) client gets removal callback, and schedules it for execution
+ // 3) client replaces single shot request with a different location request (B)
+ // 4) prior removal callback is executed, removing location request (B) incorrectly
+ // what's needed is a way to identify which listener a callback belongs to. currently
+ // we reuse the same transport object for the same listeners (so that we don't leak
+ // transport objects on the server side). there seem to be two solutions:
+ // 1) when reregistering a request, first unregister the current transport, then
+ // register with a new transport object (never reuse transport objects) - the
+ // downside is that this breaks the server's knowledge that the request is the
+ // same object, and thus breaks optimizations such as reusing the same transport
+ // state.
+ // 2) pass some other type of marker in addition to the transport (for example an
+ // incrementing integer representing the transport "version"), and pass this
+ // marker back into callbacks so that each callback knows which transport
+ // "version" it belongs to and can not execute itself if the version does not
+ // match.
+ // (1) seems like the preferred solution as it's simpler to implement and the above
+ // mentioned server optimizations are not terribly important (they can be bypassed by
+ // clients that use a new listener every time anyways).
+
+ Executor currentExecutor = mExecutor;
+ if (currentExecutor == null) {
+ // we've already been unregistered, no work to do anyways
+ return;
}
+
+ // must be executed on the same executor so callback execution cannot be reordered
+ currentExecutor.execute(() -> {
+ if (currentExecutor != mExecutor) {
+ return;
+ }
+
+ unregister();
+ synchronized (mListeners) {
+ mListeners.remove(mListener, this);
+ }
+ });
}
private void locationCallbackFinished() {
@@ -2777,8 +2819,8 @@
@Override
public void onSvStatusChanged(int svCount, int[] svidWithFlags, float[] cn0s,
float[] elevations, float[] azimuths, float[] carrierFreqs) {
- GnssStatus localStatus = new GnssStatus(svCount, svidWithFlags, cn0s, elevations,
- azimuths, carrierFreqs);
+ GnssStatus localStatus = GnssStatus.wrap(svCount, svidWithFlags, cn0s,
+ elevations, azimuths, carrierFreqs);
mGnssStatus = localStatus;
execute((callback) -> callback.onSatelliteStatusChanged(localStatus));
}
diff --git a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java
index 07bfe02..e0bff74 100644
--- a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java
+++ b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java
@@ -188,22 +188,18 @@
/**
* Logs sv status data
- *
- * @param svCount
- * @param svidWithFlags
- * @param svCarrierFreqs
*/
- public void logSvStatus(int svCount, int[] svidWithFlags, float[] svCarrierFreqs) {
+ public void logSvStatus(GnssStatus status) {
boolean isL5 = false;
// Calculate SvStatus Information
- for (int i = 0; i < svCount; i++) {
- if ((svidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY) != 0) {
+ for (int i = 0; i < status.getSatelliteCount(); i++) {
+ if (status.hasCarrierFrequencyHz(i)) {
mNumSvStatus++;
- isL5 = isL5Sv(svCarrierFreqs[i]);
+ isL5 = isL5Sv(status.getCarrierFrequencyHz(i));
if (isL5) {
mNumL5SvStatus++;
}
- if ((svidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0) {
+ if (status.usedInFix(i)) {
mNumSvStatusUsedInFix++;
if (isL5) {
mNumL5SvStatusUsedInFix++;
@@ -211,15 +207,10 @@
}
}
}
- return;
}
/**
* Logs CN0 when at least 4 SVs are available L5 Only
- *
- * @param svCount
- * @param cn0s
- * @param svCarrierFreqs
*/
private void logCn0L5(int svCount, float[] cn0s, float[] svCarrierFreqs) {
if (svCount == 0 || cn0s == null || cn0s.length == 0 || cn0s.length < svCount
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 9ad7f2a..d552491 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1,4 +1,5 @@
/*
+/*
* Copyright (C) 2007 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -1931,12 +1932,11 @@
* application when it places a phone call, as it will cause signals from the radio layer
* to feed the platform mixer.
*
- * @param mode the requested audio mode ({@link #MODE_NORMAL}, {@link #MODE_RINGTONE},
- * {@link #MODE_IN_CALL} or {@link #MODE_IN_COMMUNICATION}).
+ * @param mode the requested audio mode.
* Informs the HAL about the current audio state so that
* it can route the audio appropriately.
*/
- public void setMode(int mode) {
+ public void setMode(@AudioMode int mode) {
final IAudioService service = getService();
try {
service.setMode(mode, mICallBack, mApplicationContext.getOpPackageName());
@@ -1948,14 +1948,47 @@
/**
* Returns the current audio mode.
*
- * @return the current audio mode ({@link #MODE_NORMAL}, {@link #MODE_RINGTONE},
- * {@link #MODE_IN_CALL} or {@link #MODE_IN_COMMUNICATION}).
- * Returns the current current audio state from the HAL.
+ * @return the current audio mode.
*/
+ @AudioMode
public int getMode() {
final IAudioService service = getService();
try {
- return service.getMode();
+ int mode = service.getMode();
+ int sdk;
+ try {
+ sdk = getContext().getApplicationInfo().targetSdkVersion;
+ } catch (NullPointerException e) {
+ // some tests don't have a Context
+ sdk = Build.VERSION.SDK_INT;
+ }
+ if (mode == MODE_CALL_SCREENING && sdk <= Build.VERSION_CODES.Q) {
+ mode = MODE_IN_CALL;
+ }
+ return mode;
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Indicates if the platform supports a special call screening and call monitoring mode.
+ * <p>
+ * When this mode is supported, it is possible to perform call screening and monitoring
+ * functions while other use cases like music or movie playback are active.
+ * <p>
+ * Use {@link #setMode(int)} with mode {@link #MODE_CALL_SCREENING} to place the platform in
+ * call screening mode.
+ * <p>
+ * If call screening mode is not supported, setting mode to
+ * MODE_CALL_SCREENING will be ignored and will not change current mode reported by
+ * {@link #getMode()}.
+ * @return true if call screening mode is supported, false otherwise.
+ */
+ public boolean isCallScreeningModeSupported() {
+ final IAudioService service = getService();
+ try {
+ return service.isCallScreeningModeSupported();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1989,6 +2022,22 @@
* In communication audio mode. An audio/video chat or VoIP call is established.
*/
public static final int MODE_IN_COMMUNICATION = AudioSystem.MODE_IN_COMMUNICATION;
+ /**
+ * Call screening in progress. Call is connected and audio is accessible to call
+ * screening applications but other audio use cases are still possible.
+ */
+ public static final int MODE_CALL_SCREENING = AudioSystem.MODE_CALL_SCREENING;
+
+ /** @hide */
+ @IntDef(flag = false, prefix = "MODE_", value = {
+ MODE_NORMAL,
+ MODE_RINGTONE,
+ MODE_IN_CALL,
+ MODE_IN_COMMUNICATION,
+ MODE_CALL_SCREENING }
+ )
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface AudioMode {}
/* Routing bits for setRouting/getRouting API */
/**
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index 900572d..a3a8777 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -132,7 +132,8 @@
public static final int MODE_RINGTONE = 1;
public static final int MODE_IN_CALL = 2;
public static final int MODE_IN_COMMUNICATION = 3;
- public static final int NUM_MODES = 4;
+ public static final int MODE_CALL_SCREENING = 4;
+ public static final int NUM_MODES = 5;
public static String modeToString(int mode) {
switch (mode) {
@@ -142,6 +143,7 @@
case MODE_INVALID: return "MODE_INVALID";
case MODE_NORMAL: return "MODE_NORMAL";
case MODE_RINGTONE: return "MODE_RINGTONE";
+ case MODE_CALL_SCREENING: return "MODE_CALL_SCREENING";
default: return "unknown mode (" + mode + ")";
}
}
@@ -1130,6 +1132,11 @@
*/
public static native int setAudioHalPids(int[] pids);
+ /**
+ * @see AudioManager#isCallScreeningModeSupported()
+ */
+ public static native boolean isCallScreeningModeSupported();
+
// Items shared with audio service
/**
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index d6a4ea7..5ac6f7f 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -237,11 +237,56 @@
public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
/** Type is String. */
public static final String TAG_OECF = "OECF";
- /** Type is String. {@hide} */
+ /**
+ * <p>A tag used to record the offset from UTC (the time difference from Universal Time
+ * Coordinated including daylight saving time) of the time of DateTime tag. The format when
+ * recording the offset is "±HH:MM". The part of "±" shall be recorded as "+" or "-". When
+ * the offsets are unknown, all the character spaces except colons (":") should be filled
+ * with blank characters, or else the Interoperability field should be filled with blank
+ * characters. The character string length is 7 Bytes including NULL for termination. When
+ * the field is left blank, it is treated as unknown.</p>
+ *
+ * <ul>
+ * <li>Tag = 36880</li>
+ * <li>Type = String</li>
+ * <li>Length = 7</li>
+ * <li>Default = None</li>
+ * </ul>
+ */
public static final String TAG_OFFSET_TIME = "OffsetTime";
- /** Type is String. {@hide} */
+ /**
+ * <p>A tag used to record the offset from UTC (the time difference from Universal Time
+ * Coordinated including daylight saving time) of the time of DateTimeOriginal tag. The format
+ * when recording the offset is "±HH:MM". The part of "±" shall be recorded as "+" or "-". When
+ * the offsets are unknown, all the character spaces except colons (":") should be filled
+ * with blank characters, or else the Interoperability field should be filled with blank
+ * characters. The character string length is 7 Bytes including NULL for termination. When
+ * the field is left blank, it is treated as unknown.</p>
+ *
+ * <ul>
+ * <li>Tag = 36881</li>
+ * <li>Type = String</li>
+ * <li>Length = 7</li>
+ * <li>Default = None</li>
+ * </ul>
+ */
public static final String TAG_OFFSET_TIME_ORIGINAL = "OffsetTimeOriginal";
- /** Type is String. {@hide} */
+ /**
+ * <p>A tag used to record the offset from UTC (the time difference from Universal Time
+ * Coordinated including daylight saving time) of the time of DateTimeDigitized tag. The format
+ * when recording the offset is "±HH:MM". The part of "±" shall be recorded as "+" or "-". When
+ * the offsets are unknown, all the character spaces except colons (":") should be filled
+ * with blank characters, or else the Interoperability field should be filled with blank
+ * characters. The character string length is 7 Bytes including NULL for termination. When
+ * the field is left blank, it is treated as unknown.</p>
+ *
+ * <ul>
+ * <li>Tag = 36882</li>
+ * <li>Type = String</li>
+ * <li>Length = 7</li>
+ * <li>Default = None</li>
+ * </ul>
+ */
public static final String TAG_OFFSET_TIME_DIGITIZED = "OffsetTimeDigitized";
/** Type is int. */
public static final String TAG_PIXEL_X_DIMENSION = "PixelXDimension";
@@ -461,6 +506,26 @@
public static final int WHITEBALANCE_AUTO = 0;
public static final int WHITEBALANCE_MANUAL = 1;
+ /**
+ * Constant used to indicate that the input stream contains the full image data.
+ * <p>
+ * The format of the image data should follow one of the image formats supported by this class.
+ */
+ public static final int STREAM_TYPE_FULL_IMAGE_DATA = 0;
+ /**
+ * Constant used to indicate that the input stream contains only Exif data.
+ * <p>
+ * The format of the Exif-only data must follow the below structure:
+ * Exif Identifier Code ("Exif\0\0") + TIFF header + IFD data
+ * See JEITA CP-3451C Section 4.5.2 and 4.5.4 specifications for more details.
+ */
+ public static final int STREAM_TYPE_EXIF_DATA_ONLY = 1;
+
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({STREAM_TYPE_FULL_IMAGE_DATA, STREAM_TYPE_EXIF_DATA_ONLY})
+ public @interface ExifStreamType {}
+
// Maximum size for checking file type signature (see image_type_recognition_lite.cc)
private static final int SIGNATURE_CHECK_SIZE = 5000;
@@ -1371,7 +1436,7 @@
private AssetManager.AssetInputStream mAssetInputStream;
private boolean mIsInputStream;
private int mMimeType;
- private boolean mIsStandalone;
+ private boolean mIsExifDataOnly;
@UnsupportedAppUsage
private final HashMap[] mAttributes = new HashMap[EXIF_TAGS.length];
private Set<Integer> mHandledIfdOffsets = new HashSet<>(EXIF_TAGS.length);
@@ -1399,6 +1464,11 @@
/**
* Reads Exif tags from the specified image file.
+ *
+ * @param file the file of the image data
+ * @throws NullPointerException if file is null
+ * @throws IOException if an I/O error occurs while retrieving file descriptor via
+ * {@link FileInputStream#getFD()}.
*/
public ExifInterface(@NonNull File file) throws IOException {
if (file == null) {
@@ -1409,6 +1479,11 @@
/**
* Reads Exif tags from the specified image file.
+ *
+ * @param filename the name of the file of the image data
+ * @throws NullPointerException if file name is null
+ * @throws IOException if an I/O error occurs while retrieving file descriptor via
+ * {@link FileInputStream#getFD()}.
*/
public ExifInterface(@NonNull String filename) throws IOException {
if (filename == null) {
@@ -1421,6 +1496,11 @@
* Reads Exif tags from the specified image file descriptor. Attribute mutation is supported
* for writable and seekable file descriptors only. This constructor will not rewind the offset
* of the given file descriptor. Developers should close the file descriptor after use.
+ *
+ * @param fileDescriptor the file descriptor of the image data
+ * @throws NullPointerException if file descriptor is null
+ * @throws IOException if an error occurs while duplicating the file descriptor via
+ * {@link Os#dup(FileDescriptor)}.
*/
public ExifInterface(@NonNull FileDescriptor fileDescriptor) throws IOException {
if (fileDescriptor == null) {
@@ -1459,45 +1539,46 @@
/**
* Reads Exif tags from the specified image input stream. Attribute mutation is not supported
* for input streams. The given input stream will proceed from its current position. Developers
- * should close the input stream after use.
+ * should close the input stream after use. This constructor is not intended to be used with an
+ * input stream that performs any networking operations.
+ *
+ * @param inputStream the input stream that contains the image data
+ * @throws NullPointerException if the input stream is null
*/
public ExifInterface(@NonNull InputStream inputStream) throws IOException {
this(inputStream, false);
}
/**
- * Reads Exif tags from the specified standalone input stream. Standalone data refers to Exif
- * data that exists by itself and is not contained in a file format such as jpeg or png.
- * The format of the standalone data must follow the below structure:
- * Exif Identifier Code ("Exif\0\0") + TIFF header + IFD data
- * See JEITA CP-3451C Section 4.5.2 and 4.5.4 specifications for more details.
- * <p>
- * Attribute mutation is not supported for this constructor. The given input stream will proceed
- * from its current position. Developers should close the input stream after use. This
- * constructor is not intended to be used with an input stream that performs any networking
- * operations.
+ * Reads Exif tags from the specified image input stream based on the stream type. Attribute
+ * mutation is not supported for input streams. The given input stream will proceed from its
+ * current position. Developers should close the input stream after use. This constructor is not
+ * intended to be used with an input stream that performs any networking operations.
*
- * @throws IOException if the data does not follow the aforementioned structure.
+ * @param inputStream the input stream that contains the image data
+ * @param streamType the type of input stream
+ * @throws NullPointerException if the input stream is null
+ * @throws IOException if an I/O error occurs while retrieving file descriptor via
+ * {@link FileInputStream#getFD()}.
*/
- @NonNull
- public static ExifInterface fromStandalone(@NonNull InputStream inputStream)
+ public ExifInterface(@NonNull InputStream inputStream, @ExifStreamType int streamType)
throws IOException {
- if (isStandalone(inputStream)) {
- return new ExifInterface(inputStream, true);
- }
- throw new IOException("Given data does not follow the structure of a standalone exif "
- + "data.");
+ this(inputStream, (streamType == STREAM_TYPE_EXIF_DATA_ONLY) ? true : false);
}
- private ExifInterface(@NonNull InputStream inputStream, boolean isFromStandalone)
+ private ExifInterface(@NonNull InputStream inputStream, boolean shouldBeExifDataOnly)
throws IOException {
if (inputStream == null) {
throw new NullPointerException("inputStream cannot be null");
}
mFilename = null;
- if (isFromStandalone) {
- mIsStandalone = true;
+ if (shouldBeExifDataOnly) {
+ if (!isExifDataOnly(inputStream)) {
+ Log.w(TAG, "Given data does not follow the structure of an Exif-only data.");
+ return;
+ }
+ mIsExifDataOnly = true;
mAssetInputStream = null;
mSeekableFileDescriptor = null;
} else {
@@ -1835,10 +1916,9 @@
/**
* This function decides which parser to read the image data according to the given input stream
- * type and the content of the input stream. In each case, it reads the first three bytes to
- * determine whether the image data format is JPEG or not.
+ * type and the content of the input stream.
*/
- private void loadAttributes(@NonNull InputStream in) throws IOException {
+ private void loadAttributes(@NonNull InputStream in) {
if (in == null) {
throw new NullPointerException("inputstream shouldn't be null");
}
@@ -1849,7 +1929,7 @@
}
// Check file type
- if (!mIsStandalone) {
+ if (!mIsExifDataOnly) {
in = new BufferedInputStream(in, SIGNATURE_CHECK_SIZE);
mMimeType = getMimeType((BufferedInputStream) in);
}
@@ -1857,7 +1937,7 @@
// Create byte-ordered input stream
ByteOrderedDataInputStream inputStream = new ByteOrderedDataInputStream(in);
- if (!mIsStandalone) {
+ if (!mIsExifDataOnly) {
switch (mMimeType) {
case IMAGE_TYPE_JPEG: {
getJpegAttributes(inputStream, 0, IFD_TYPE_PRIMARY); // 0 is offset
@@ -1924,11 +2004,14 @@
}
}
- private static boolean isSeekableFD(FileDescriptor fd) throws IOException {
+ private static boolean isSeekableFD(FileDescriptor fd) {
try {
Os.lseek(fd, 0, OsConstants.SEEK_CUR);
return true;
} catch (ErrnoException e) {
+ if (DEBUG) {
+ Log.d(TAG, "The file descriptor for the given input is not seekable");
+ }
return false;
}
}
@@ -2194,7 +2277,7 @@
}
if (mHasThumbnail) {
- if (mIsStandalone) {
+ if (mIsExifDataOnly) {
return new long[] { mThumbnailOffset + mExifOffset, mThumbnailLength };
}
return new long[] { mThumbnailOffset, mThumbnailLength };
@@ -2658,16 +2741,20 @@
return true;
}
- private static boolean isStandalone(InputStream inputStream) throws IOException {
- byte[] signatureCheckBytes = new byte[IDENTIFIER_EXIF_APP1.length];
- inputStream.read(signatureCheckBytes);
-
- for (int i = 0; i < IDENTIFIER_EXIF_APP1.length; i++) {
- if (signatureCheckBytes[i] != IDENTIFIER_EXIF_APP1[i]) {
- return false;
+ private static boolean isExifDataOnly(InputStream inputStream) {
+ try {
+ byte[] signatureCheckBytes = new byte[IDENTIFIER_EXIF_APP1.length];
+ inputStream.read(signatureCheckBytes);
+ if (Arrays.equals(signatureCheckBytes, IDENTIFIER_EXIF_APP1)) {
+ return true;
+ }
+ } catch (IOException e) {
+ if (DEBUG) {
+ Log.w(TAG,
+ "Encountered error while checking whether input stream is Exif data only");
}
}
- return true;
+ return false;
}
/**
diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl
index fc05610..ef451ce 100644
--- a/media/java/android/media/IAudioService.aidl
+++ b/media/java/android/media/IAudioService.aidl
@@ -263,6 +263,8 @@
boolean hasHapticChannels(in Uri uri);
+ boolean isCallScreeningModeSupported();
+
// WARNING: read warning at top of file, new methods that need to be used by native
// code via IAudioManager.h need to be added to the top section.
}
diff --git a/media/java/android/media/IMediaRoute2Provider.aidl b/media/java/android/media/IMediaRoute2Provider.aidl
index 66764c7..d8fd1ff 100644
--- a/media/java/android/media/IMediaRoute2Provider.aidl
+++ b/media/java/android/media/IMediaRoute2Provider.aidl
@@ -24,7 +24,7 @@
*/
oneway interface IMediaRoute2Provider {
void setClient(IMediaRoute2ProviderClient client);
- void selectRoute(String packageName, String id);
+ void requestSelectRoute(String packageName, String id, int seq);
void unselectRoute(String packageName, String id);
void notifyControlRequestSent(String id, in Intent request);
void requestSetVolume(String id, int volume);
diff --git a/media/java/android/media/IMediaRouter2Client.aidl b/media/java/android/media/IMediaRouter2Client.aidl
index 72c33f99..b04af7d 100644
--- a/media/java/android/media/IMediaRouter2Client.aidl
+++ b/media/java/android/media/IMediaRouter2Client.aidl
@@ -17,6 +17,7 @@
package android.media;
import android.media.MediaRoute2Info;
+import android.os.Bundle;
/**
* @hide
@@ -26,4 +27,5 @@
void notifyRoutesAdded(in List<MediaRoute2Info> routes);
void notifyRoutesRemoved(in List<MediaRoute2Info> routes);
void notifyRoutesChanged(in List<MediaRoute2Info> routes);
+ void notifyRouteSelected(in MediaRoute2Info route, int reason, in Bundle controlHints);
}
diff --git a/media/java/android/media/IMediaRouterService.aidl b/media/java/android/media/IMediaRouterService.aidl
index 7b7a34e..ced8615 100644
--- a/media/java/android/media/IMediaRouterService.aidl
+++ b/media/java/android/media/IMediaRouterService.aidl
@@ -54,7 +54,7 @@
* @param client the client that changes it's selected route
* @param route the route to be selected
*/
- void selectRoute2(IMediaRouter2Client client, in @nullable MediaRoute2Info route);
+ void requestSelectRoute2(IMediaRouter2Client client, in @nullable MediaRoute2Info route);
void setControlCategories2(IMediaRouter2Client client, in List<String> categories);
void registerManager(IMediaRouter2Manager manager, String packageName);
diff --git a/media/java/android/media/MediaRoute2Info.java b/media/java/android/media/MediaRoute2Info.java
index 457ccb7..2380077 100644
--- a/media/java/android/media/MediaRoute2Info.java
+++ b/media/java/android/media/MediaRoute2Info.java
@@ -274,7 +274,7 @@
}
@Override
- public void writeToParcel(Parcel dest, int flags) {
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(mId);
dest.writeString(mProviderId);
dest.writeString(mName);
diff --git a/media/java/android/media/MediaRoute2ProviderInfo.java b/media/java/android/media/MediaRoute2ProviderInfo.java
index 8541f32..4f203de 100644
--- a/media/java/android/media/MediaRoute2ProviderInfo.java
+++ b/media/java/android/media/MediaRoute2ProviderInfo.java
@@ -95,8 +95,8 @@
* Gets the route for the given route id or null if no matching route exists.
*/
@Nullable
- public MediaRoute2Info getRoute(String routeId) {
- return mRoutes.get(routeId);
+ public MediaRoute2Info getRoute(@NonNull String routeId) {
+ return mRoutes.get(Objects.requireNonNull(routeId, "routeId must not be null"));
}
/**
@@ -113,7 +113,7 @@
}
@Override
- public void writeToParcel(Parcel dest, int flags) {
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(mUniqueId);
dest.writeTypedArrayMap(mRoutes, flags);
}
@@ -155,6 +155,7 @@
* </p>
* @hide
*/
+ @NonNull
public Builder setUniqueId(@Nullable String uniqueId) {
if (TextUtils.equals(mUniqueId, uniqueId)) {
return this;
@@ -174,6 +175,7 @@
/**
* Adds a route to the provider
*/
+ @NonNull
public Builder addRoute(@NonNull MediaRoute2Info route) {
Objects.requireNonNull(route, "route must not be null");
@@ -192,6 +194,7 @@
/**
* Adds a list of routes to the provider
*/
+ @NonNull
public Builder addRoutes(@NonNull Collection<MediaRoute2Info> routes) {
Objects.requireNonNull(routes, "routes must not be null");
diff --git a/media/java/android/media/MediaRoute2ProviderService.java b/media/java/android/media/MediaRoute2ProviderService.java
index 5f5d200..386d2dc 100644
--- a/media/java/android/media/MediaRoute2ProviderService.java
+++ b/media/java/android/media/MediaRoute2ProviderService.java
@@ -128,7 +128,9 @@
}
@Override
- public void selectRoute(String packageName, String id) {
+ public void requestSelectRoute(String packageName, String id, int seq) {
+ // TODO: When introducing MediaRoute2ProviderService#sendConnectionHints(),
+ // use the sequence number here properly.
mHandler.sendMessage(obtainMessage(MediaRoute2ProviderService::onSelectRoute,
MediaRoute2ProviderService.this, packageName, id));
}
diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java
index 86fa9db..74d26f0 100644
--- a/media/java/android/media/MediaRouter2.java
+++ b/media/java/android/media/MediaRouter2.java
@@ -30,6 +30,7 @@
import android.os.Looper;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.text.TextUtils;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
@@ -103,6 +104,8 @@
private MediaRoute2Info mSelectedRoute;
@GuardedBy("sLock")
+ private MediaRoute2Info mSelectingRoute;
+ @GuardedBy("sLock")
private Client mClient;
final Handler mHandler;
@@ -250,24 +253,28 @@
}
/**
- * Selects the specified route.
+ * Request to select the specified route. When the route is selected,
+ * {@link Callback#onRouteSelected(MediaRoute2Info, int, Bundle)} will be called.
*
* @param route the route to select
*/
- //TODO: add a parameter for category (e.g. mirroring/casting)
- public void selectRoute(@NonNull MediaRoute2Info route) {
+ public void requestSelectRoute(@NonNull MediaRoute2Info route) {
Objects.requireNonNull(route, "route must not be null");
Client client;
synchronized (sLock) {
- mSelectedRoute = route;
+ if (mSelectingRoute == route) {
+ Log.w(TAG, "The route selection request is already sent.");
+ return;
+ }
+ mSelectingRoute = route;
client = mClient;
}
if (client != null) {
try {
- mMediaRouterService.selectRoute2(client, route);
+ mMediaRouterService.requestSelectRoute2(client, route);
} catch (RemoteException ex) {
- Log.e(TAG, "Unable to select route.", ex);
+ Log.e(TAG, "Unable to request to select route.", ex);
}
}
}
@@ -443,6 +450,22 @@
}
}
+ void selectRouteOnHandler(MediaRoute2Info route, int reason, Bundle controlHints) {
+ synchronized (sLock) {
+ if (reason == SELECT_REASON_USER_SELECTED) {
+ if (mSelectingRoute == null
+ || !TextUtils.equals(mSelectingRoute.getUniqueId(), route.getUniqueId())) {
+ Log.w(TAG, "Ignoring invalid or outdated notifyRouteSelected call. "
+ + "selectingRoute=" + mSelectingRoute + " route=" + route);
+ return;
+ }
+ }
+ mSelectingRoute = null;
+ }
+ mSelectedRoute = route;
+ notifyRouteSelected(route, reason, controlHints);
+ }
+
private void refreshFilteredRoutes() {
List<MediaRoute2Info> filteredRoutes = new ArrayList<>();
@@ -475,12 +498,17 @@
}
}
+ private void notifyRouteSelected(MediaRoute2Info route, int reason, Bundle controlHints) {
+ for (CallbackRecord record: mCallbackRecords) {
+ record.mExecutor.execute(
+ () -> record.mCallback.onRouteSelected(route, reason, controlHints));
+ }
+ }
+
/**
* Interface for receiving events about media routing changes.
*/
public static class Callback {
- //TODO: clean up these callbacks
-
/**
* Called when routes are added.
* @param routes the list of routes that have been added. It's never empty.
@@ -505,20 +533,19 @@
*/
public void onRoutesChanged(@NonNull List<MediaRoute2Info> routes) {}
- // TODO: Make this callback be called when we add requestSelectRoute().
/**
* Called when a route is selected. Exactly one route can be selected at a time.
* @param route the selected route.
* @param reason the reason why the route is selected.
- * @param connectionHints An optional bundle of provider-specific arguments which may be
- * used to control the selected route. Can be empty.
+ * @param controlHints An optional bundle of provider-specific arguments which may be
+ * used to control the selected route. Can be empty.
* @see #SELECT_REASON_UNKNOWN
* @see #SELECT_REASON_USER_SELECTED
* @see #SELECT_REASON_FALLBACK
* @see #getSelectedRoute()
*/
public void onRouteSelected(@NonNull MediaRoute2Info route, @SelectReason int reason,
- @NonNull Bundle connectionHints) {}
+ @NonNull Bundle controlHints) {}
}
final class CallbackRecord {
@@ -560,5 +587,12 @@
mHandler.sendMessage(obtainMessage(MediaRouter2::changeRoutesOnHandler,
MediaRouter2.this, routes));
}
+
+ @Override
+ public void notifyRouteSelected(MediaRoute2Info route, int reason,
+ Bundle controlHints) {
+ mHandler.sendMessage(obtainMessage(MediaRouter2::selectRouteOnHandler,
+ MediaRouter2.this, route, reason, controlHints));
+ }
}
}
diff --git a/media/java/android/media/MediaScannerConnection.java b/media/java/android/media/MediaScannerConnection.java
index 7eec8d9..8d85724 100644
--- a/media/java/android/media/MediaScannerConnection.java
+++ b/media/java/android/media/MediaScannerConnection.java
@@ -197,7 +197,7 @@
private static Uri scanFileQuietly(ContentProviderClient client, File file) {
Uri uri = null;
try {
- uri = MediaStore.scanFile(client, file);
+ uri = MediaStore.scanFile(client, file.getCanonicalFile());
Log.d(TAG, "Scanned " + file + " to " + uri);
} catch (Exception e) {
Log.w(TAG, "Failed to scan " + file + ": " + e);
diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index 7d68d02..c91325a 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -17,6 +17,7 @@
package android.media.tv.tuner;
import android.annotation.Nullable;
+import android.media.tv.tuner.TunerConstants.DemuxPidType;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -35,6 +36,7 @@
private static final int MSG_ON_FRONTEND_EVENT = 1;
private static final int MSG_ON_FILTER_EVENT = 2;
private static final int MSG_ON_FILTER_STATUS = 3;
+ private static final int MSG_ON_LNB_EVENT = 4;
static {
System.loadLibrary("media_tv_tuner");
@@ -45,6 +47,9 @@
private Frontend mFrontend;
private EventHandler mHandler;
+ private List<Integer> mLnbIds;
+ private Lnb mLnb;
+
public Tuner() {
nativeSetup();
}
@@ -76,6 +81,12 @@
private native Filter nativeOpenFilter(int type, int subType, int bufferSize);
+ private native List<Integer> nativeGetLnbIds();
+ private native Lnb nativeOpenLnbById(int id);
+
+ private native Descrambler nativeOpenDescrambler();
+
+ private native Dvr nativeOpenDvr(int type, int bufferSize);
/**
* Frontend Callback.
@@ -89,6 +100,16 @@
}
/**
+ * LNB Callback.
+ */
+ public interface LnbCallback {
+ /**
+ * Invoked when there is a LNB event.
+ */
+ void onEvent(int lnbEventType);
+ }
+
+ /**
* Frontend Callback.
*/
public interface FilterCallback {
@@ -98,6 +119,20 @@
void onFilterStatus(int status);
}
+ /**
+ * DVR Callback.
+ */
+ public interface DvrCallback {
+ /**
+ * Invoked when record status changed.
+ */
+ void onRecordStatus(int status);
+ /**
+ * Invoked when playback status changed.
+ */
+ void onPlaybackStatus(int status);
+ }
+
@Nullable
private EventHandler createEventHandler() {
Looper looper;
@@ -129,6 +164,11 @@
}
break;
}
+ case MSG_ON_LNB_EVENT: {
+ if (mLnb != null && mLnb.mCallback != null) {
+ mLnb.mCallback.onEvent(msg.arg1);
+ }
+ }
default:
// fall through
}
@@ -193,6 +233,11 @@
private long mNativeContext;
private FilterCallback mCallback;
int mId;
+
+ private native boolean nativeStartFilter();
+ private native boolean nativeStopFilter();
+ private native boolean nativeFlushFilter();
+
private Filter(int id) {
mId = id;
}
@@ -203,6 +248,18 @@
mHandler.obtainMessage(MSG_ON_FILTER_STATUS, status, 0, this));
}
}
+
+ public boolean start() {
+ return nativeStartFilter();
+ }
+
+ public boolean stop() {
+ return nativeStopFilter();
+ }
+
+ public boolean flush() {
+ return nativeFlushFilter();
+ }
}
private Filter openFilter(int type, int subType, int bufferSize, FilterCallback cb) {
@@ -215,4 +272,103 @@
}
return filter;
}
+
+ protected class Lnb {
+ private int mId;
+ private LnbCallback mCallback;
+
+ private Lnb(int id) {
+ mId = id;
+ }
+
+ public void setCallback(@Nullable LnbCallback callback) {
+ mCallback = callback;
+ if (mCallback == null) {
+ return;
+ }
+ if (mHandler == null) {
+ mHandler = createEventHandler();
+ }
+ }
+ }
+
+ private List<Integer> getLnbIds() {
+ mLnbIds = nativeGetLnbIds();
+ return mLnbIds;
+ }
+
+ private Lnb openLnbById(int id) {
+ if (mLnbIds == null) {
+ mLnbIds = getLnbIds();
+ }
+ if (!mLnbIds.contains(id)) {
+ return null;
+ }
+ mLnb = nativeOpenLnbById(id);
+ return mLnb;
+ }
+
+ private void onLnbEvent(int eventType) {
+ if (mHandler != null) {
+ mHandler.sendMessage(mHandler.obtainMessage(MSG_ON_LNB_EVENT, eventType, 0));
+ }
+ }
+
+ protected class Descrambler {
+ private long mNativeContext;
+
+ private native boolean nativeAddPid(int pidType, int pid, Filter filter);
+ private native boolean nativeRemovePid(int pidType, int pid, Filter filter);
+
+ private Descrambler() {}
+
+ private boolean addPid(@DemuxPidType int pidType, int pid, Filter filter) {
+ return nativeAddPid(pidType, pid, filter);
+ }
+
+ private boolean removePid(@DemuxPidType int pidType, int pid, Filter filter) {
+ return nativeRemovePid(pidType, pid, filter);
+ }
+
+ }
+
+ private Descrambler openDescrambler() {
+ Descrambler descrambler = nativeOpenDescrambler();
+ return descrambler;
+ }
+
+ // TODO: consider splitting Dvr to Playback and Recording
+ protected class Dvr {
+ private long mNativeContext;
+ private DvrCallback mCallback;
+
+ private native boolean nativeAttachFilter(Filter filter);
+ private native boolean nativeDetachFilter(Filter filter);
+ private native boolean nativeStartDvr();
+ private native boolean nativeStopDvr();
+ private native boolean nativeFlushDvr();
+
+ private Dvr() {}
+
+ public boolean attachFilter(Filter filter) {
+ return nativeAttachFilter(filter);
+ }
+ public boolean detachFilter(Filter filter) {
+ return nativeDetachFilter(filter);
+ }
+ public boolean start() {
+ return nativeStartDvr();
+ }
+ public boolean stop() {
+ return nativeStopDvr();
+ }
+ public boolean flush() {
+ return nativeFlushDvr();
+ }
+ }
+
+ private Dvr openDvr(int type, int bufferSize) {
+ Dvr dvr = nativeOpenDvr(type, bufferSize);
+ return dvr;
+ }
}
diff --git a/media/java/android/media/tv/tuner/TunerConstants.java b/media/java/android/media/tv/tuner/TunerConstants.java
index 411882e..01f9367 100644
--- a/media/java/android/media/tv/tuner/TunerConstants.java
+++ b/media/java/android/media/tv/tuner/TunerConstants.java
@@ -67,6 +67,14 @@
public static final int DATA_FORMAT_ES = Constants.DataFormat.ES;
public static final int DATA_FORMAT_SHV_TLV = Constants.DataFormat.SHV_TLV;
+
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({DEMUX_T_PID, DEMUX_MMPT_PID})
+ public @interface DemuxPidType {}
+
+ public static final int DEMUX_T_PID = 1;
+ public static final int DEMUX_MMPT_PID = 2;
+
private TunerConstants() {
}
}
diff --git a/media/jni/android_media_MediaDrm.h b/media/jni/android_media_MediaDrm.h
index 3cfa65d..b1f544c 100644
--- a/media/jni/android_media_MediaDrm.h
+++ b/media/jni/android_media_MediaDrm.h
@@ -47,7 +47,7 @@
const ListenerArgs *args) = 0;
};
-struct JDrm : public BnDrmClient {
+struct JDrm : public IDrmClient {
static status_t IsCryptoSchemeSupported(const uint8_t uuid[16],
const String8 &mimeType,
DrmPlugin::SecurityLevel level,
diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 2640572..f5202fc 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -28,22 +28,64 @@
using ::android::hardware::Void;
using ::android::hardware::hidl_vec;
using ::android::hardware::tv::tuner::V1_0::DemuxFilterMainType;
+using ::android::hardware::tv::tuner::V1_0::DemuxMmtpPid;
+using ::android::hardware::tv::tuner::V1_0::DemuxTpid;
using ::android::hardware::tv::tuner::V1_0::DemuxTsFilterType;
using ::android::hardware::tv::tuner::V1_0::ITuner;
using ::android::hardware::tv::tuner::V1_0::Result;
struct fields_t {
- jfieldID context;
+ jfieldID tunerContext;
jfieldID filterContext;
+ jfieldID descramblerContext;
+ jfieldID dvrContext;
jmethodID frontendInitID;
jmethodID filterInitID;
+ jmethodID dvrInitID;
jmethodID onFrontendEventID;
jmethodID onFilterStatusID;
+ jmethodID lnbInitID;
+ jmethodID onLnbEventID;
+ jmethodID descramblerInitID;
};
static fields_t gFields;
namespace android {
+/////////////// LnbCallback ///////////////////////
+LnbCallback::LnbCallback(jweak tunerObj, LnbId id) : mObject(tunerObj), mId(id) {}
+
+Return<void> LnbCallback::onEvent(LnbEventType lnbEventType) {
+ ALOGD("LnbCallback::onEvent, type=%d", lnbEventType);
+ JNIEnv *env = AndroidRuntime::getJNIEnv();
+ env->CallVoidMethod(
+ mObject,
+ gFields.onLnbEventID,
+ (jint)lnbEventType);
+ return Void();
+}
+Return<void> LnbCallback::onDiseqcMessage(const hidl_vec<uint8_t>& /*diseqcMessage*/) {
+ ALOGD("LnbCallback::onDiseqcMessage");
+ return Void();
+}
+
+/////////////// DvrCallback ///////////////////////
+Return<void> DvrCallback::onRecordStatus(RecordStatus /*status*/) {
+ ALOGD("DvrCallback::onRecordStatus");
+ return Void();
+}
+
+Return<void> DvrCallback::onPlaybackStatus(PlaybackStatus /*status*/) {
+ ALOGD("DvrCallback::onPlaybackStatus");
+ return Void();
+}
+
+void DvrCallback::setDvr(const jobject dvr) {
+ ALOGD("FilterCallback::setDvr");
+ JNIEnv *env = AndroidRuntime::getJNIEnv();
+ mDvr = env->NewWeakGlobalRef(dvr);
+}
+
/////////////// FilterCallback ///////////////////////
//TODO: implement filter callback
Return<void> FilterCallback::onFilterEvent(const DemuxFilterEvent& /*filterEvent*/) {
@@ -175,6 +217,52 @@
(jint) jId);
}
+jobject JTuner::getLnbIds() {
+ ALOGD("JTuner::getLnbIds()");
+ mTuner->getLnbIds([&](Result, const hidl_vec<FrontendId>& lnbIds) {
+ mLnbIds = lnbIds;
+ });
+ if (mLnbIds.size() == 0) {
+ ALOGW("Lnb isn't available");
+ return NULL;
+ }
+
+ JNIEnv *env = AndroidRuntime::getJNIEnv();
+ jclass arrayListClazz = env->FindClass("java/util/ArrayList");
+ jmethodID arrayListAdd = env->GetMethodID(arrayListClazz, "add", "(Ljava/lang/Object;)Z");
+ jobject obj = env->NewObject(arrayListClazz, env->GetMethodID(arrayListClazz, "<init>", "()V"));
+
+ jclass integerClazz = env->FindClass("java/lang/Integer");
+ jmethodID intInit = env->GetMethodID(integerClazz, "<init>", "(I)V");
+
+ for (int i=0; i < mLnbIds.size(); i++) {
+ jobject idObj = env->NewObject(integerClazz, intInit, mLnbIds[i]);
+ env->CallBooleanMethod(obj, arrayListAdd, idObj);
+ }
+ return obj;
+}
+
+jobject JTuner::openLnbById(int id) {
+ sp<ILnb> lnbSp;
+ mTuner->openLnbById(id, [&](Result, const sp<ILnb>& lnb) {
+ lnbSp = lnb;
+ });
+ if (lnbSp == nullptr) {
+ ALOGE("Failed to open lnb");
+ return NULL;
+ }
+ mLnb = lnbSp;
+ sp<LnbCallback> lnbCb = new LnbCallback(mObject, id);
+ mLnb->setCallback(lnbCb);
+
+ JNIEnv *env = AndroidRuntime::getJNIEnv();
+ return env->NewObject(
+ env->FindClass("android/media/tv/tuner/Tuner$Lnb"),
+ gFields.lnbInitID,
+ mObject,
+ id);
+}
+
bool JTuner::openDemux() {
if (mTuner == nullptr) {
return false;
@@ -193,6 +281,33 @@
return true;
}
+jobject JTuner::openDescrambler() {
+ ALOGD("JTuner::openDescrambler");
+ if (mTuner == nullptr) {
+ return NULL;
+ }
+ sp<IDescrambler> descramblerSp;
+ mTuner->openDescrambler([&](Result, const sp<IDescrambler>& descrambler) {
+ descramblerSp = descrambler;
+ });
+
+ if (descramblerSp == NULL) {
+ return NULL;
+ }
+
+ JNIEnv *env = AndroidRuntime::getJNIEnv();
+ jobject descramblerObj =
+ env->NewObject(
+ env->FindClass("android/media/tv/tuner/Tuner$Descrambler"),
+ gFields.descramblerInitID,
+ mObject);
+
+ descramblerSp->incStrong(descramblerObj);
+ env->SetLongField(descramblerObj, gFields.descramblerContext, (jlong)descramblerSp.get());
+
+ return descramblerObj;
+}
+
jobject JTuner::openFilter(DemuxFilterType type, int bufferSize) {
if (mDemux == NULL) {
if (!openDemux()) {
@@ -231,6 +346,39 @@
return filterObj;
}
+jobject JTuner::openDvr(DvrType type, int bufferSize) {
+ ALOGD("JTuner::openDvr");
+ if (mDemux == NULL) {
+ if (!openDemux()) {
+ return NULL;
+ }
+ }
+ sp<IDvr> dvrSp;
+ sp<DvrCallback> callback = new DvrCallback();
+ mDemux->openDvr(type, bufferSize, callback,
+ [&](Result, const sp<IDvr>& dvr) {
+ dvrSp = dvr;
+ });
+
+ if (dvrSp == NULL) {
+ return NULL;
+ }
+
+ JNIEnv *env = AndroidRuntime::getJNIEnv();
+ jobject dvrObj =
+ env->NewObject(
+ env->FindClass("android/media/tv/tuner/Tuner$Dvr"),
+ gFields.dvrInitID,
+ mObject);
+
+ dvrSp->incStrong(dvrObj);
+ env->SetLongField(dvrObj, gFields.dvrContext, (jlong)dvrSp.get());
+
+ callback->setDvr(dvrObj);
+
+ return dvrObj;
+}
+
} // namespace android
////////////////////////////////////////////////////////////////////////////////
@@ -238,7 +386,7 @@
using namespace android;
static sp<JTuner> setTuner(JNIEnv *env, jobject thiz, const sp<JTuner> &tuner) {
- sp<JTuner> old = (JTuner *)env->GetLongField(thiz, gFields.context);
+ sp<JTuner> old = (JTuner *)env->GetLongField(thiz, gFields.tunerContext);
if (tuner != NULL) {
tuner->incStrong(thiz);
@@ -246,38 +394,71 @@
if (old != NULL) {
old->decStrong(thiz);
}
- env->SetLongField(thiz, gFields.context, (jlong)tuner.get());
+ env->SetLongField(thiz, gFields.tunerContext, (jlong)tuner.get());
return old;
}
static sp<JTuner> getTuner(JNIEnv *env, jobject thiz) {
- return (JTuner *)env->GetLongField(thiz, gFields.context);
+ return (JTuner *)env->GetLongField(thiz, gFields.tunerContext);
+}
+
+static sp<IDescrambler> getDescrambler(JNIEnv *env, jobject descrambler) {
+ return (IDescrambler *)env->GetLongField(descrambler, gFields.descramblerContext);
+}
+
+static DemuxPid getDemuxPid(int pidType, int pid) {
+ DemuxPid demuxPid;
+ if ((int)pidType == 1) {
+ demuxPid.tPid(static_cast<DemuxTpid>(pid));
+ } else if ((int)pidType == 2) {
+ demuxPid.mmtpPid(static_cast<DemuxMmtpPid>(pid));
+ }
+ return demuxPid;
}
static sp<IFilter> getFilter(JNIEnv *env, jobject filter) {
return (IFilter *)env->GetLongField(filter, gFields.filterContext);
}
+static sp<IDvr> getDvr(JNIEnv *env, jobject dvr) {
+ return (IDvr *)env->GetLongField(dvr, gFields.dvrContext);
+}
+
static void android_media_tv_Tuner_native_init(JNIEnv *env) {
jclass clazz = env->FindClass("android/media/tv/tuner/Tuner");
CHECK(clazz != NULL);
- gFields.context = env->GetFieldID(clazz, "mNativeContext", "J");
- CHECK(gFields.context != NULL);
+ gFields.tunerContext = env->GetFieldID(clazz, "mNativeContext", "J");
+ CHECK(gFields.tunerContext != NULL);
gFields.onFrontendEventID = env->GetMethodID(clazz, "onFrontendEvent", "(I)V");
+ gFields.onLnbEventID = env->GetMethodID(clazz, "onLnbEvent", "(I)V");
+
jclass frontendClazz = env->FindClass("android/media/tv/tuner/Tuner$Frontend");
gFields.frontendInitID =
env->GetMethodID(frontendClazz, "<init>", "(Landroid/media/tv/tuner/Tuner;I)V");
+ jclass lnbClazz = env->FindClass("android/media/tv/tuner/Tuner$Lnb");
+ gFields.lnbInitID =
+ env->GetMethodID(lnbClazz, "<init>", "(Landroid/media/tv/tuner/Tuner;I)V");
+
jclass filterClazz = env->FindClass("android/media/tv/tuner/Tuner$Filter");
gFields.filterContext = env->GetFieldID(filterClazz, "mNativeContext", "J");
gFields.filterInitID =
env->GetMethodID(filterClazz, "<init>", "(Landroid/media/tv/tuner/Tuner;I)V");
gFields.onFilterStatusID =
env->GetMethodID(filterClazz, "onFilterStatus", "(I)V");
+
+ jclass descramblerClazz = env->FindClass("android/media/tv/tuner/Tuner$Descrambler");
+ gFields.descramblerContext = env->GetFieldID(descramblerClazz, "mNativeContext", "J");
+ gFields.descramblerInitID =
+ env->GetMethodID(descramblerClazz, "<init>", "(Landroid/media/tv/tuner/Tuner;)V");
+
+ jclass dvrClazz = env->FindClass("android/media/tv/tuner/Tuner$Dvr");
+ gFields.dvrContext = env->GetFieldID(dvrClazz, "mNativeContext", "J");
+ gFields.dvrInitID = env->GetMethodID(dvrClazz, "<init>", "(Landroid/media/tv/tuner/Tuner;)V");
}
static void android_media_tv_Tuner_native_setup(JNIEnv *env, jobject thiz) {
@@ -295,6 +476,16 @@
return tuner->openFrontendById(id);
}
+static jobject android_media_tv_Tuner_get_lnb_ids(JNIEnv *env, jobject thiz) {
+ sp<JTuner> tuner = getTuner(env, thiz);
+ return tuner->getLnbIds();
+}
+
+static jobject android_media_tv_Tuner_open_lnb_by_id(JNIEnv *env, jobject thiz, jint id) {
+ sp<JTuner> tuner = getTuner(env, thiz);
+ return tuner->openLnbById(id);
+}
+
static jobject android_media_tv_Tuner_open_filter(
JNIEnv *env, jobject thiz, jint type, jint subType, jint bufferSize) {
sp<JTuner> tuner = getTuner(env, thiz);
@@ -308,7 +499,113 @@
return tuner->openFilter(filterType, bufferSize);
}
-static const JNINativeMethod gMethods[] = {
+static bool android_media_tv_Tuner_start_filter(JNIEnv *env, jobject filter) {
+ sp<IFilter> filterSp = getFilter(env, filter);
+ if (filterSp == NULL) {
+ ALOGD("Failed to start filter: filter not found");
+ return false;
+ }
+ return filterSp->start() == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_stop_filter(JNIEnv *env, jobject filter) {
+ sp<IFilter> filterSp = getFilter(env, filter);
+ if (filterSp == NULL) {
+ ALOGD("Failed to stop filter: filter not found");
+ return false;
+ }
+ return filterSp->stop() == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_flush_filter(JNIEnv *env, jobject filter) {
+ sp<IFilter> filterSp = getFilter(env, filter);
+ if (filterSp == NULL) {
+ ALOGD("Failed to flush filter: filter not found");
+ return false;
+ }
+ return filterSp->flush() == Result::SUCCESS;
+}
+
+static jobject android_media_tv_Tuner_open_descrambler(JNIEnv *env, jobject thiz) {
+ sp<JTuner> tuner = getTuner(env, thiz);
+ return tuner->openDescrambler();
+}
+
+static bool android_media_tv_Tuner_add_pid(
+ JNIEnv *env, jobject descrambler, jint pidType, jint pid, jobject filter) {
+ sp<IDescrambler> descramblerSp = getDescrambler(env, descrambler);
+ if (descramblerSp == NULL) {
+ return false;
+ }
+ sp<IFilter> filterSp = getFilter(env, filter);
+ Result result = descramblerSp->addPid(getDemuxPid((int)pidType, (int)pid), filterSp);
+ return result == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_remove_pid(
+ JNIEnv *env, jobject descrambler, jint pidType, jint pid, jobject filter) {
+ sp<IDescrambler> descramblerSp = getDescrambler(env, descrambler);
+ if (descramblerSp == NULL) {
+ return false;
+ }
+ sp<IFilter> filterSp = getFilter(env, filter);
+ Result result = descramblerSp->removePid(getDemuxPid((int)pidType, (int)pid), filterSp);
+ return result == Result::SUCCESS;
+}
+
+static jobject android_media_tv_Tuner_open_dvr(JNIEnv *env, jobject thiz, jint type, jint bufferSize) {
+ sp<JTuner> tuner = getTuner(env, thiz);
+ return tuner->openDvr(static_cast<DvrType>(type), bufferSize);
+}
+
+static bool android_media_tv_Tuner_attach_filter(JNIEnv *env, jobject dvr, jobject filter) {
+ sp<IDvr> dvrSp = getDvr(env, dvr);
+ sp<IFilter> filterSp = getFilter(env, filter);
+ if (dvrSp == NULL || filterSp == NULL) {
+ return false;
+ }
+ Result result = dvrSp->attachFilter(filterSp);
+ return result == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_detach_filter(JNIEnv *env, jobject dvr, jobject filter) {
+ sp<IDvr> dvrSp = getDvr(env, dvr);
+ sp<IFilter> filterSp = getFilter(env, filter);
+ if (dvrSp == NULL || filterSp == NULL) {
+ return false;
+ }
+ Result result = dvrSp->detachFilter(filterSp);
+ return result == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_start_dvr(JNIEnv *env, jobject dvr) {
+ sp<IDvr> dvrSp = getDvr(env, dvr);
+ if (dvrSp == NULL) {
+ ALOGD("Failed to start dvr: dvr not found");
+ return false;
+ }
+ return dvrSp->start() == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_stop_dvr(JNIEnv *env, jobject dvr) {
+ sp<IDvr> dvrSp = getDvr(env, dvr);
+ if (dvrSp == NULL) {
+ ALOGD("Failed to stop dvr: dvr not found");
+ return false;
+ }
+ return dvrSp->stop() == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_flush_dvr(JNIEnv *env, jobject dvr) {
+ sp<IDvr> dvrSp = getDvr(env, dvr);
+ if (dvrSp == NULL) {
+ ALOGD("Failed to flush dvr: dvr not found");
+ return false;
+ }
+ return dvrSp->flush() == Result::SUCCESS;
+}
+
+static const JNINativeMethod gTunerMethods[] = {
{ "nativeInit", "()V", (void *)android_media_tv_Tuner_native_init },
{ "nativeSetup", "()V", (void *)android_media_tv_Tuner_native_setup },
{ "nativeGetFrontendIds", "()Ljava/util/List;",
@@ -317,11 +614,67 @@
(void *)android_media_tv_Tuner_open_frontend_by_id },
{ "nativeOpenFilter", "(III)Landroid/media/tv/tuner/Tuner$Filter;",
(void *)android_media_tv_Tuner_open_filter },
+ { "nativeGetLnbIds", "()Ljava/util/List;",
+ (void *)android_media_tv_Tuner_get_lnb_ids },
+ { "nativeOpenLnbById", "(I)Landroid/media/tv/tuner/Tuner$Lnb;",
+ (void *)android_media_tv_Tuner_open_lnb_by_id },
+ { "nativeOpenDescrambler", "()Landroid/media/tv/tuner/Tuner$Descrambler;",
+ (void *)android_media_tv_Tuner_open_descrambler },
+ { "nativeOpenDvr", "(II)Landroid/media/tv/tuner/Tuner$Dvr;",
+ (void *)android_media_tv_Tuner_open_dvr },
};
-static int register_android_media_tv_Tuner(JNIEnv *env) {
- return AndroidRuntime::registerNativeMethods(
- env, "android/media/tv/tuner/Tuner", gMethods, NELEM(gMethods));
+static const JNINativeMethod gFilterMethods[] = {
+ { "nativeStartFilter", "()Z", (void *)android_media_tv_Tuner_start_filter },
+ { "nativeStopFilter", "()Z", (void *)android_media_tv_Tuner_stop_filter },
+ { "nativeFlushFilter", "()Z", (void *)android_media_tv_Tuner_flush_filter },
+};
+
+static const JNINativeMethod gDescramblerMethods[] = {
+ { "nativeAddPid", "(IILandroid/media/tv/tuner/Tuner$Filter;)Z",
+ (void *)android_media_tv_Tuner_add_pid },
+ { "nativeRemovePid", "(IILandroid/media/tv/tuner/Tuner$Filter;)Z",
+ (void *)android_media_tv_Tuner_remove_pid },
+};
+
+static const JNINativeMethod gDvrMethods[] = {
+ { "nativeAttachFilter", "(Landroid/media/tv/tuner/Tuner$Filter;)Z",
+ (void *)android_media_tv_Tuner_attach_filter },
+ { "nativeDetachFilter", "(Landroid/media/tv/tuner/Tuner$Filter;)Z",
+ (void *)android_media_tv_Tuner_detach_filter },
+ { "nativeStartDvr", "()Z", (void *)android_media_tv_Tuner_start_dvr },
+ { "nativeStopDvr", "()Z", (void *)android_media_tv_Tuner_stop_dvr },
+ { "nativeFlushDvr", "()Z", (void *)android_media_tv_Tuner_flush_dvr },
+};
+
+static bool register_android_media_tv_Tuner(JNIEnv *env) {
+ if (AndroidRuntime::registerNativeMethods(
+ env, "android/media/tv/tuner/Tuner", gTunerMethods, NELEM(gTunerMethods)) != JNI_OK) {
+ ALOGE("Failed to register tuner native methods");
+ return false;
+ }
+ if (AndroidRuntime::registerNativeMethods(
+ env, "android/media/tv/tuner/Tuner$Filter",
+ gFilterMethods,
+ NELEM(gFilterMethods)) != JNI_OK) {
+ ALOGE("Failed to register filter native methods");
+ return false;
+ }
+ if (AndroidRuntime::registerNativeMethods(
+ env, "android/media/tv/tuner/Tuner$Descrambler",
+ gDescramblerMethods,
+ NELEM(gDescramblerMethods)) != JNI_OK) {
+ ALOGE("Failed to register descrambler native methods");
+ return false;
+ }
+ if (AndroidRuntime::registerNativeMethods(
+ env, "android/media/tv/tuner/Tuner$Dvr",
+ gDvrMethods,
+ NELEM(gDvrMethods)) != JNI_OK) {
+ ALOGE("Failed to register dvr native methods");
+ return false;
+ }
+ return true;
}
jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
@@ -335,7 +688,7 @@
}
assert(env != NULL);
- if (register_android_media_tv_Tuner(env) != JNI_OK) {
+ if (!register_android_media_tv_Tuner(env)) {
ALOGE("ERROR: Tuner native registration failed\n");
return result;
}
diff --git a/media/jni/android_media_tv_Tuner.h b/media/jni/android_media_tv_Tuner.h
index ab48761..3bf6ec8 100644
--- a/media/jni/android_media_tv_Tuner.h
+++ b/media/jni/android_media_tv_Tuner.h
@@ -28,19 +28,47 @@
using ::android::hardware::tv::tuner::V1_0::DemuxFilterEvent;
using ::android::hardware::tv::tuner::V1_0::DemuxFilterStatus;
using ::android::hardware::tv::tuner::V1_0::DemuxFilterType;
+using ::android::hardware::tv::tuner::V1_0::DemuxPid;
+using ::android::hardware::tv::tuner::V1_0::DvrType;
using ::android::hardware::tv::tuner::V1_0::FrontendEventType;
using ::android::hardware::tv::tuner::V1_0::FrontendId;
using ::android::hardware::tv::tuner::V1_0::FrontendScanMessage;
using ::android::hardware::tv::tuner::V1_0::FrontendScanMessageType;
using ::android::hardware::tv::tuner::V1_0::IDemux;
+using ::android::hardware::tv::tuner::V1_0::IDescrambler;
+using ::android::hardware::tv::tuner::V1_0::IDvr;
+using ::android::hardware::tv::tuner::V1_0::IDvrCallback;
using ::android::hardware::tv::tuner::V1_0::IFilter;
using ::android::hardware::tv::tuner::V1_0::IFilterCallback;
using ::android::hardware::tv::tuner::V1_0::IFrontend;
using ::android::hardware::tv::tuner::V1_0::IFrontendCallback;
+using ::android::hardware::tv::tuner::V1_0::ILnb;
+using ::android::hardware::tv::tuner::V1_0::ILnbCallback;
using ::android::hardware::tv::tuner::V1_0::ITuner;
+using ::android::hardware::tv::tuner::V1_0::LnbEventType;
+using ::android::hardware::tv::tuner::V1_0::LnbId;
+using ::android::hardware::tv::tuner::V1_0::PlaybackStatus;
+using ::android::hardware::tv::tuner::V1_0::RecordStatus;
namespace android {
+struct LnbCallback : public ILnbCallback {
+ LnbCallback(jweak tunerObj, LnbId id);
+ virtual Return<void> onEvent(LnbEventType lnbEventType);
+ virtual Return<void> onDiseqcMessage(const hidl_vec<uint8_t>& diseqcMessage);
+ jweak mObject;
+ LnbId mId;
+};
+
+struct DvrCallback : public IDvrCallback {
+ virtual Return<void> onRecordStatus(RecordStatus status);
+ virtual Return<void> onPlaybackStatus(PlaybackStatus status);
+
+ void setDvr(const jobject dvr);
+private:
+ jweak mDvr;
+};
+
struct FilterCallback : public IFilterCallback {
virtual Return<void> onFilterEvent(const DemuxFilterEvent& filterEvent);
virtual Return<void> onFilterStatus(const DemuxFilterStatus status);
@@ -67,7 +95,12 @@
sp<ITuner> getTunerService();
jobject getFrontendIds();
jobject openFrontendById(int id);
+ jobject getLnbIds();
+ jobject openLnbById(int id);
jobject openFilter(DemuxFilterType type, int bufferSize);
+ jobject openDescrambler();
+ jobject openDvr(DvrType type, int bufferSize);
+
protected:
bool openDemux();
virtual ~JTuner();
@@ -78,6 +111,8 @@
static sp<ITuner> mTuner;
hidl_vec<FrontendId> mFeIds;
sp<IFrontend> mFe;
+ hidl_vec<LnbId> mLnbIds;
+ sp<ILnb> mLnb;
sp<IDemux> mDemux;
int mDemuxId;
};
diff --git a/media/lib/tvremote/OWNERS b/media/lib/tvremote/OWNERS
new file mode 100644
index 0000000..81d52e1
--- /dev/null
+++ b/media/lib/tvremote/OWNERS
@@ -0,0 +1,2 @@
+nutka@google.com
+skill@google.com
diff --git a/media/lib/tvremote/java/com/android/media/tv/remoteprovider/TvRemoteProvider.java b/media/lib/tvremote/java/com/android/media/tv/remoteprovider/TvRemoteProvider.java
index 35322ad..0bf0f97 100644
--- a/media/lib/tvremote/java/com/android/media/tv/remoteprovider/TvRemoteProvider.java
+++ b/media/lib/tvremote/java/com/android/media/tv/remoteprovider/TvRemoteProvider.java
@@ -19,18 +19,18 @@
import android.content.Context;
import android.media.tv.ITvRemoteProvider;
import android.media.tv.ITvRemoteServiceInput;
-import android.os.Handler;
import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
import android.os.RemoteException;
import android.util.Log;
+import java.util.LinkedList;
+
/**
* Base class for emote providers implemented in unbundled service.
* <p/>
* This object is not thread safe. It is only intended to be accessed on the
* {@link Context#getMainLooper main looper thread} of an application.
+ * The callback {@link #onInputBridgeConnected()} may be called from a different thread.
* </p><p>
* IMPORTANT: This class is effectively a system API for unbundled emote service, and
* must remain API stable. See README.txt in the root of this package for more information.
@@ -50,11 +50,9 @@
private static final String TAG = "TvRemoteProvider";
private static final boolean DEBUG_KEYS = false;
- private static final int MSG_SET_SERVICE_INPUT = 1;
- private static final int MSG_SEND_INPUTBRIDGE_CONNECTED = 2;
private final Context mContext;
private final ProviderStub mStub;
- private final ProviderHandler mHandler;
+ private final LinkedList<Runnable> mOpenBridgeRunnables;
private ITvRemoteServiceInput mRemoteServiceInput;
/**
@@ -67,7 +65,7 @@
public TvRemoteProvider(Context context) {
mContext = context.getApplicationContext();
mStub = new ProviderStub();
- mHandler = new ProviderHandler(mContext.getMainLooper());
+ mOpenBridgeRunnables = new LinkedList<Runnable>();
}
/**
@@ -77,7 +75,6 @@
return mContext;
}
-
/**
* Gets the Binder associated with the provider.
* <p>
@@ -105,7 +102,11 @@
* @param tvServiceInput sink defined in framework service
*/
private void setRemoteServiceInputSink(ITvRemoteServiceInput tvServiceInput) {
- mRemoteServiceInput = tvServiceInput;
+ synchronized (mOpenBridgeRunnables) {
+ mRemoteServiceInput = tvServiceInput;
+ }
+ mOpenBridgeRunnables.forEach(Runnable::run);
+ mOpenBridgeRunnables.clear();
}
/**
@@ -125,8 +126,25 @@
*/
public void openRemoteInputBridge(IBinder token, String name, int width, int height,
int maxPointers) throws RuntimeException {
+ synchronized (mOpenBridgeRunnables) {
+ if (mRemoteServiceInput == null) {
+ Log.d(TAG, "Delaying openRemoteInputBridge() for " + name);
+
+ mOpenBridgeRunnables.add(() -> {
+ try {
+ mRemoteServiceInput.openInputBridge(
+ token, name, width, height, maxPointers);
+ Log.d(TAG, "Delayed openRemoteInputBridge() for " + name + ": success");
+ } catch (RemoteException re) {
+ Log.e(TAG, "Delayed openRemoteInputBridge() for " + name + ": failure", re);
+ }
+ });
+ return;
+ }
+ }
try {
mRemoteServiceInput.openInputBridge(token, name, width, height, maxPointers);
+ Log.d(TAG, "openRemoteInputBridge() for " + name + ": success");
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
@@ -271,33 +289,12 @@
private final class ProviderStub extends ITvRemoteProvider.Stub {
@Override
public void setRemoteServiceInputSink(ITvRemoteServiceInput tvServiceInput) {
- mHandler.obtainMessage(MSG_SET_SERVICE_INPUT, tvServiceInput).sendToTarget();
+ TvRemoteProvider.this.setRemoteServiceInputSink(tvServiceInput);
}
@Override
public void onInputBridgeConnected(IBinder token) {
- mHandler.obtainMessage(MSG_SEND_INPUTBRIDGE_CONNECTED, 0, 0,
- (IBinder) token).sendToTarget();
- }
- }
-
- private final class ProviderHandler extends Handler {
- public ProviderHandler(Looper looper) {
- super(looper, null, true);
- }
-
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MSG_SET_SERVICE_INPUT: {
- setRemoteServiceInputSink((ITvRemoteServiceInput) msg.obj);
- break;
- }
- case MSG_SEND_INPUTBRIDGE_CONNECTED: {
- onInputBridgeConnected((IBinder) msg.obj);
- break;
- }
- }
+ TvRemoteProvider.this.onInputBridgeConnected(token);
}
}
}
diff --git a/media/lib/tvremote/tests/Android.bp b/media/lib/tvremote/tests/Android.bp
new file mode 100644
index 0000000..f00eed0
--- /dev/null
+++ b/media/lib/tvremote/tests/Android.bp
@@ -0,0 +1,15 @@
+android_test {
+ name: "TvRemoteTests",
+ srcs: ["src/**/*.java"],
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ "com.android.media.tv.remoteprovider",
+ ],
+ static_libs: [
+ "mockito-target-minus-junit4",
+ ],
+ platform_apis: true,
+ certificate: "platform",
+ privileged: true,
+}
diff --git a/media/lib/tvremote/tests/AndroidManifest.xml b/media/lib/tvremote/tests/AndroidManifest.xml
new file mode 100644
index 0000000..4f843f7
--- /dev/null
+++ b/media/lib/tvremote/tests/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.media.tv.remoteprovider">
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.media.tv.remoteprovider"
+ android:label="Tests for TV Remote"/>
+</manifest>
diff --git a/media/lib/tvremote/tests/src/com/android/media/tv/remoteprovider/TvRemoteProviderTest.java b/media/lib/tvremote/tests/src/com/android/media/tv/remoteprovider/TvRemoteProviderTest.java
new file mode 100644
index 0000000..c9ce5613
--- /dev/null
+++ b/media/lib/tvremote/tests/src/com/android/media/tv/remoteprovider/TvRemoteProviderTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2019 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.media.tv.remoteprovider;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.content.Context;
+import android.media.tv.ITvRemoteProvider;
+import android.media.tv.ITvRemoteServiceInput;
+import android.os.Binder;
+import android.os.IBinder;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import java.util.ArrayList;
+
+public class TvRemoteProviderTest extends AndroidTestCase {
+ private static final String TAG = TvRemoteProviderTest.class.getSimpleName();
+
+ @SmallTest
+ public void testOpenRemoteInputBridge() throws Exception {
+ Binder tokenA = new Binder();
+ Binder tokenB = new Binder();
+ Binder tokenC = new Binder();
+
+ class LocalTvRemoteProvider extends TvRemoteProvider {
+ private final ArrayList<IBinder> mTokens = new ArrayList<IBinder>();
+
+ LocalTvRemoteProvider(Context context) {
+ super(context);
+ }
+
+ @Override
+ public void onInputBridgeConnected(IBinder token) {
+ mTokens.add(token);
+ }
+
+ public boolean verifyTokens() {
+ return mTokens.size() == 3
+ && mTokens.contains(tokenA)
+ && mTokens.contains(tokenB)
+ && mTokens.contains(tokenC);
+ }
+ }
+
+ LocalTvRemoteProvider tvProvider = new LocalTvRemoteProvider(getContext());
+ ITvRemoteProvider binder = (ITvRemoteProvider) tvProvider.getBinder();
+
+ ITvRemoteServiceInput tvServiceInput = mock(ITvRemoteServiceInput.class);
+ doAnswer((i) -> {
+ binder.onInputBridgeConnected(i.getArgument(0));
+ return null;
+ }).when(tvServiceInput).openInputBridge(any(), any(), anyInt(), anyInt(), anyInt());
+
+ tvProvider.openRemoteInputBridge(tokenA, "A", 1, 1, 1);
+ tvProvider.openRemoteInputBridge(tokenB, "B", 1, 1, 1);
+ binder.setRemoteServiceInputSink(tvServiceInput);
+ tvProvider.openRemoteInputBridge(tokenC, "C", 1, 1, 1);
+
+ verify(tvServiceInput).openInputBridge(tokenA, "A", 1, 1, 1);
+ verify(tvServiceInput).openInputBridge(tokenB, "B", 1, 1, 1);
+ verify(tvServiceInput).openInputBridge(tokenC, "C", 1, 1, 1);
+ verifyNoMoreInteractions(tvServiceInput);
+
+ assertTrue(tvProvider.verifyTokens());
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
index 87a59df..f979fdd 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
@@ -284,11 +284,12 @@
ICameraDeviceCallbacks dummyCallbacks = new DummyCameraDeviceCallbacks();
String clientPackageName = getContext().getPackageName();
+ String clientFeatureId = getContext().getFeatureId();
ICameraDeviceUser cameraUser =
mUtils.getCameraService().connectDevice(
dummyCallbacks, String.valueOf(cameraId),
- clientPackageName,
+ clientPackageName, clientFeatureId,
ICameraService.USE_CALLING_UID);
assertNotNull(String.format("Camera %s was null", cameraId), cameraUser);
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java
index 30561ba..466c5f4 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java
@@ -238,11 +238,12 @@
ICameraDeviceCallbacks.Stub dummyCallbacks = new DummyCameraDeviceCallbacks();
String clientPackageName = getContext().getPackageName();
+ String clientFeatureId = getContext().getFeatureId();
mMockCb = spy(dummyCallbacks);
mCameraUser = mUtils.getCameraService().connectDevice(mMockCb, mCameraId,
- clientPackageName, ICameraService.USE_CALLING_UID);
+ clientPackageName, clientFeatureId, ICameraService.USE_CALLING_UID);
assertNotNull(String.format("Camera %s was null", mCameraId), mCameraUser);
mHandlerThread = new HandlerThread(TAG);
mHandlerThread.start();
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types
index ce022a8..cb04d92 100644
--- a/mime/java-res/android.mime.types
+++ b/mime/java-res/android.mime.types
@@ -73,6 +73,7 @@
?audio/3gpp 3gpp 3ga
?audio/aac-adts aac
?audio/ac3 ac3 a52
+?audio/amr amr
?audio/imelody imy
?audio/midi rtttl xmf
?audio/mobile-xmf mxmf
diff --git a/native/android/Android.bp b/native/android/Android.bp
index 91297b0..9d93c9b 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -36,7 +36,6 @@
srcs: [
"asset_manager.cpp",
- "choreographer.cpp",
"configuration.cpp",
"hardware_buffer_jni.cpp",
"input.cpp",
@@ -80,7 +79,7 @@
"libarect",
],
- whole_static_libs: ["libnativewindow"],
+ whole_static_libs: ["libnativedisplay", "libnativewindow"],
export_static_lib_headers: ["libarect"],
@@ -142,4 +141,4 @@
"aidl/com/android/internal/compat/IPlatformCompatNative.aidl",
],
path: "aidl",
-}
\ No newline at end of file
+}
diff --git a/native/android/choreographer.cpp b/native/android/choreographer.cpp
deleted file mode 100644
index 63e0734..0000000
--- a/native/android/choreographer.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-#define LOG_TAG "Choreographer"
-//#define LOG_NDEBUG 0
-
-#include <cinttypes>
-#include <queue>
-#include <thread>
-
-#include <android/choreographer.h>
-#include <androidfw/DisplayEventDispatcher.h>
-#include <gui/ISurfaceComposer.h>
-#include <gui/SurfaceComposerClient.h>
-#include <utils/Looper.h>
-#include <utils/Mutex.h>
-#include <utils/Timers.h>
-
-namespace android {
-
-static inline const char* toString(bool value) {
- return value ? "true" : "false";
-}
-
-struct FrameCallback {
- AChoreographer_frameCallback callback;
- AChoreographer_frameCallback64 callback64;
- void* data;
- nsecs_t dueTime;
-
- inline bool operator<(const FrameCallback& rhs) const {
- // Note that this is intentionally flipped because we want callbacks due sooner to be at
- // the head of the queue
- return dueTime > rhs.dueTime;
- }
-};
-
-
-class Choreographer : public DisplayEventDispatcher, public MessageHandler {
-public:
- void postFrameCallbackDelayed(AChoreographer_frameCallback cb,
- AChoreographer_frameCallback64 cb64, void* data, nsecs_t delay);
-
- enum {
- MSG_SCHEDULE_CALLBACKS = 0,
- MSG_SCHEDULE_VSYNC = 1
- };
- virtual void handleMessage(const Message& message) override;
-
- static Choreographer* getForThread();
-
-protected:
- virtual ~Choreographer() = default;
-
-private:
- explicit Choreographer(const sp<Looper>& looper);
- Choreographer(const Choreographer&) = delete;
-
- void dispatchVsync(nsecs_t timestamp, PhysicalDisplayId displayId, uint32_t count) override;
- void dispatchHotplug(nsecs_t timestamp, PhysicalDisplayId displayId, bool connected) override;
- void dispatchConfigChanged(nsecs_t timestamp, PhysicalDisplayId displayId,
- int32_t configId) override;
-
- void scheduleCallbacks();
-
- // Protected by mLock
- std::priority_queue<FrameCallback> mCallbacks;
-
- mutable Mutex mLock;
-
- const sp<Looper> mLooper;
- const std::thread::id mThreadId;
-};
-
-
-static thread_local Choreographer* gChoreographer;
-Choreographer* Choreographer::getForThread() {
- if (gChoreographer == nullptr) {
- sp<Looper> looper = Looper::getForThread();
- if (!looper.get()) {
- ALOGW("No looper prepared for thread");
- return nullptr;
- }
- gChoreographer = new Choreographer(looper);
- status_t result = gChoreographer->initialize();
- if (result != OK) {
- ALOGW("Failed to initialize");
- return nullptr;
- }
- }
- return gChoreographer;
-}
-
-Choreographer::Choreographer(const sp<Looper>& looper) :
- DisplayEventDispatcher(looper), mLooper(looper), mThreadId(std::this_thread::get_id()) {
-}
-
-void Choreographer::postFrameCallbackDelayed(
- AChoreographer_frameCallback cb, AChoreographer_frameCallback64 cb64, void* data, nsecs_t delay) {
- nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
- FrameCallback callback{cb, cb64, data, now + delay};
- {
- AutoMutex _l{mLock};
- mCallbacks.push(callback);
- }
- if (callback.dueTime <= now) {
- if (std::this_thread::get_id() != mThreadId) {
- Message m{MSG_SCHEDULE_VSYNC};
- mLooper->sendMessage(this, m);
- } else {
- scheduleVsync();
- }
- } else {
- Message m{MSG_SCHEDULE_CALLBACKS};
- mLooper->sendMessageDelayed(delay, this, m);
- }
-}
-
-void Choreographer::scheduleCallbacks() {
- AutoMutex _{mLock};
- nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
- if (mCallbacks.top().dueTime <= now) {
- ALOGV("choreographer %p ~ scheduling vsync", this);
- scheduleVsync();
- return;
- }
-}
-
-// TODO(b/74619554): The PhysicalDisplayId is ignored because SF only emits VSYNC events for the
-// internal display and DisplayEventReceiver::requestNextVsync only allows requesting VSYNC for
-// the internal display implicitly.
-void Choreographer::dispatchVsync(nsecs_t timestamp, PhysicalDisplayId, uint32_t) {
- std::vector<FrameCallback> callbacks{};
- {
- AutoMutex _l{mLock};
- nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
- while (!mCallbacks.empty() && mCallbacks.top().dueTime < now) {
- callbacks.push_back(mCallbacks.top());
- mCallbacks.pop();
- }
- }
- for (const auto& cb : callbacks) {
- if (cb.callback64 != nullptr) {
- cb.callback64(timestamp, cb.data);
- } else if (cb.callback != nullptr) {
- cb.callback(timestamp, cb.data);
- }
- }
-}
-
-void Choreographer::dispatchHotplug(nsecs_t, PhysicalDisplayId displayId, bool connected) {
- ALOGV("choreographer %p ~ received hotplug event (displayId=%"
- ANDROID_PHYSICAL_DISPLAY_ID_FORMAT ", connected=%s), ignoring.",
- this, displayId, toString(connected));
-}
-
-void Choreographer::dispatchConfigChanged(nsecs_t, PhysicalDisplayId displayId,
- int32_t configId) {
- ALOGV("choreographer %p ~ received config changed event (displayId=%"
- ANDROID_PHYSICAL_DISPLAY_ID_FORMAT ", configId=%s), ignoring.",
- this, displayId, toString(configId));
-}
-
-void Choreographer::handleMessage(const Message& message) {
- switch (message.what) {
- case MSG_SCHEDULE_CALLBACKS:
- scheduleCallbacks();
- break;
- case MSG_SCHEDULE_VSYNC:
- scheduleVsync();
- break;
- }
-}
-
-}
-
-/* Glue for the NDK interface */
-
-using android::Choreographer;
-
-static inline Choreographer* AChoreographer_to_Choreographer(AChoreographer* choreographer) {
- return reinterpret_cast<Choreographer*>(choreographer);
-}
-
-static inline AChoreographer* Choreographer_to_AChoreographer(Choreographer* choreographer) {
- return reinterpret_cast<AChoreographer*>(choreographer);
-}
-
-AChoreographer* AChoreographer_getInstance() {
- return Choreographer_to_AChoreographer(Choreographer::getForThread());
-}
-
-void AChoreographer_postFrameCallback(AChoreographer* choreographer,
- AChoreographer_frameCallback callback, void* data) {
- AChoreographer_to_Choreographer(choreographer)->postFrameCallbackDelayed(
- callback, nullptr, data, 0);
-}
-void AChoreographer_postFrameCallbackDelayed(AChoreographer* choreographer,
- AChoreographer_frameCallback callback, void* data, long delayMillis) {
- AChoreographer_to_Choreographer(choreographer)->postFrameCallbackDelayed(
- callback, nullptr, data, ms2ns(delayMillis));
-}
-void AChoreographer_postFrameCallback64(AChoreographer* choreographer,
- AChoreographer_frameCallback64 callback, void* data) {
- AChoreographer_to_Choreographer(choreographer)->postFrameCallbackDelayed(
- nullptr, callback, data, 0);
-}
-void AChoreographer_postFrameCallbackDelayed64(AChoreographer* choreographer,
- AChoreographer_frameCallback64 callback, void* data, uint32_t delayMillis) {
- AChoreographer_to_Choreographer(choreographer)->postFrameCallbackDelayed(
- nullptr, callback, data, ms2ns(delayMillis));
-}
diff --git a/native/android/libandroid_net.map.txt b/native/android/libandroid_net.map.txt
index be3531d..8d4e900 100644
--- a/native/android/libandroid_net.map.txt
+++ b/native/android/libandroid_net.map.txt
@@ -1,15 +1,19 @@
-# They are also all available to vendor code.
+# The following symbols marked with # llndk are available to vendor code.
+# Unlike other VNDK libraries where keeping backwards compatibility is required
+# only within a platform release, these symbols need much longer suppport
+# because the same LLNDK library serves for both system and vendor partition
+# which might be a few years old.
LIBANDROID_NET {
global:
# These functions have been part of the NDK since API 24.
- android_getaddrinfofornetwork; # vndk
- android_setsocknetwork; # vndk
- android_setprocnetwork; # vndk
+ android_getaddrinfofornetwork; # llndk
+ android_setsocknetwork; # llndk
+ android_setprocnetwork; # llndk
# These functions have been part of the NDK since API 29.
- android_res_cancel; # vndk
- android_res_nquery; # vndk
- android_res_nresult; # vndk
- android_res_nsend; # vndk
+ android_res_cancel; # llndk
+ android_res_nquery; # llndk
+ android_res_nresult; # llndk
+ android_res_nsend; # llndk
local:
*;
};
diff --git a/packages/CarSystemUI/res/layout/car_ongoing_privacy_chip.xml b/packages/CarSystemUI/res/layout/car_ongoing_privacy_chip.xml
deleted file mode 100644
index 918abd9..0000000
--- a/packages/CarSystemUI/res/layout/car_ongoing_privacy_chip.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 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.
--->
-
-<com.android.systemui.statusbar.car.privacy.OngoingPrivacyChip
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/car_privacy_chip"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_margin="@dimen/ongoing_appops_chip_margin"
- android:layout_toStartOf="@+id/clock_container"
- android:focusable="true"
- android:gravity="center_vertical|end"
- android:orientation="horizontal"
- android:paddingEnd="@dimen/ongoing_appops_chip_side_padding"
- android:paddingStart="@dimen/ongoing_appops_chip_side_padding"
- android:visibility="visible">
-
- <LinearLayout
- android:id="@+id/icons_container"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center_vertical|start"/>
-</com.android.systemui.statusbar.car.privacy.OngoingPrivacyChip>
\ No newline at end of file
diff --git a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
index 7299ddf..ce0d31c 100644
--- a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
+++ b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
@@ -65,8 +65,6 @@
/>
</FrameLayout>
- <include layout="@layout/car_ongoing_privacy_chip"/>
-
<FrameLayout
android:id="@+id/clock_container"
android:layout_width="wrap_content"
diff --git a/packages/CarSystemUI/res/values/dimens.xml b/packages/CarSystemUI/res/values/dimens.xml
index e2da91b..ee79653 100644
--- a/packages/CarSystemUI/res/values/dimens.xml
+++ b/packages/CarSystemUI/res/values/dimens.xml
@@ -59,18 +59,6 @@
<dimen name="car_keyline_1">24dp</dimen>
<dimen name="car_keyline_2">96dp</dimen>
<dimen name="car_keyline_3">128dp</dimen>
- <dimen name="privacy_chip_icon_height">36dp</dimen>
- <dimen name="privacy_chip_icon_padding_left">0dp</dimen>
- <dimen name="privacy_chip_icon_padding_right">0dp</dimen>
- <dimen name="privacy_chip_icon_padding_top">0dp</dimen>
- <dimen name="privacy_chip_icon_padding_bottom">0dp</dimen>
-
- <dimen name="privacy_chip_text_padding_left">0dp</dimen>
- <dimen name="privacy_chip_text_padding_right">0dp</dimen>
- <dimen name="privacy_chip_text_padding_top">0dp</dimen>
- <dimen name="privacy_chip_text_padding_bottom">0dp</dimen>
-
- <dimen name="privacy_chip_icon_max_height">100dp</dimen>
<!-- Height of icons in Ongoing App Ops dialog. Both App Op icon and application icon -->
<dimen name="ongoing_appops_dialog_icon_height">48dp</dimen>
@@ -86,16 +74,6 @@
<dimen name="ongoing_appops_chip_bg_padding">4dp</dimen>
<!-- Radius of Ongoing App Ops chip corners -->
<dimen name="ongoing_appops_chip_bg_corner_radius">12dp</dimen>
- <!-- Start padding for the app icon displayed in the dialog -->
- <dimen name="privacy_dialog_app_icon_padding_start">40dp</dimen>
- <!-- End padding for the app opps icon displayed in the dialog -->
- <dimen name="privacy_dialog_app_ops_icon_padding_end">40dp</dimen>
- <!-- Top padding for the list of application displayed in the dialog -->
- <dimen name="privacy_dialog_app_list_padding_top">20dp</dimen>
- <!-- Top padding for the dialog container-->
- <dimen name="privacy_dialog_container_padding_top">10dp</dimen>
- <!-- Top padding for the dialog title-->
- <dimen name="privacy_dialog_title_padding_start">10dp</dimen>
<!-- Car volume dimens. -->
<dimen name="car_volume_item_icon_size">@dimen/car_primary_icon_size</dimen>
diff --git a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java
index c35303e..2bd5fe2 100644
--- a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java
+++ b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java
@@ -19,36 +19,16 @@
import android.content.Context;
import com.android.systemui.dagger.SystemUIRootComponent;
-import com.android.systemui.navigationbar.car.CarFacetButtonController;
-
-import javax.inject.Singleton;
-
-import dagger.Component;
/**
* Class factory to provide car specific SystemUI components.
*/
public class CarSystemUIFactory extends SystemUIFactory {
- private CarDependencyComponent mCarDependencyComponent;
-
@Override
protected SystemUIRootComponent buildSystemUIRootComponent(Context context) {
- mCarDependencyComponent = DaggerCarSystemUIFactory_CarDependencyComponent.builder()
- .contextHolder(new ContextHolder(context))
- .build();
return DaggerCarSystemUIRootComponent.builder()
.contextHolder(new ContextHolder(context))
.build();
}
-
- public CarDependencyComponent getCarDependencyComponent() {
- return mCarDependencyComponent;
- }
-
- @Singleton
- @Component(modules = ContextHolder.class)
- public interface CarDependencyComponent {
- CarFacetButtonController getCarFacetButtonController();
- }
}
diff --git a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java
index 91d0026..bffc6b9 100644
--- a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java
+++ b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java
@@ -26,6 +26,7 @@
import com.android.systemui.dagger.SystemUIRootComponent;
import com.android.systemui.dock.DockManager;
import com.android.systemui.dock.DockManagerImpl;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.power.EnhancedEstimatesImpl;
import com.android.systemui.recents.Recents;
@@ -38,11 +39,13 @@
import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
+import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
+import com.android.systemui.statusbar.phone.KeyguardBypassController;
import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.phone.StatusBar;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
+import com.android.systemui.statusbar.policy.HeadsUpManager;
import com.android.systemui.volume.CarVolumeDialogComponent;
import com.android.systemui.volume.VolumeDialogComponent;
@@ -85,6 +88,17 @@
@Singleton
@Provides
+ static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,
+ StatusBarStateController statusBarStateController,
+ KeyguardBypassController bypassController) {
+ return new HeadsUpManagerPhone(context, statusBarStateController, bypassController);
+ }
+
+ @Binds
+ abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone);
+
+ @Singleton
+ @Provides
@Named(LEAK_REPORT_EMAIL_NAME)
static String provideLeakReportEmail() {
return "buganizer-system+181579@google.com";
@@ -101,7 +115,7 @@
abstract DockManager bindDockManager(DockManagerImpl dockManager);
@Binds
- abstract NotificationData.KeyguardEnvironment bindKeyguardEnvironment(
+ abstract NotificationEntryManager.KeyguardEnvironment bindKeyguardEnvironment(
KeyguardEnvironmentImpl keyguardEnvironment);
@Binds
diff --git a/packages/CarSystemUI/src/com/android/systemui/TEST_MAPPING b/packages/CarSystemUI/src/com/android/systemui/TEST_MAPPING
new file mode 100644
index 0000000..f90947c
--- /dev/null
+++ b/packages/CarSystemUI/src/com/android/systemui/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+ "auto-postsubmit": [
+ {
+ "name": "AndroidAutoUiTests",
+ "options" : [
+ {
+ "include-filter": "android.test.functional.auto.apps.HomeHelperTest"
+ }
+ ]
+ }
+ ]
+}
diff --git a/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java b/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java
index 53a88a9..ed945e7 100644
--- a/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java
+++ b/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java
@@ -19,8 +19,9 @@
import android.service.notification.StatusBarNotification;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
+import com.android.systemui.statusbar.notification.collection.NotificationRankingManager;
import com.android.systemui.statusbar.notification.logging.NotifLog;
+import com.android.systemui.statusbar.phone.NotificationGroupManager;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -35,8 +36,12 @@
public class CarNotificationEntryManager extends NotificationEntryManager {
@Inject
- public CarNotificationEntryManager(NotificationData notificationData, NotifLog notifLog) {
- super(notificationData, notifLog);
+ public CarNotificationEntryManager(
+ NotifLog notifLog,
+ NotificationGroupManager groupManager,
+ NotificationRankingManager rankingManager,
+ KeyguardEnvironment keyguardEnvironment) {
+ super(notifLog, groupManager, rankingManager, keyguardEnvironment);
}
@Override
diff --git a/packages/CarSystemUI/src/com/android/systemui/car/CarServiceProvider.java b/packages/CarSystemUI/src/com/android/systemui/car/CarServiceProvider.java
new file mode 100644
index 0000000..80ee371
--- /dev/null
+++ b/packages/CarSystemUI/src/com/android/systemui/car/CarServiceProvider.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.car;
+
+import android.car.Car;
+import android.content.Context;
+
+import androidx.annotation.VisibleForTesting;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/** Provides a common connection to the car service that can be shared. */
+@Singleton
+public class CarServiceProvider {
+
+ private final Context mContext;
+ private final List<CarServiceOnConnectedListener> mListeners = new ArrayList<>();
+ private Car mCar;
+
+ @Inject
+ public CarServiceProvider(Context context) {
+ mContext = context;
+ mCar = Car.createCar(mContext, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT,
+ (car, ready) -> {
+ mCar = car;
+
+ synchronized (mListeners) {
+ for (CarServiceOnConnectedListener listener : mListeners) {
+ if (ready) {
+ listener.onConnected(mCar);
+ }
+ }
+ }
+ });
+ }
+
+ @VisibleForTesting
+ public CarServiceProvider(Context context, Car car) {
+ mContext = context;
+ mCar = car;
+ }
+
+ /**
+ * Let's other components hook into the connection to the car service. If we're already
+ * connected to the car service, the callback is immediately triggered.
+ */
+ public void addListener(CarServiceOnConnectedListener listener) {
+ if (mCar.isConnected()) {
+ listener.onConnected(mCar);
+ }
+ mListeners.add(listener);
+ }
+
+ /**
+ * Listener which is triggered when Car Service is connected.
+ */
+ public interface CarServiceOnConnectedListener {
+ /** This will be called when the car service has successfully been connected. */
+ void onConnected(Car car);
+ }
+}
diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButton.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButton.java
index c46e6e7..0b89992 100644
--- a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButton.java
+++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButton.java
@@ -29,9 +29,7 @@
import android.widget.LinearLayout;
import com.android.keyguard.AlphaOptimizedImageButton;
-import com.android.systemui.CarSystemUIFactory;
import com.android.systemui.R;
-import com.android.systemui.SystemUIFactory;
/**
* CarFacetButton is a ui component designed to be used as a shortcut for an app of a defined
@@ -82,10 +80,6 @@
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.CarFacetButton);
setupIntents(typedArray);
setupIcons(typedArray);
- CarSystemUIFactory factory = SystemUIFactory.getInstance();
- CarFacetButtonController carFacetButtonController = factory.getCarDependencyComponent()
- .getCarFacetButtonController();
- carFacetButtonController.addFacetButton(this);
}
/**
diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButtonController.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButtonController.java
index 30f63f0..f66e828 100644
--- a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButtonController.java
+++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarFacetButtonController.java
@@ -43,6 +43,8 @@
@Singleton
public class CarFacetButtonController {
+ private final Set<CarFacetButton> mRegisteredViews = new HashSet<>();
+
protected ButtonMap mButtonsByCategory = new ButtonMap();
protected ButtonMap mButtonsByPackage = new ButtonMap();
protected ButtonMap mButtonsByComponentName = new ButtonMap();
@@ -60,7 +62,11 @@
* to get a reference to this controller via {@link com.android.systemui.Dependency}
* and self add.
*/
- public void addFacetButton(CarFacetButton facetButton) {
+ private void addFacetButton(CarFacetButton facetButton) {
+ if (mRegisteredViews.contains(facetButton)) {
+ return;
+ }
+
String[] categories = facetButton.getCategories();
for (int i = 0; i < categories.length; i++) {
mButtonsByCategory.add(categories[i], facetButton);
@@ -74,6 +80,8 @@
for (int i = 0; i < componentNames.length; i++) {
mButtonsByComponentName.add(componentNames[i], facetButton);
}
+
+ mRegisteredViews.add(facetButton);
}
/** Removes all buttons from the button maps. */
@@ -82,6 +90,7 @@
mButtonsByPackage.clear();
mButtonsByComponentName.clear();
mSelectedFacetButtons.clear();
+ mRegisteredViews.clear();
}
/**
diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java
index af92767..08ab492 100644
--- a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java
@@ -37,6 +37,7 @@
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.NavigationBarController;
+import com.android.systemui.statusbar.SuperStatusBarViewFactory;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -54,10 +55,12 @@
private final WindowManager mWindowManager;
private final DeviceProvisionedController mDeviceProvisionedController;
private final CommandQueue mCommandQueue;
- private final Lazy<FacetButtonTaskStackListener> mFacetButtonTaskStackListener;
+ private final Lazy<FacetButtonTaskStackListener> mFacetButtonTaskStackListenerLazy;
private final Handler mMainHandler;
- private final Lazy<KeyguardStateController> mKeyguardStateController;
- private final Lazy<NavigationBarController> mNavigationBarController;
+ private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy;
+ private final Lazy<NavigationBarController> mNavigationBarControllerLazy;
+ private final SuperStatusBarViewFactory mSuperStatusBarViewFactory;
+ private final Lazy<CarFacetButtonController> mCarFacetButtonControllerLazy;
private IStatusBarService mBarService;
private ActivityManagerWrapper mActivityManagerWrapper;
@@ -67,10 +70,12 @@
private boolean mBottomNavBarVisible;
// Nav bar views.
- private ViewGroup mNavigationBarWindow;
+ private ViewGroup mTopNavigationBarWindow;
+ private ViewGroup mBottomNavigationBarWindow;
private ViewGroup mLeftNavigationBarWindow;
private ViewGroup mRightNavigationBarWindow;
- private CarNavigationBarView mNavigationBarView;
+ private CarNavigationBarView mTopNavigationBarView;
+ private CarNavigationBarView mBottomNavigationBarView;
private CarNavigationBarView mLeftNavigationBarView;
private CarNavigationBarView mRightNavigationBarView;
@@ -84,19 +89,23 @@
WindowManager windowManager,
DeviceProvisionedController deviceProvisionedController,
CommandQueue commandQueue,
- Lazy<FacetButtonTaskStackListener> facetButtonTaskStackListener,
+ Lazy<FacetButtonTaskStackListener> facetButtonTaskStackListenerLazy,
@MainHandler Handler mainHandler,
- Lazy<KeyguardStateController> keyguardStateController,
- Lazy<NavigationBarController> navigationBarController) {
+ Lazy<KeyguardStateController> keyguardStateControllerLazy,
+ Lazy<NavigationBarController> navigationBarControllerLazy,
+ SuperStatusBarViewFactory superStatusBarViewFactory,
+ Lazy<CarFacetButtonController> carFacetButtonControllerLazy) {
super(context);
mCarNavigationBarController = carNavigationBarController;
mWindowManager = windowManager;
mDeviceProvisionedController = deviceProvisionedController;
mCommandQueue = commandQueue;
- mFacetButtonTaskStackListener = facetButtonTaskStackListener;
+ mFacetButtonTaskStackListenerLazy = facetButtonTaskStackListenerLazy;
mMainHandler = mainHandler;
- mKeyguardStateController = keyguardStateController;
- mNavigationBarController = navigationBarController;
+ mKeyguardStateControllerLazy = keyguardStateControllerLazy;
+ mNavigationBarControllerLazy = navigationBarControllerLazy;
+ mSuperStatusBarViewFactory = superStatusBarViewFactory;
+ mCarFacetButtonControllerLazy = carFacetButtonControllerLazy;
}
@Override
@@ -137,7 +146,7 @@
createNavigationBar(result);
mActivityManagerWrapper = ActivityManagerWrapper.getInstance();
- mActivityManagerWrapper.registerTaskStackListener(mFacetButtonTaskStackListener.get());
+ mActivityManagerWrapper.registerTaskStackListener(mFacetButtonTaskStackListenerLazy.get());
mCarNavigationBarController.connectToHvac();
}
@@ -158,10 +167,16 @@
// remove and reattach all hvac components such that we don't keep a reference to unused
// ui elements
mCarNavigationBarController.removeAllFromHvac();
+ mCarFacetButtonControllerLazy.get().removeAll();
- if (mNavigationBarWindow != null) {
- mNavigationBarWindow.removeAllViews();
- mNavigationBarView = null;
+ if (mTopNavigationBarWindow != null) {
+ mTopNavigationBarWindow.removeAllViews();
+ mTopNavigationBarView = null;
+ }
+
+ if (mBottomNavigationBarWindow != null) {
+ mBottomNavigationBarWindow.removeAllViews();
+ mBottomNavigationBarView = null;
}
if (mLeftNavigationBarWindow != null) {
@@ -177,8 +192,8 @@
buildNavBarContent();
// If the UI was rebuilt (day/night change) while the keyguard was up we need to
// correctly respect that state.
- if (mKeyguardStateController.get().isShowing()) {
- updateNavBarForKeyguardContent();
+ if (mKeyguardStateControllerLazy.get().isShowing()) {
+ mCarNavigationBarController.showAllKeyguardButtons(mDeviceIsSetUpForUser);
}
}
@@ -196,20 +211,28 @@
// There has been a car customized nav bar on the default display, so just create nav bars
// on external displays.
- mNavigationBarController.get().createNavigationBars(/* includeDefaultDisplay= */ false,
+ mNavigationBarControllerLazy.get().createNavigationBars(/* includeDefaultDisplay= */ false,
result);
}
private void buildNavBarWindows() {
- mNavigationBarWindow = mCarNavigationBarController.getBottomWindow();
+ mTopNavigationBarWindow = mSuperStatusBarViewFactory
+ .getStatusBarWindowView()
+ .findViewById(R.id.car_top_navigation_bar_container);
+ mBottomNavigationBarWindow = mCarNavigationBarController.getBottomWindow();
mLeftNavigationBarWindow = mCarNavigationBarController.getLeftWindow();
mRightNavigationBarWindow = mCarNavigationBarController.getRightWindow();
}
private void buildNavBarContent() {
- mNavigationBarView = mCarNavigationBarController.getBottomBar(mDeviceIsSetUpForUser);
- if (mNavigationBarView != null) {
- mNavigationBarWindow.addView(mNavigationBarView);
+ mTopNavigationBarView = mCarNavigationBarController.getTopBar(mDeviceIsSetUpForUser);
+ if (mTopNavigationBarView != null) {
+ mTopNavigationBarWindow.addView(mTopNavigationBarView);
+ }
+
+ mBottomNavigationBarView = mCarNavigationBarController.getBottomBar(mDeviceIsSetUpForUser);
+ if (mBottomNavigationBarView != null) {
+ mBottomNavigationBarWindow.addView(mBottomNavigationBarView);
}
mLeftNavigationBarView = mCarNavigationBarController.getLeftBar(mDeviceIsSetUpForUser);
@@ -224,7 +247,7 @@
}
private void attachNavBarWindows() {
- if (mNavigationBarWindow != null && !mBottomNavBarVisible) {
+ if (mBottomNavigationBarWindow != null && !mBottomNavBarVisible) {
mBottomNavBarVisible = true;
WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
@@ -237,7 +260,7 @@
PixelFormat.TRANSLUCENT);
lp.setTitle("CarNavigationBar");
lp.windowAnimations = 0;
- mWindowManager.addView(mNavigationBarWindow, lp);
+ mWindowManager.addView(mBottomNavigationBarWindow, lp);
}
if (mLeftNavigationBarWindow != null) {
@@ -297,23 +320,11 @@
isKeyboardVisible ? View.GONE : View.VISIBLE);
}
- private void updateNavBarForKeyguardContent() {
- if (mNavigationBarView != null) {
- mNavigationBarView.showKeyguardButtons();
- }
- if (mLeftNavigationBarView != null) {
- mLeftNavigationBarView.showKeyguardButtons();
- }
- if (mRightNavigationBarView != null) {
- mRightNavigationBarView.showKeyguardButtons();
- }
- }
-
@Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
pw.print(" mTaskStackListener=");
- pw.println(mFacetButtonTaskStackListener.get());
- pw.print(" mNavigationBarView=");
- pw.println(mNavigationBarView);
+ pw.println(mFacetButtonTaskStackListenerLazy.get());
+ pw.print(" mBottomNavigationBarView=");
+ pw.println(mBottomNavigationBarView);
}
}
diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarController.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarController.java
index 6bed69b..6f28843 100644
--- a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarController.java
+++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarController.java
@@ -24,8 +24,7 @@
import androidx.annotation.Nullable;
import com.android.systemui.R;
-import com.android.systemui.statusbar.car.hvac.HvacController;
-import com.android.systemui.statusbar.car.hvac.TemperatureView;
+import com.android.systemui.navigationbar.car.hvac.HvacController;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -38,6 +37,7 @@
private final Context mContext;
private final NavigationBarViewFactory mNavigationBarViewFactory;
+ private final Lazy<CarFacetButtonController> mCarFacetButtonControllerLazy;
private final Lazy<HvacController> mHvacControllerLazy;
private boolean mShowBottom;
@@ -58,9 +58,11 @@
@Inject
public CarNavigationBarController(Context context,
NavigationBarViewFactory navigationBarViewFactory,
+ Lazy<CarFacetButtonController> carFacetButtonControllerLazy,
Lazy<HvacController> hvacControllerLazy) {
mContext = context;
mNavigationBarViewFactory = navigationBarViewFactory;
+ mCarFacetButtonControllerLazy = carFacetButtonControllerLazy;
mHvacControllerLazy = hvacControllerLazy;
// Read configuration.
@@ -129,9 +131,7 @@
@NonNull
public CarNavigationBarView getTopBar(boolean isSetUp) {
mTopView = mNavigationBarViewFactory.getTopBar(isSetUp);
- mTopView.setStatusBarWindowTouchListener(mTopBarTouchListener);
- mTopView.setNotificationsPanelController(mNotificationsShadeController);
- addTemperatureViewToController(mTopView);
+ setupBar(mTopView, mTopBarTouchListener, mNotificationsShadeController);
return mTopView;
}
@@ -143,9 +143,7 @@
}
mBottomView = mNavigationBarViewFactory.getBottomBar(isSetUp);
- mBottomView.setStatusBarWindowTouchListener(mBottomBarTouchListener);
- mBottomView.setNotificationsPanelController(mNotificationsShadeController);
- addTemperatureViewToController(mBottomView);
+ setupBar(mBottomView, mBottomBarTouchListener, mNotificationsShadeController);
return mBottomView;
}
@@ -157,9 +155,7 @@
}
mLeftView = mNavigationBarViewFactory.getLeftBar(isSetUp);
- mLeftView.setStatusBarWindowTouchListener(mLeftBarTouchListener);
- mLeftView.setNotificationsPanelController(mNotificationsShadeController);
- addTemperatureViewToController(mLeftView);
+ setupBar(mLeftView, mLeftBarTouchListener, mNotificationsShadeController);
return mLeftView;
}
@@ -171,12 +167,18 @@
}
mRightView = mNavigationBarViewFactory.getRightBar(isSetUp);
- mRightView.setStatusBarWindowTouchListener(mRightBarTouchListener);
- mRightView.setNotificationsPanelController(mNotificationsShadeController);
- addTemperatureViewToController(mRightView);
+ setupBar(mRightView, mRightBarTouchListener, mNotificationsShadeController);
return mRightView;
}
+ private void setupBar(CarNavigationBarView view, View.OnTouchListener statusBarTouchListener,
+ NotificationsShadeController notifShadeController) {
+ view.setStatusBarWindowTouchListener(statusBarTouchListener);
+ view.setNotificationsPanelController(notifShadeController);
+ mCarFacetButtonControllerLazy.get().addAllFacetButtons(view);
+ mHvacControllerLazy.get().addTemperatureViewToController(view);
+ }
+
/** Sets a touch listener for the top navigation bar. */
public void registerTopBarTouchListener(View.OnTouchListener listener) {
mTopBarTouchListener = listener;
@@ -290,17 +292,6 @@
void togglePanel();
}
- private void addTemperatureViewToController(View v) {
- if (v instanceof TemperatureView) {
- mHvacControllerLazy.get().addHvacTextView((TemperatureView) v);
- } else if (v instanceof ViewGroup) {
- ViewGroup viewGroup = (ViewGroup) v;
- for (int i = 0; i < viewGroup.getChildCount(); i++) {
- addTemperatureViewToController(viewGroup.getChildAt(i));
- }
- }
- }
-
private void checkAllBars(boolean isSetUp) {
mTopView = getTopBar(isSetUp);
mBottomView = getBottomBar(isSetUp);
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/HvacController.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/HvacController.java
similarity index 76%
rename from packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/HvacController.java
rename to packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/HvacController.java
index 41914d2..fd9c488 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/HvacController.java
+++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/HvacController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2019 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.
@@ -14,42 +14,45 @@
* limitations under the License.
*/
-package com.android.systemui.statusbar.car.hvac;
+package com.android.systemui.navigationbar.car.hvac;
import static android.car.VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL;
import static android.car.VehiclePropertyIds.HVAC_TEMPERATURE_DISPLAY_UNITS;
import android.car.Car;
-import android.car.Car.CarServiceLifecycleListener;
import android.car.VehicleUnit;
import android.car.hardware.CarPropertyValue;
import android.car.hardware.hvac.CarHvacManager;
import android.car.hardware.hvac.CarHvacManager.CarHvacEventCallback;
-import android.content.Context;
-import android.os.Handler;
import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.systemui.car.CarServiceProvider;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
/**
* Manages the connection to the Car service and delegates value changes to the registered
* {@link TemperatureView}s
*/
+@Singleton
public class HvacController {
-
public static final String TAG = "HvacController";
- public static final int BIND_TO_HVAC_RETRY_DELAY = 5000;
- private Context mContext;
- private Handler mHandler;
- private Car mCar;
+ private final CarServiceProvider mCarServiceProvider;
+ private final Set<TemperatureView> mRegisteredViews = new HashSet<>();
+
private CarHvacManager mHvacManager;
private HashMap<HvacKey, List<TemperatureView>> mTempComponents = new HashMap<>();
@@ -85,22 +88,20 @@
}
};
- private final CarServiceLifecycleListener mCarServiceLifecycleListener = (car, ready) -> {
- if (!ready) {
- return;
- }
- try {
- mHvacManager = (CarHvacManager) car.getCarManager(Car.HVAC_SERVICE);
- mHvacManager.registerCallback(mHardwareCallback);
- initComponents();
- } catch (Exception e) {
- Log.e(TAG, "Failed to correctly connect to HVAC", e);
- }
- };
+ private final CarServiceProvider.CarServiceOnConnectedListener mCarServiceLifecycleListener =
+ car -> {
+ try {
+ mHvacManager = (CarHvacManager) car.getCarManager(Car.HVAC_SERVICE);
+ mHvacManager.registerCallback(mHardwareCallback);
+ initComponents();
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to correctly connect to HVAC", e);
+ }
+ };
@Inject
- public HvacController(Context context) {
- mContext = context;
+ public HvacController(CarServiceProvider carServiceProvider) {
+ mCarServiceProvider = carServiceProvider;
}
/**
@@ -108,15 +109,16 @@
* ({@link CarHvacManager}) will happen on the same thread this method was called from.
*/
public void connectToCarService() {
- mHandler = new Handler();
- mCar = Car.createCar(mContext, /* handler= */ mHandler, Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT,
- mCarServiceLifecycleListener);
+ mCarServiceProvider.addListener(mCarServiceLifecycleListener);
}
/**
* Add component to list and initialize it if the connection is up.
*/
- public void addHvacTextView(TemperatureView temperatureView) {
+ private void addHvacTextView(TemperatureView temperatureView) {
+ if (mRegisteredViews.contains(temperatureView)) {
+ return;
+ }
HvacKey hvacKey = new HvacKey(temperatureView.getPropertyId(), temperatureView.getAreaId());
if (!mTempComponents.containsKey(hvacKey)) {
@@ -124,6 +126,8 @@
}
mTempComponents.get(hvacKey).add(temperatureView);
initComponent(temperatureView);
+
+ mRegisteredViews.add(temperatureView);
}
private void initComponents() {
@@ -169,6 +173,22 @@
*/
public void removeAllComponents() {
mTempComponents.clear();
+ mRegisteredViews.clear();
+ }
+
+ /**
+ * Iterate through a view, looking for {@link TemperatureView} instances and add them to the
+ * controller if found.
+ */
+ public void addTemperatureViewToController(View v) {
+ if (v instanceof TemperatureView) {
+ addHvacTextView((TemperatureView) v);
+ } else if (v instanceof ViewGroup) {
+ ViewGroup viewGroup = (ViewGroup) v;
+ for (int i = 0; i < viewGroup.getChildCount(); i++) {
+ addTemperatureViewToController(viewGroup.getChildAt(i));
+ }
+ }
}
/**
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/TemperatureTextView.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/TemperatureTextView.java
similarity index 95%
rename from packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/TemperatureTextView.java
rename to packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/TemperatureTextView.java
index 17ef3c0..ad4fcd9 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/TemperatureTextView.java
+++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/TemperatureTextView.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 The Android Open Source Project
+ * Copyright (C) 2019 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.systemui.statusbar.car.hvac;
+package com.android.systemui.navigationbar.car.hvac;
import android.content.Context;
import android.content.res.TypedArray;
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/TemperatureView.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/TemperatureView.java
similarity index 93%
rename from packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/TemperatureView.java
rename to packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/TemperatureView.java
index c17da18..963f318 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/hvac/TemperatureView.java
+++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/hvac/TemperatureView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2019 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.systemui.statusbar.car.hvac;
+package com.android.systemui.navigationbar.car.hvac;
/**
* Interface for Views that display temperature HVAC properties
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index 78ac960..4e5a3a6 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -57,15 +57,14 @@
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.ViewMediatorCallback;
import com.android.systemui.BatteryMeterView;
-import com.android.systemui.CarSystemUIFactory;
import com.android.systemui.Dependency;
import com.android.systemui.Prefs;
import com.android.systemui.R;
-import com.android.systemui.SystemUIFactory;
import com.android.systemui.UiOffloadThread;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.bubbles.BubbleController;
+import com.android.systemui.car.CarServiceProvider;
import com.android.systemui.classifier.FalsingLog;
import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.fragments.FragmentHostManager;
@@ -73,9 +72,7 @@
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.keyguard.ScreenLifecycle;
import com.android.systemui.keyguard.WakefulnessLifecycle;
-import com.android.systemui.navigationbar.car.CarFacetButtonController;
import com.android.systemui.navigationbar.car.CarNavigationBarController;
-import com.android.systemui.navigationbar.car.CarNavigationBarView;
import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.qs.QS;
import com.android.systemui.qs.car.CarQSFragment;
@@ -99,12 +96,12 @@
import com.android.systemui.statusbar.VibratorHelper;
import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
-import com.android.systemui.statusbar.notification.NewNotifPipeline;
import com.android.systemui.statusbar.notification.NotificationAlertingManager;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
+import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
import com.android.systemui.statusbar.phone.AutoHideController;
@@ -164,20 +161,20 @@
private float mBackgroundAlphaDiff;
private float mInitialBackgroundAlpha;
+ private final Lazy<FullscreenUserSwitcher> mFullscreenUserSwitcherLazy;
private FullscreenUserSwitcher mFullscreenUserSwitcher;
private CarBatteryController mCarBatteryController;
private BatteryMeterView mBatteryMeterView;
private Drawable mNotificationPanelBackground;
- private ViewGroup mTopNavigationBarContainer;
- private CarNavigationBarView mTopNavigationBarView;
-
private final Object mQueueLock = new Object();
private final CarNavigationBarController mCarNavigationBarController;
- private CarFacetButtonController mCarFacetButtonController;
+ private final Lazy<DrivingStateHelper> mDrivingStateHelperLazy;
+ private final Lazy<PowerManagerHelper> mPowerManagerHelperLazy;
+ private final CarServiceProvider mCarServiceProvider;
+
private DeviceProvisionedController mDeviceProvisionedController;
- private boolean mDeviceIsSetUpForUser = true;
private DrivingStateHelper mDrivingStateHelper;
private PowerManagerHelper mPowerManagerHelper;
private FlingAnimationUtils mFlingAnimationUtils;
@@ -311,6 +308,10 @@
ViewMediatorCallback viewMediatorCallback,
DismissCallbackRegistry dismissCallbackRegistry,
/* Car Settings injected components. */
+ CarServiceProvider carServiceProvider,
+ Lazy<DrivingStateHelper> drivingStateHelperLazy,
+ Lazy<PowerManagerHelper> powerManagerHelperLazy,
+ Lazy<FullscreenUserSwitcher> fullscreenUserSwitcherLazy,
CarNavigationBarController carNavigationBarController) {
super(
context,
@@ -384,16 +385,16 @@
viewMediatorCallback,
dismissCallbackRegistry);
mScrimController = scrimController;
+ mDeviceProvisionedController = deviceProvisionedController;
+ mCarServiceProvider = carServiceProvider;
+ mDrivingStateHelperLazy = drivingStateHelperLazy;
+ mPowerManagerHelperLazy = powerManagerHelperLazy;
+ mFullscreenUserSwitcherLazy = fullscreenUserSwitcherLazy;
mCarNavigationBarController = carNavigationBarController;
}
@Override
public void start() {
- // get the provisioned state before calling the parent class since it's that flow that
- // builds the nav bar
- mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);
- mDeviceIsSetUpForUser = mDeviceProvisionedController.isCurrentUserSetup();
-
// Need to initialize screen lifecycle before calling super.start - before switcher is
// created.
mScreenLifecycle = Dependency.get(ScreenLifecycle.class);
@@ -431,52 +432,20 @@
createBatteryController();
mCarBatteryController.startListening();
- mDeviceProvisionedController.addCallback(
- new DeviceProvisionedController.DeviceProvisionedListener() {
- @Override
- public void onUserSetupChanged() {
- mHandler.post(() -> resetSystemBarsIfNecessary());
- }
-
- @Override
- public void onUserSwitched() {
- mHandler.post(() -> resetSystemBarsIfNecessary());
- }
- });
-
// Used by onDrivingStateChanged and it can be called inside
// DrivingStateHelper.connectToCarService()
mSwitchToGuestTimer = new SwitchToGuestTimer(mContext);
// Register a listener for driving state changes.
- mDrivingStateHelper = new DrivingStateHelper(mContext, this::onDrivingStateChanged);
+ mDrivingStateHelper = mDrivingStateHelperLazy.get();
+ mDrivingStateHelper.setCarDrivingStateEventListener(this::onDrivingStateChanged);
mDrivingStateHelper.connectToCarService();
- mPowerManagerHelper = new PowerManagerHelper(mContext, mCarPowerStateListener);
+ mPowerManagerHelper = mPowerManagerHelperLazy.get();
+ mPowerManagerHelper.setCarPowerStateListener(mCarPowerStateListener);
mPowerManagerHelper.connectToCarService();
}
- private void resetSystemBarsIfNecessary() {
- boolean currentUserSetup = mDeviceProvisionedController.isCurrentUserSetup();
- if (mDeviceIsSetUpForUser != currentUserSetup) {
- mDeviceIsSetUpForUser = currentUserSetup;
- resetSystemBars();
- }
- }
-
- /**
- * Remove all content from navbars and rebuild them. Used to allow for different nav bars
- * before and after the device is provisioned. . Also for change of density and font size.
- */
- private void resetSystemBars() {
- mCarFacetButtonController.removeAll();
-
- buildNavBarContent();
- // CarFacetButtonController was reset therefore we need to re-add the status bar elements
- // to the controller.
- mCarFacetButtonController.addAllFacetButtons(mStatusBarWindow);
- }
-
/**
* Allows for showing or hiding just the navigation bars. This is indented to be used when
* the full screen user selector is shown.
@@ -490,23 +459,22 @@
@Override
public boolean hideKeyguard() {
boolean result = super.hideKeyguard();
- mCarNavigationBarController.hideAllKeyguardButtons(mDeviceIsSetUpForUser);
+ mCarNavigationBarController.hideAllKeyguardButtons(
+ mDeviceProvisionedController.isCurrentUserSetup());
return result;
}
@Override
public void showKeyguard() {
super.showKeyguard();
- mCarNavigationBarController.showAllKeyguardButtons(mDeviceIsSetUpForUser);
+ mCarNavigationBarController.showAllKeyguardButtons(
+ mDeviceProvisionedController.isCurrentUserSetup());
}
@Override
protected void makeStatusBarView(@Nullable RegisterStatusBarResult result) {
super.makeStatusBarView(result);
- CarSystemUIFactory factory = SystemUIFactory.getInstance();
- mCarFacetButtonController = factory.getCarDependencyComponent()
- .getCarFacetButtonController();
mNotificationPanelBackground = getDefaultWallpaper();
mScrimController.setScrimBehindDrawable(mNotificationPanelBackground);
@@ -562,7 +530,7 @@
new HandleBarCloseNotificationGestureListener());
mTopNavBarNotificationTouchListener = (v, event) -> {
- if (!mDeviceIsSetUpForUser) {
+ if (!mDeviceProvisionedController.isCurrentUserSetup()) {
return true;
}
boolean consumed = openGestureDetector.onTouchEvent(event);
@@ -592,20 +560,13 @@
});
CarNotificationListener carNotificationListener = new CarNotificationListener();
mCarUxRestrictionManagerWrapper = new CarUxRestrictionManagerWrapper();
- // This can take time if car service is not ready up to this time.
- // TODO(b/142808072) Refactor CarUxRestrictionManagerWrapper to allow setting
- // CarUxRestrictionsManager later and switch to Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT.
- Car.createCar(mContext, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER,
- (car, ready) -> {
- if (!ready) {
- return;
- }
- CarUxRestrictionsManager carUxRestrictionsManager =
- (CarUxRestrictionsManager)
- car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
- mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
- carUxRestrictionsManager);
- });
+ mCarServiceProvider.addListener(car -> {
+ CarUxRestrictionsManager carUxRestrictionsManager =
+ (CarUxRestrictionsManager)
+ car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
+ mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
+ carUxRestrictionsManager);
+ });
mNotificationDataManager = new NotificationDataManager();
mNotificationDataManager.setOnUnseenCountUpdateListener(
@@ -614,7 +575,7 @@
boolean hasUnseen =
mNotificationDataManager.getUnseenNotificationCount() > 0;
mCarNavigationBarController.toggleAllNotificationsUnseenIndicator(
- mDeviceIsSetUpForUser, hasUnseen);
+ mDeviceProvisionedController.isCurrentUserSetup(), hasUnseen);
}
});
@@ -868,14 +829,14 @@
@Override
protected void createNavigationBar(@Nullable RegisterStatusBarResult result) {
- mTopNavigationBarContainer = mStatusBarWindow
- .findViewById(R.id.car_top_navigation_bar_container);
-
- buildNavBarContent();
+ registerNavBarListeners();
}
- private void buildNavBarContent() {
- buildTopBar();
+ private void registerNavBarListeners() {
+ // In CarStatusBar, navigation bars are built by NavigationBar.java
+ // Instead, we register necessary callbacks to the navigation bar controller.
+ mCarNavigationBarController.registerTopBarTouchListener(
+ mTopNavBarNotificationTouchListener);
mCarNavigationBarController.registerBottomBarTouchListener(
mNavBarNotificationTouchListener);
@@ -889,14 +850,6 @@
mCarNavigationBarController.registerNotificationController(() -> togglePanel());
}
- private void buildTopBar() {
- mTopNavigationBarContainer.removeAllViews();
- mTopNavigationBarView = mCarNavigationBarController.getTopBar(mDeviceIsSetUpForUser);
- mCarNavigationBarController.registerTopBarTouchListener(
- mTopNavBarNotificationTouchListener);
- mTopNavigationBarContainer.addView(mTopNavigationBarView);
- }
-
@Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
//When executing dump() function simultaneously, we need to serialize them
@@ -908,8 +861,6 @@
+ "," + mStackScroller.getScrollY());
}
- pw.print(" mCarFacetButtonController=");
- pw.println(mCarFacetButtonController);
pw.print(" mFullscreenUserSwitcher=");
pw.println(mFullscreenUserSwitcher);
pw.print(" mCarBatteryController=");
@@ -974,8 +925,10 @@
UserSwitcherController userSwitcherController =
Dependency.get(UserSwitcherController.class);
if (userSwitcherController.useFullscreenUserSwitcher()) {
- mFullscreenUserSwitcher = new FullscreenUserSwitcher(this,
- mStatusBarWindow.findViewById(R.id.fullscreen_user_switcher_stub), mContext);
+ mFullscreenUserSwitcher = mFullscreenUserSwitcherLazy.get();
+ mFullscreenUserSwitcher.setStatusBar(this);
+ mFullscreenUserSwitcher.setContainer(
+ mStatusBarWindow.findViewById(R.id.fullscreen_user_switcher_stub));
} else {
super.createUserSwitcher();
}
@@ -1058,7 +1011,7 @@
@Override
public void onDensityOrFontScaleChanged() {
super.onDensityOrFontScaleChanged();
- resetSystemBars();
+ registerNavBarListeners();
// Need to update the background on density changed in case the change was due to night
// mode.
mNotificationPanelBackground = getDefaultWallpaper();
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java
index b9dacc0..4813d6d 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java
@@ -29,6 +29,7 @@
import com.android.systemui.assist.AssistManager;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.bubbles.BubbleController;
+import com.android.systemui.car.CarServiceProvider;
import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.keyguard.DismissCallbackRegistry;
import com.android.systemui.keyguard.KeyguardViewMediator;
@@ -55,12 +56,12 @@
import com.android.systemui.statusbar.VibratorHelper;
import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
-import com.android.systemui.statusbar.notification.NewNotifPipeline;
import com.android.systemui.statusbar.notification.NotificationAlertingManager;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
+import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
import com.android.systemui.statusbar.phone.AutoHideController;
@@ -179,6 +180,10 @@
StatusBarKeyguardViewManager statusBarKeyguardViewManager,
ViewMediatorCallback viewMediatorCallback,
DismissCallbackRegistry dismissCallbackRegistry,
+ CarServiceProvider carServiceProvider,
+ Lazy<DrivingStateHelper> drivingStateHelperLazy,
+ Lazy<PowerManagerHelper> powerManagerHelperLazy,
+ Lazy<FullscreenUserSwitcher> fullscreenUserSwitcherLazy,
CarNavigationBarController carNavigationBarController) {
return new CarStatusBar(
context,
@@ -250,6 +255,10 @@
statusBarKeyguardViewManager,
viewMediatorCallback,
dismissCallbackRegistry,
+ carServiceProvider,
+ drivingStateHelperLazy,
+ powerManagerHelperLazy,
+ fullscreenUserSwitcherLazy,
carNavigationBarController);
}
}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java
index ec72ee7..ec46433 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java
@@ -22,6 +22,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.res.Resources;
import android.graphics.PixelFormat;
import android.os.Handler;
import android.os.UserHandle;
@@ -36,15 +37,21 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.systemui.R;
+import com.android.systemui.dagger.qualifiers.MainResources;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
/**
* A helper class displays an unlock dialog and receives broadcast about detecting trusted device
* & unlocking state to show the appropriate message on the dialog.
*/
+@Singleton
class CarTrustAgentUnlockDialogHelper extends BroadcastReceiver{
private static final String TAG = CarTrustAgentUnlockDialogHelper.class.getSimpleName();
private final Context mContext;
+ private final Resources mResources;
private final WindowManager mWindowManager;
private final UserManager mUserManager;
private final WindowManager.LayoutParams mParams;
@@ -60,10 +67,13 @@
private boolean mIsDialogShowing;
private OnHideListener mOnHideListener;
- CarTrustAgentUnlockDialogHelper(Context context) {
+ @Inject
+ CarTrustAgentUnlockDialogHelper(Context context, @MainResources Resources resources,
+ UserManager userManager, WindowManager windowManager) {
mContext = context;
- mUserManager = mContext.getSystemService(UserManager.class);
- mWindowManager = mContext.getSystemService(WindowManager.class);
+ mResources = resources;
+ mUserManager = userManager;
+ mWindowManager = windowManager;
mParams = createLayoutParams();
mFilter = getIntentFilter();
@@ -125,7 +135,7 @@
* @param listener listener that listens to dialog hide
*/
void showUnlockDialogAfterDelay(int uid, OnHideListener listener) {
- long delayMillis = mContext.getResources().getInteger(R.integer.unlock_dialog_delay_ms);
+ long delayMillis = mResources.getInteger(R.integer.unlock_dialog_delay_ms);
showUnlockDialogAfterDelay(uid, delayMillis, listener);
}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java
index cd87e78..60934ab 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/DrivingStateHelper.java
@@ -17,31 +17,43 @@
package com.android.systemui.statusbar.car;
import android.car.Car;
-import android.car.Car.CarServiceLifecycleListener;
import android.car.drivingstate.CarDrivingStateEvent;
import android.car.drivingstate.CarDrivingStateManager;
import android.car.drivingstate.CarDrivingStateManager.CarDrivingStateEventListener;
-import android.content.Context;
import android.util.Log;
import androidx.annotation.NonNull;
+import com.android.systemui.car.CarServiceProvider;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
/**
* Helper class for connecting to the {@link CarDrivingStateManager} and listening for driving state
* changes.
*/
+@Singleton
public class DrivingStateHelper {
public static final String TAG = "DrivingStateHelper";
- private final Context mContext;
+ private final CarServiceProvider mCarServiceProvider;
+
private CarDrivingStateManager mDrivingStateManager;
- private Car mCar;
private CarDrivingStateEventListener mDrivingStateHandler;
- public DrivingStateHelper(Context context,
- @NonNull CarDrivingStateEventListener drivingStateHandler) {
- mContext = context;
- mDrivingStateHandler = drivingStateHandler;
+ @Inject
+ public DrivingStateHelper(CarServiceProvider carServiceProvider) {
+ mCarServiceProvider = carServiceProvider;
+ }
+
+ /**
+ * Sets the {@link CarDrivingStateEventListener}. Should be set before calling {@link
+ * #connectToCarService()}.
+ */
+ public void setCarDrivingStateEventListener(
+ @NonNull CarDrivingStateEventListener carDrivingStateEventListener) {
+ mDrivingStateHandler = carDrivingStateEventListener;
}
/**
@@ -64,25 +76,22 @@
* Establishes connection with the Car service.
*/
public void connectToCarService() {
- mCar = Car.createCar(mContext, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT,
- mCarServiceLifecycleListener);
+ mCarServiceProvider.addListener(mCarServiceLifecycleListener);
}
- private final CarServiceLifecycleListener mCarServiceLifecycleListener = (car, ready) -> {
- if (!ready) {
- return;
- }
- logD("Car Service connected");
- mDrivingStateManager = (CarDrivingStateManager) car.getCarManager(
- Car.CAR_DRIVING_STATE_SERVICE);
- if (mDrivingStateManager != null) {
- mDrivingStateManager.registerListener(mDrivingStateHandler);
- mDrivingStateHandler.onDrivingStateChanged(
- mDrivingStateManager.getCurrentCarDrivingState());
- } else {
- Log.e(TAG, "CarDrivingStateService service not available");
- }
- };
+ private final CarServiceProvider.CarServiceOnConnectedListener mCarServiceLifecycleListener =
+ car -> {
+ logD("Car Service connected");
+ mDrivingStateManager = (CarDrivingStateManager) car.getCarManager(
+ Car.CAR_DRIVING_STATE_SERVICE);
+ if (mDrivingStateManager != null) {
+ mDrivingStateManager.registerListener(mDrivingStateHandler);
+ mDrivingStateHandler.onDrivingStateChanged(
+ mDrivingStateManager.getCurrentCarDrivingState());
+ } else {
+ Log.e(TAG, "CarDrivingStateService service not available");
+ }
+ };
private void logD(String message) {
if (Log.isLoggable(TAG, Log.DEBUG)) {
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
index 31aced0..b188dc3 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
@@ -26,6 +26,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.UserInfo;
+import android.content.res.Resources;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
@@ -35,24 +36,34 @@
import androidx.recyclerview.widget.GridLayoutManager;
import com.android.systemui.R;
+import com.android.systemui.car.CarServiceProvider;
+import com.android.systemui.dagger.qualifiers.MainResources;
import com.android.systemui.statusbar.car.CarTrustAgentUnlockDialogHelper.OnHideListener;
import com.android.systemui.statusbar.car.UserGridRecyclerView.UserRecord;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
/**
* Manages the fullscreen user switcher.
*/
+@Singleton
public class FullscreenUserSwitcher {
private static final String TAG = FullscreenUserSwitcher.class.getSimpleName();
// Because user 0 is headless, user count for single user is 2
private static final int NUMBER_OF_BACKGROUND_USERS = 1;
- private final UserGridRecyclerView mUserGridView;
- private final View mParent;
- private final int mShortAnimDuration;
- private final CarStatusBar mStatusBar;
+
private final Context mContext;
+ private final Resources mResources;
private final UserManager mUserManager;
+ private final CarServiceProvider mCarServiceProvider;
+ private final CarTrustAgentUnlockDialogHelper mUnlockDialogHelper;
+ private final int mShortAnimDuration;
+
+ private CarStatusBar mStatusBar;
+ private View mParent;
+ private UserGridRecyclerView mUserGridView;
private CarTrustAgentEnrollmentManager mEnrollmentManager;
- private CarTrustAgentUnlockDialogHelper mUnlockDialogHelper;
private UserGridRecyclerView.UserRecord mSelectedUser;
private CarUserManagerHelper mCarUserManagerHelper;
private final BroadcastReceiver mUserUnlockReceiver = new BroadcastReceiver() {
@@ -65,37 +76,46 @@
mContext.unregisterReceiver(mUserUnlockReceiver);
}
};
- private final Car mCar;
- public FullscreenUserSwitcher(CarStatusBar statusBar, ViewStub containerStub, Context context) {
- mStatusBar = statusBar;
- mParent = containerStub.inflate();
+ @Inject
+ public FullscreenUserSwitcher(
+ Context context,
+ @MainResources Resources resources,
+ UserManager userManager,
+ CarServiceProvider carServiceProvider,
+ CarTrustAgentUnlockDialogHelper carTrustAgentUnlockDialogHelper) {
mContext = context;
+ mResources = resources;
+ mUserManager = userManager;
+ mCarServiceProvider = carServiceProvider;
+ mUnlockDialogHelper = carTrustAgentUnlockDialogHelper;
+
+ mShortAnimDuration = mResources.getInteger(android.R.integer.config_shortAnimTime);
+ }
+
+ /** Sets the status bar which controls the keyguard. */
+ public void setStatusBar(CarStatusBar statusBar) {
+ mStatusBar = statusBar;
+ }
+
+ /** Sets the {@link ViewStub} to show the user switcher. */
+ public void setContainer(ViewStub containerStub) {
+ mParent = containerStub.inflate();
View container = mParent.findViewById(R.id.container);
// Initialize user grid.
mUserGridView = container.findViewById(R.id.user_grid);
- GridLayoutManager layoutManager = new GridLayoutManager(context,
- context.getResources().getInteger(R.integer.user_fullscreen_switcher_num_col));
+ GridLayoutManager layoutManager = new GridLayoutManager(mContext,
+ mResources.getInteger(R.integer.user_fullscreen_switcher_num_col));
mUserGridView.setLayoutManager(layoutManager);
mUserGridView.buildAdapter();
mUserGridView.setUserSelectionListener(this::onUserSelected);
- mCarUserManagerHelper = new CarUserManagerHelper(context);
- mUnlockDialogHelper = new CarTrustAgentUnlockDialogHelper(mContext);
- mUserManager = mContext.getSystemService(UserManager.class);
+ mCarUserManagerHelper = new CarUserManagerHelper(mContext);
+ mCarServiceProvider.addListener(
+ car -> mEnrollmentManager = (CarTrustAgentEnrollmentManager) car.getCarManager(
+ Car.CAR_TRUST_AGENT_ENROLLMENT_SERVICE));
- mCar = Car.createCar(mContext, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT,
- (car, ready) -> {
- if (!ready) {
- return;
- }
- mEnrollmentManager = (CarTrustAgentEnrollmentManager) car
- .getCarManager(Car.CAR_TRUST_AGENT_ENROLLMENT_SERVICE);
- });
-
- mShortAnimDuration = container.getResources()
- .getInteger(android.R.integer.config_shortAnimTime);
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);
if (mUserManager.isUserUnlocked(UserHandle.USER_SYSTEM)) {
// User0 is unlocked, switched to the initial user
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/PowerManagerHelper.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/PowerManagerHelper.java
index a27dd34..71847bb 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/PowerManagerHelper.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/PowerManagerHelper.java
@@ -18,33 +18,33 @@
import android.annotation.NonNull;
import android.car.Car;
-import android.car.Car.CarServiceLifecycleListener;
import android.car.hardware.power.CarPowerManager;
import android.car.hardware.power.CarPowerManager.CarPowerStateListener;
-import android.content.Context;
import android.util.Log;
+import com.android.systemui.car.CarServiceProvider;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
/**
* Helper class for connecting to the {@link CarPowerManager} and listening for power state changes.
*/
+@Singleton
public class PowerManagerHelper {
public static final String TAG = "PowerManagerHelper";
- private final Context mContext;
- private final CarPowerStateListener mCarPowerStateListener;
+ private final CarServiceProvider mCarServiceProvider;
- private Car mCar;
private CarPowerManager mCarPowerManager;
+ private CarPowerStateListener mCarPowerStateListener;
- private final CarServiceLifecycleListener mCarServiceLifecycleListener;
+ private final CarServiceProvider.CarServiceOnConnectedListener mCarServiceLifecycleListener;
- PowerManagerHelper(Context context, @NonNull CarPowerStateListener listener) {
- mContext = context;
- mCarPowerStateListener = listener;
- mCarServiceLifecycleListener = (car, ready) -> {
- if (!ready) {
- return;
- }
+ @Inject
+ PowerManagerHelper(CarServiceProvider carServiceProvider) {
+ mCarServiceProvider = carServiceProvider;
+ mCarServiceLifecycleListener = car -> {
Log.d(TAG, "Car Service connected");
mCarPowerManager = (CarPowerManager) car.getCarManager(Car.POWER_SERVICE);
if (mCarPowerManager != null) {
@@ -56,10 +56,16 @@
}
/**
+ * Sets a {@link CarPowerStateListener}. Should be set before {@link #connectToCarService()}.
+ */
+ void setCarPowerStateListener(@NonNull CarPowerStateListener listener) {
+ mCarPowerStateListener = listener;
+ }
+
+ /**
* Connect to Car service.
*/
void connectToCarService() {
- mCar = Car.createCar(mContext, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT,
- mCarServiceLifecycleListener);
+ mCarServiceProvider.addListener(mCarServiceLifecycleListener);
}
}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/OngoingPrivacyChip.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/OngoingPrivacyChip.java
deleted file mode 100644
index 88d641e..0000000
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/OngoingPrivacyChip.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.car.privacy;
-
-import android.app.ActivityManager;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-
-import com.android.systemui.Dependency;
-import com.android.systemui.R;
-import com.android.systemui.appops.AppOpItem;
-import com.android.systemui.appops.AppOpsController;
-import com.android.systemui.plugins.ActivityStarter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * Layout defining the privacy chip that will be displayed in CarStatusRar with the information for
- * which applications are using AppOpps permission fpr camera, mic and location.
- */
-public class OngoingPrivacyChip extends LinearLayout implements View.OnClickListener {
-
- private Context mContext;
- private Handler mHandler;
-
- private LinearLayout mIconsContainer;
- private List<PrivacyItem> mPrivacyItems;
- private static AppOpsController sAppOpsController;
- private UserManager mUserManager;
- private int mCurrentUser;
- private List<Integer> mCurrentUserIds;
- private boolean mListening = false;
- PrivacyDialogBuilder mPrivacyDialogBuilder;
- private LinearLayout mPrivacyChip;
- private ActivityStarter mActivityStarter;
-
- protected static final int[] OPS = new int[]{
- AppOpsManager.OP_CAMERA,
- AppOpsManager.OP_RECORD_AUDIO,
- AppOpsManager.OP_COARSE_LOCATION,
- AppOpsManager.OP_FINE_LOCATION
- };
-
- public OngoingPrivacyChip(Context context) {
- super(context, null);
- init(context);
- }
-
- public OngoingPrivacyChip(Context context, AttributeSet attr) {
- super(context, attr);
- init(context);
- }
-
- public OngoingPrivacyChip(Context context, AttributeSet attr, int defStyle) {
- super(context, attr, defStyle);
- init(context);
- }
-
- public OngoingPrivacyChip(Context context, AttributeSet attr, int defStyle, int a) {
- super(context, attr, defStyle, a);
- init(context);
- }
-
- private void init(Context context) {
- mContext = context;
- mHandler = new Handler(Looper.getMainLooper());
- mPrivacyItems = new ArrayList<>();
- sAppOpsController = Dependency.get(AppOpsController.class);
- mUserManager = mContext.getSystemService(UserManager.class);
- mActivityStarter = Dependency.get(ActivityStarter.class);
- mCurrentUser = ActivityManager.getCurrentUser();
- mCurrentUserIds = mUserManager.getProfiles(mCurrentUser).stream().map(
- userInfo -> userInfo.id).collect(Collectors.toList());
-
- mPrivacyDialogBuilder = new PrivacyDialogBuilder(context, mPrivacyItems);
- }
-
- private AppOpsController.Callback mCallback = new AppOpsController.Callback() {
-
- @Override
- public void onActiveStateChanged(int code, int uid, String packageName, boolean active) {
- int userId = UserHandle.getUserId(uid);
- if (mCurrentUserIds.contains(userId)) {
- updatePrivacyList();
- }
- }
- };
-
- @Override
- public void onFinishInflate() {
- mIconsContainer = findViewById(R.id.icons_container);
- mPrivacyChip = (LinearLayout) findViewById(R.id.car_privacy_chip);
- if (mPrivacyChip != null) {
- mPrivacyChip.setOnClickListener(this);
- setListening(true);
- }
- }
-
- @Override
- public void onDetachedFromWindow() {
- if (mPrivacyChip != null) {
- setListening(false);
- }
- super.onDetachedFromWindow();
- }
-
- @Override
- public void onClick(View v) {
- updatePrivacyList();
- mHandler.post(() -> {
- mActivityStarter.postStartActivityDismissingKeyguard(
- new Intent(Intent.ACTION_REVIEW_ONGOING_PERMISSION_USAGE), 0);
- });
- }
-
- private void setListening(boolean listen) {
- if (mListening == listen) {
- return;
- }
- mListening = listen;
- if (mListening) {
- sAppOpsController.addCallback(OPS, mCallback);
- updatePrivacyList();
- } else {
- sAppOpsController.removeCallback(OPS, mCallback);
- }
- }
-
- private void updatePrivacyList() {
- List<PrivacyItem> privacyItems = mCurrentUserIds.stream()
- .flatMap(item -> sAppOpsController.getActiveAppOpsForUser(item).stream())
- .filter(Objects::nonNull)
- .map(item -> toPrivacyItem(item))
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
- if (!privacyItems.equals(mPrivacyItems)) {
- mPrivacyItems = privacyItems;
- mPrivacyDialogBuilder = new PrivacyDialogBuilder(mContext, mPrivacyItems);
- mHandler.post(this::updateView);
- }
- }
-
- private PrivacyItem toPrivacyItem(AppOpItem appOpItem) {
- PrivacyType type;
- switch (appOpItem.getCode()) {
- case AppOpsManager.OP_CAMERA:
- type = PrivacyType.TYPE_CAMERA;
- break;
- case AppOpsManager.OP_COARSE_LOCATION:
- type = PrivacyType.TYPE_LOCATION;
- break;
- case AppOpsManager.OP_FINE_LOCATION:
- type = PrivacyType.TYPE_LOCATION;
- break;
- case AppOpsManager.OP_RECORD_AUDIO:
- type = PrivacyType.TYPE_MICROPHONE;
- break;
- default:
- return null;
- }
- PrivacyApplication app = new PrivacyApplication(appOpItem.getPackageName(), mContext);
- return new PrivacyItem(type, app, appOpItem.getTimeStarted());
- }
-
- // Should only be called if the mPrivacyDialogBuilder icons or app changed
- private void updateView() {
- if (mPrivacyItems.isEmpty()) {
- mPrivacyChip.setVisibility(GONE);
- return;
- }
- mPrivacyChip.setVisibility(VISIBLE);
- setIcons(mPrivacyDialogBuilder);
-
- requestLayout();
- }
-
- private void setIcons(PrivacyDialogBuilder dialogBuilder) {
- mIconsContainer.removeAllViews();
- dialogBuilder.generateIcons().forEach(item -> {
- int size = mContext.getResources().getDimensionPixelSize(
- R.dimen.privacy_chip_icon_height);
- ImageView image = new ImageView(mContext);
- image.setImageDrawable(item);
- LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(size, size);
-
- int leftPadding = mContext.getResources().getDimensionPixelSize(
- R.dimen.privacy_chip_icon_padding_left);
- int topPadding = mContext.getResources().getDimensionPixelSize(
- R.dimen.privacy_chip_icon_padding_top);
- int rightPadding = mContext.getResources().getDimensionPixelSize(
- R.dimen.privacy_chip_icon_padding_right);
- int bottomPadding = mContext.getResources().getDimensionPixelSize(
- R.dimen.privacy_chip_icon_padding_bottom);
- image.setLayoutParams(layoutParams);
- image.setPadding(leftPadding, topPadding, rightPadding, bottomPadding);
- mIconsContainer.addView(image);
- });
- }
-}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyApplication.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyApplication.java
deleted file mode 100644
index a5d3bf7..0000000
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyApplication.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.car.privacy;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.util.Log;
-
-import java.util.Objects;
-
-/**
- * Class to hold the data for the applications that are using the AppOps permissions.
- */
-public class PrivacyApplication {
- private static final String TAG = "PrivacyApplication";
-
- private String mPackageName;
- private Drawable mIcon;
- private String mApplicationName;
-
- public PrivacyApplication(String packageName, Context context) {
- mPackageName = packageName;
- try {
- ApplicationInfo app = context.getPackageManager()
- .getApplicationInfoAsUser(packageName, 0,
- ActivityManager.getCurrentUser());
- mIcon = context.getPackageManager().getApplicationIcon(app);
- mApplicationName = context.getPackageManager().getApplicationLabel(app).toString();
- } catch (PackageManager.NameNotFoundException e) {
- mApplicationName = packageName;
- Log.e(TAG, "Failed to to find package name", e);
- }
- }
-
- /**
- * Gets the application name.
- */
- public Drawable getIcon() {
- return mIcon;
- }
-
- /**
- * Gets the application name.
- */
- public String getApplicationName() {
- return mApplicationName;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- PrivacyApplication that = (PrivacyApplication) o;
- return mPackageName.equals(that.mPackageName);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(mPackageName);
- }
-}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyDialogBuilder.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyDialogBuilder.java
deleted file mode 100644
index 3b83e7c..0000000
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyDialogBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.car.privacy;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to build the {@link OngoingPrivacyDialog}
- */
-public class PrivacyDialogBuilder {
-
- private Map<PrivacyType, List<PrivacyItem>> mItemsByType;
- private PrivacyApplication mApplication;
- private Context mContext;
-
- public PrivacyDialogBuilder(Context context, List<PrivacyItem> itemsList) {
- mContext = context;
- mItemsByType = itemsList.stream().filter(Objects::nonNull).collect(
- Collectors.groupingBy(PrivacyItem::getPrivacyType));
- List<PrivacyApplication> apps = itemsList.stream().filter(Objects::nonNull).map(
- PrivacyItem::getPrivacyApplication).distinct().collect(Collectors.toList());
- mApplication = apps.size() == 1 ? apps.get(0) : null;
- }
-
- /**
- * Gets the icon id for all the {@link PrivacyItem} in the same order as of itemList.
- */
- public List<Drawable> generateIcons() {
- return mItemsByType.keySet().stream().map(item -> item.getIconId(mContext)).collect(
- Collectors.toList());
- }
-
- /**
- * Gets the application object.
- */
- public PrivacyApplication getApplication() {
- return mApplication;
- }
-}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyItem.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyItem.java
deleted file mode 100644
index d3e123e..0000000
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyItem.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.car.privacy;
-
-import java.util.Objects;
-
-/**
- * Class for holding the data of each privacy item displayed in {@link OngoingPrivacyDialog}
- */
-public class PrivacyItem {
-
- private PrivacyType mPrivacyType;
- private PrivacyApplication mPrivacyApplication;
-
- public PrivacyItem(PrivacyType privacyType, PrivacyApplication privacyApplication,
- long timeStarted) {
- this.mPrivacyType = privacyType;
- this.mPrivacyApplication = privacyApplication;
- }
-
- /**
- * Gets the application object.
- */
- public PrivacyApplication getPrivacyApplication() {
- return mPrivacyApplication;
- }
-
- /**
- * Gets the privacy type for the application.
- */
- public PrivacyType getPrivacyType() {
- return mPrivacyType;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- PrivacyItem that = (PrivacyItem) o;
- return mPrivacyType == that.mPrivacyType
- && mPrivacyApplication.equals(that.mPrivacyApplication);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(mPrivacyType, mPrivacyApplication);
- }
-}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyType.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyType.java
deleted file mode 100644
index 8955c87..0000000
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/privacy/PrivacyType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.car.privacy;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import com.android.systemui.R;
-
-/**
- * Enum for storing data for camera, mic and location.
- */
-public enum PrivacyType {
- TYPE_CAMERA(R.string.privacy_type_camera, com.android.internal.R.drawable.ic_camera),
- TYPE_LOCATION(R.string.privacy_type_location, R.drawable.stat_sys_location),
- TYPE_MICROPHONE(R.string.privacy_type_microphone, R.drawable.ic_mic_white);
-
- private int mNameId;
- private int mIconId;
-
- PrivacyType(int nameId, int iconId) {
- mNameId = nameId;
- mIconId = iconId;
- }
-
- /**
- * Get the icon Id.
- */
- public Drawable getIconId(Context context) {
- return context.getResources().getDrawable(mIconId, null);
- }
-
- /**
- * Get the name Id.
- */
- public String getNameId(Context context) {
- return context.getResources().getString(mNameId);
- }
-}
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/hvac/AnimatedTemperatureView.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/hvac/AnimatedTemperatureView.java
index 76126fc..908aaad 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/hvac/AnimatedTemperatureView.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/hvac/AnimatedTemperatureView.java
@@ -35,7 +35,7 @@
import android.widget.TextView;
import com.android.systemui.R;
-import com.android.systemui.statusbar.car.hvac.TemperatureView;
+import com.android.systemui.navigationbar.car.hvac.TemperatureView;
/**
* Simple text display of HVAC properties, It is designed to show mTemperature and is configured in
diff --git a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogComponent.java b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogComponent.java
index 9d39684..5a34436 100644
--- a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogComponent.java
+++ b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogComponent.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.systemui.car.CarServiceProvider;
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.plugins.VolumeDialog;
@@ -30,13 +31,20 @@
@Singleton
public class CarVolumeDialogComponent extends VolumeDialogComponent {
+ private CarVolumeDialogImpl mCarVolumeDialog;
+
@Inject
public CarVolumeDialogComponent(Context context, KeyguardViewMediator keyguardViewMediator,
- VolumeDialogControllerImpl volumeDialogController) {
+ VolumeDialogControllerImpl volumeDialogController,
+ CarServiceProvider carServiceProvider) {
super(context, keyguardViewMediator, volumeDialogController);
+ mCarVolumeDialog.setCarServiceProvider(carServiceProvider);
}
+ /** This method is called while calling the super constructor. */
+ @Override
protected VolumeDialog createDefault() {
- return new CarVolumeDialogImpl(mContext);
+ mCarVolumeDialog = new CarVolumeDialogImpl(mContext);
+ return mCarVolumeDialog;
}
}
diff --git a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
index 09223e8..367959e 100644
--- a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
+++ b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
@@ -24,7 +24,6 @@
import android.app.Dialog;
import android.app.KeyguardManager;
import android.car.Car;
-import android.car.Car.CarServiceLifecycleListener;
import android.car.media.CarAudioManager;
import android.content.Context;
import android.content.DialogInterface;
@@ -56,6 +55,7 @@
import androidx.recyclerview.widget.RecyclerView;
import com.android.systemui.R;
+import com.android.systemui.car.CarServiceProvider;
import com.android.systemui.plugins.VolumeDialog;
import org.xmlpull.v1.XmlPullParserException;
@@ -95,7 +95,6 @@
private CustomDialog mDialog;
private RecyclerView mListView;
private CarVolumeItemAdapter mVolumeItemsAdapter;
- private Car mCar;
private CarAudioManager mCarAudioManager;
private boolean mHovering;
private int mCurrentlyDisplayingGroupId;
@@ -147,30 +146,28 @@
}
};
- private final CarServiceLifecycleListener mCarServiceLifecycleListener = (car, ready) -> {
- if (!ready) {
- return;
- }
- mExpanded = false;
- mCarAudioManager = (CarAudioManager) car.getCarManager(Car.AUDIO_SERVICE);
- int volumeGroupCount = mCarAudioManager.getVolumeGroupCount();
- // Populates volume slider items from volume groups to UI.
- for (int groupId = 0; groupId < volumeGroupCount; groupId++) {
- VolumeItem volumeItem = getVolumeItemForUsages(
- mCarAudioManager.getUsagesForVolumeGroupId(groupId));
- mAvailableVolumeItems.add(volumeItem);
- // The first one is the default item.
- if (groupId == 0) {
- clearAllAndSetupDefaultCarVolumeLineItem(0);
- }
- }
+ private final CarServiceProvider.CarServiceOnConnectedListener mCarServiceOnConnectedListener =
+ car -> {
+ mExpanded = false;
+ mCarAudioManager = (CarAudioManager) car.getCarManager(Car.AUDIO_SERVICE);
+ int volumeGroupCount = mCarAudioManager.getVolumeGroupCount();
+ // Populates volume slider items from volume groups to UI.
+ for (int groupId = 0; groupId < volumeGroupCount; groupId++) {
+ VolumeItem volumeItem = getVolumeItemForUsages(
+ mCarAudioManager.getUsagesForVolumeGroupId(groupId));
+ mAvailableVolumeItems.add(volumeItem);
+ // The first one is the default item.
+ if (groupId == 0) {
+ clearAllAndSetupDefaultCarVolumeLineItem(0);
+ }
+ }
- // If list is already initiated, update its content.
- if (mVolumeItemsAdapter != null) {
- mVolumeItemsAdapter.notifyDataSetChanged();
- }
- mCarAudioManager.registerCarVolumeCallback(mVolumeChangeCallback);
- };
+ // If list is already initiated, update its content.
+ if (mVolumeItemsAdapter != null) {
+ mVolumeItemsAdapter.notifyDataSetChanged();
+ }
+ mCarAudioManager.registerCarVolumeCallback(mVolumeChangeCallback);
+ };
public CarVolumeDialogImpl(Context context) {
mContext = context;
@@ -181,6 +178,11 @@
R.integer.car_volume_dialog_display_hovering_timeout);
}
+ /** Sets a {@link CarServiceProvider} which connects to the audio service. */
+ public void setCarServiceProvider(CarServiceProvider carServiceProvider) {
+ carServiceProvider.addListener(mCarServiceOnConnectedListener);
+ }
+
private static int getSeekbarValue(CarAudioManager carAudioManager, int volumeGroupId) {
return carAudioManager.getGroupVolume(volumeGroupId);
}
@@ -196,8 +198,6 @@
@Override
public void init(int windowType, Callback callback) {
initDialog();
- mCar = Car.createCar(mContext, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT,
- mCarServiceLifecycleListener);
}
@Override
@@ -205,12 +205,6 @@
mHandler.removeCallbacksAndMessages(/* token= */ null);
cleanupAudioManager();
- // unregisterVolumeCallback is not being called when disconnect car, so we manually cleanup
- // audio manager beforehand.
- if (mCar != null) {
- mCar.disconnect();
- mCar = null;
- }
}
private void initDialog() {
diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/CarNavigationBarControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/CarNavigationBarControllerTest.java
index 901d200..642b114 100644
--- a/packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/CarNavigationBarControllerTest.java
+++ b/packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/CarNavigationBarControllerTest.java
@@ -31,8 +31,8 @@
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
+import com.android.systemui.navigationbar.car.hvac.HvacController;
import com.android.systemui.plugins.DarkIconDispatcher;
-import com.android.systemui.statusbar.car.hvac.HvacController;
import com.android.systemui.statusbar.phone.StatusBarIconController;
import org.junit.Before;
@@ -41,8 +41,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import dagger.Lazy;
-
@RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper
@SmallTest
@@ -50,17 +48,17 @@
private CarNavigationBarController mCarNavigationBar;
private NavigationBarViewFactory mNavigationBarViewFactory;
- private Lazy<HvacController> mHvacControllerLazy;
private TestableResources mTestableResources;
@Mock
+ private CarFacetButtonController mCarFacetButtonController;
+ @Mock
private HvacController mHvacController;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mNavigationBarViewFactory = new NavigationBarViewFactory(mContext);
- mHvacControllerLazy = () -> mHvacController;
mTestableResources = mContext.getOrCreateTestableResources();
// Needed to inflate top navigation bar.
@@ -71,7 +69,7 @@
@Test
public void testConnectToHvac_callsConnect() {
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
mCarNavigationBar.connectToHvac();
@@ -81,7 +79,7 @@
@Test
public void testRemoveAllFromHvac_callsRemoveAll() {
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
mCarNavigationBar.removeAllFromHvac();
@@ -92,7 +90,7 @@
public void testGetBottomWindow_bottomDisabled_returnsNull() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, false);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getBottomWindow();
@@ -103,7 +101,7 @@
public void testGetBottomWindow_bottomEnabled_returnsWindow() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getBottomWindow();
@@ -114,7 +112,7 @@
public void testGetBottomWindow_bottomEnabled_calledTwice_returnsSameWindow() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window1 = mCarNavigationBar.getBottomWindow();
ViewGroup window2 = mCarNavigationBar.getBottomWindow();
@@ -126,7 +124,7 @@
public void testGetLeftWindow_leftDisabled_returnsNull() {
mTestableResources.addOverride(R.bool.config_enableLeftNavigationBar, false);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getLeftWindow();
assertThat(window).isNull();
}
@@ -135,7 +133,7 @@
public void testGetLeftWindow_leftEnabled_returnsWindow() {
mTestableResources.addOverride(R.bool.config_enableLeftNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getLeftWindow();
@@ -146,7 +144,7 @@
public void testGetLeftWindow_leftEnabled_calledTwice_returnsSameWindow() {
mTestableResources.addOverride(R.bool.config_enableLeftNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window1 = mCarNavigationBar.getLeftWindow();
ViewGroup window2 = mCarNavigationBar.getLeftWindow();
@@ -158,7 +156,7 @@
public void testGetRightWindow_rightDisabled_returnsNull() {
mTestableResources.addOverride(R.bool.config_enableRightNavigationBar, false);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getRightWindow();
@@ -169,7 +167,7 @@
public void testGetRightWindow_rightEnabled_returnsWindow() {
mTestableResources.addOverride(R.bool.config_enableRightNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getRightWindow();
@@ -180,7 +178,7 @@
public void testGetRightWindow_rightEnabled_calledTwice_returnsSameWindow() {
mTestableResources.addOverride(R.bool.config_enableRightNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window1 = mCarNavigationBar.getRightWindow();
ViewGroup window2 = mCarNavigationBar.getRightWindow();
@@ -192,7 +190,7 @@
public void testSetBottomWindowVisibility_setTrue_isVisible() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getBottomWindow();
mCarNavigationBar.setBottomWindowVisibility(View.VISIBLE);
@@ -204,7 +202,7 @@
public void testSetBottomWindowVisibility_setFalse_isGone() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getBottomWindow();
mCarNavigationBar.setBottomWindowVisibility(View.GONE);
@@ -216,7 +214,7 @@
public void testSetLeftWindowVisibility_setTrue_isVisible() {
mTestableResources.addOverride(R.bool.config_enableLeftNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getLeftWindow();
mCarNavigationBar.setLeftWindowVisibility(View.VISIBLE);
@@ -228,7 +226,7 @@
public void testSetLeftWindowVisibility_setFalse_isGone() {
mTestableResources.addOverride(R.bool.config_enableLeftNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getLeftWindow();
mCarNavigationBar.setLeftWindowVisibility(View.GONE);
@@ -240,7 +238,7 @@
public void testSetRightWindowVisibility_setTrue_isVisible() {
mTestableResources.addOverride(R.bool.config_enableRightNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getRightWindow();
mCarNavigationBar.setRightWindowVisibility(View.VISIBLE);
@@ -252,7 +250,7 @@
public void testSetRightWindowVisibility_setFalse_isGone() {
mTestableResources.addOverride(R.bool.config_enableRightNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
ViewGroup window = mCarNavigationBar.getRightWindow();
mCarNavigationBar.setRightWindowVisibility(View.GONE);
@@ -264,7 +262,7 @@
public void testRegisterBottomBarTouchListener_createViewFirst_registrationSuccessful() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
View.OnTouchListener controller = bottomBar.getStatusBarWindowTouchListener();
@@ -279,7 +277,7 @@
public void testRegisterBottomBarTouchListener_registerFirst_registrationSuccessful() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
mCarNavigationBar.registerBottomBarTouchListener(mock(View.OnTouchListener.class));
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
@@ -292,7 +290,7 @@
public void testRegisterNotificationController_createViewFirst_registrationSuccessful() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
CarNavigationBarController.NotificationsShadeController controller =
@@ -309,7 +307,7 @@
public void testRegisterNotificationController_registerFirst_registrationSuccessful() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
mCarNavigationBar.registerNotificationController(
mock(CarNavigationBarController.NotificationsShadeController.class));
@@ -324,7 +322,7 @@
public void testShowAllKeyguardButtons_bottomEnabled_bottomKeyguardButtonsVisible() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
View bottomKeyguardButtons = bottomBar.findViewById(R.id.lock_screen_nav_buttons);
@@ -337,7 +335,7 @@
public void testShowAllKeyguardButtons_bottomEnabled_bottomNavButtonsGone() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
View bottomButtons = bottomBar.findViewById(R.id.nav_buttons);
@@ -350,7 +348,7 @@
public void testHideAllKeyguardButtons_bottomEnabled_bottomKeyguardButtonsGone() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
View bottomKeyguardButtons = bottomBar.findViewById(R.id.lock_screen_nav_buttons);
@@ -365,7 +363,7 @@
public void testHideAllKeyguardButtons_bottomEnabled_bottomNavButtonsVisible() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
View bottomButtons = bottomBar.findViewById(R.id.nav_buttons);
@@ -380,7 +378,7 @@
public void testToggleAllNotificationsUnseenIndicator_bottomEnabled_hasUnseen_setCorrectly() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
CarNavigationButton notifications = bottomBar.findViewById(R.id.notifications);
@@ -395,7 +393,7 @@
public void testToggleAllNotificationsUnseenIndicator_bottomEnabled_noUnseen_setCorrectly() {
mTestableResources.addOverride(R.bool.config_enableBottomNavigationBar, true);
mCarNavigationBar = new CarNavigationBarController(mContext, mNavigationBarViewFactory,
- mHvacControllerLazy);
+ () -> mCarFacetButtonController, () -> mHvacController);
CarNavigationBarView bottomBar = mCarNavigationBar.getBottomBar(/* isSetUp= */ true);
CarNavigationButton notifications = bottomBar.findViewById(R.id.notifications);
diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/hvac/HvacControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/hvac/HvacControllerTest.java
new file mode 100644
index 0000000..a71d1db
--- /dev/null
+++ b/packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/hvac/HvacControllerTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.navigationbar.car.hvac;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.car.Car;
+import android.car.hardware.hvac.CarHvacManager;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.systemui.SysuiTestCase;
+import com.android.systemui.car.CarServiceProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidTestingRunner.class)
+@TestableLooper.RunWithLooper
+@SmallTest
+public class HvacControllerTest extends SysuiTestCase {
+
+ private static final int PROPERTY_ID = 1;
+ private static final int AREA_ID = 1;
+ private static final float VALUE = 72.0f;
+
+ private HvacController mHvacController;
+ private CarServiceProvider mCarServiceProvider;
+
+ @Mock
+ private Car mCar;
+ @Mock
+ private CarHvacManager mCarHvacManager;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ when(mCar.isConnected()).thenReturn(true);
+ when(mCar.getCarManager(Car.HVAC_SERVICE)).thenReturn(mCarHvacManager);
+
+ mCarServiceProvider = new CarServiceProvider(mContext, mCar);
+ mHvacController = new HvacController(mCarServiceProvider);
+ mHvacController.connectToCarService();
+ }
+
+ @Test
+ public void connectToCarService_registersCallback() {
+ verify(mCarHvacManager).registerCallback(any());
+ }
+
+ @Test
+ public void addTemperatureViewToController_usingTemperatureView_registersView() {
+ TemperatureTextView v = setupMockTemperatureTextView(PROPERTY_ID, AREA_ID, VALUE);
+ mHvacController.addTemperatureViewToController(v);
+
+ verify(v).setTemp(VALUE);
+ }
+
+ @Test
+ public void addTemperatureViewToController_usingSameTemperatureView_registersFirstView() {
+ TemperatureTextView v = setupMockTemperatureTextView(PROPERTY_ID, AREA_ID, VALUE);
+ mHvacController.addTemperatureViewToController(v);
+ verify(v).setTemp(VALUE);
+ resetTemperatureView(v, PROPERTY_ID, AREA_ID);
+
+ mHvacController.addTemperatureViewToController(v);
+ verify(v, never()).setTemp(VALUE);
+ }
+
+ @Test
+ public void addTemperatureViewToController_usingDifferentTemperatureView_registersBothViews() {
+ TemperatureTextView v1 = setupMockTemperatureTextView(PROPERTY_ID, AREA_ID, VALUE);
+ mHvacController.addTemperatureViewToController(v1);
+ verify(v1).setTemp(VALUE);
+
+ TemperatureTextView v2 = setupMockTemperatureTextView(
+ PROPERTY_ID + 1,
+ AREA_ID + 1,
+ VALUE + 1);
+ mHvacController.addTemperatureViewToController(v2);
+ verify(v2).setTemp(VALUE + 1);
+ }
+
+ @Test
+ public void removeAllComponents_ableToRegisterSameView() {
+ TemperatureTextView v = setupMockTemperatureTextView(PROPERTY_ID, AREA_ID, VALUE);
+ mHvacController.addTemperatureViewToController(v);
+ verify(v).setTemp(VALUE);
+
+ mHvacController.removeAllComponents();
+ resetTemperatureView(v, PROPERTY_ID, AREA_ID);
+
+ mHvacController.addTemperatureViewToController(v);
+ verify(v).setTemp(VALUE);
+ }
+
+ private TemperatureTextView setupMockTemperatureTextView(int propertyId, int areaId,
+ float value) {
+ TemperatureTextView v = mock(TemperatureTextView.class);
+ resetTemperatureView(v, propertyId, areaId);
+ when(mCarHvacManager.isPropertyAvailable(propertyId, areaId)).thenReturn(true);
+ when(mCarHvacManager.getFloatProperty(propertyId, areaId)).thenReturn(value);
+ return v;
+ }
+
+ private void resetTemperatureView(TemperatureTextView view, int propertyId, int areaId) {
+ reset(view);
+ when(view.getPropertyId()).thenReturn(propertyId);
+ when(view.getAreaId()).thenReturn(areaId);
+ }
+}
diff --git a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/InstallationAsyncTask.java b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/InstallationAsyncTask.java
index 738c425..19ae970 100644
--- a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/InstallationAsyncTask.java
+++ b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/InstallationAsyncTask.java
@@ -102,9 +102,10 @@
Thread thread =
new Thread(
() -> {
- mDynSystem.startInstallation("userdata", mUserdataSize, false);
+ mDynSystem.startInstallation();
+ mDynSystem.createPartition("userdata", mUserdataSize, false);
mInstallationSession =
- mDynSystem.startInstallation("system", mSystemSize, true);
+ mDynSystem.createPartition("system", mSystemSize, true);
});
thread.start();
@@ -157,6 +158,7 @@
reportedInstalledSize = installedSize;
}
}
+ mDynSystem.finishInstallation();
return null;
} catch (Exception e) {
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index af96982..4a50210 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -162,12 +162,12 @@
final String title;
final UUID storageUuid;
if (volume.getType() == VolumeInfo.TYPE_EMULATED) {
- // We currently only support a single emulated volume mounted at
+ // We currently only support a single emulated volume per user mounted at
// a time, and it's always considered the primary
if (DEBUG) Log.d(TAG, "Found primary volume: " + volume);
rootId = ROOT_ID_PRIMARY_EMULATED;
- if (VolumeInfo.ID_EMULATED_INTERNAL.equals(volume.getId())) {
+ if (volume.isPrimaryEmulatedForUser(userId)) {
// This is basically the user's primary device storage.
// Use device name for the volume since this is likely same thing
// the user sees when they mount their phone on another device.
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
index df30c24..4b4861a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
@@ -212,15 +212,21 @@
}
private void dispatchAudioModeChanged() {
- mDeviceManager.dispatchAudioModeChanged();
+ for (CachedBluetoothDevice cachedDevice : mDeviceManager.getCachedDevicesCopy()) {
+ cachedDevice.onAudioModeChanged();
+ }
for (BluetoothCallback callback : mCallbacks) {
callback.onAudioModeChanged();
}
}
- private void dispatchActiveDeviceChanged(CachedBluetoothDevice activeDevice,
+ @VisibleForTesting
+ void dispatchActiveDeviceChanged(CachedBluetoothDevice activeDevice,
int bluetoothProfile) {
- mDeviceManager.onActiveDeviceChanged(activeDevice, bluetoothProfile);
+ for (CachedBluetoothDevice cachedDevice : mDeviceManager.getCachedDevicesCopy()) {
+ boolean isActive = Objects.equals(cachedDevice, activeDevice);
+ cachedDevice.onActiveDeviceChanged(isActive, bluetoothProfile);
+ }
for (BluetoothCallback callback : mCallbacks) {
callback.onActiveDeviceChanged(activeDevice, bluetoothProfile);
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index 2507a34..0095692 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -442,12 +442,12 @@
/**
* Get name from remote device
- * @return {@link BluetoothDevice#getAliasName()} if
- * {@link BluetoothDevice#getAliasName()} is not null otherwise return
+ * @return {@link BluetoothDevice#getAlias()} if
+ * {@link BluetoothDevice#getAlias()} is not null otherwise return
* {@link BluetoothDevice#getAddress()}
*/
public String getName() {
- final String aliasName = mDevice.getAliasName();
+ final String aliasName = mDevice.getAlias();
return TextUtils.isEmpty(aliasName) ? getAddress() : aliasName;
}
@@ -505,7 +505,7 @@
* @return true if device's alias name is not null nor empty, false otherwise
*/
public boolean hasHumanReadableName() {
- return !TextUtils.isEmpty(mDevice.getAliasName());
+ return !TextUtils.isEmpty(mDevice.getAlias());
}
/**
@@ -652,7 +652,7 @@
}
if (BluetoothUtils.D) {
- Log.e(TAG, "updating profiles for " + mDevice.getAliasName() + ", " + mDevice);
+ Log.e(TAG, "updating profiles for " + mDevice.getAlias() + ", " + mDevice);
BluetoothClass bluetoothClass = mDevice.getBluetoothClass();
if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
index f243199..cca9cfa 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
@@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Objects;
/**
* CachedBluetoothDeviceManager manages the set of remote Bluetooth devices.
@@ -169,7 +168,7 @@
return cachedDevice.getName();
}
- String name = device.getAliasName();
+ String name = device.getAlias();
if (name != null) {
return name;
}
@@ -229,14 +228,6 @@
}
}
- public synchronized void onActiveDeviceChanged(CachedBluetoothDevice activeDevice,
- int bluetoothProfile) {
- for (CachedBluetoothDevice cachedDevice : mCachedDevices) {
- boolean isActive = Objects.equals(cachedDevice, activeDevice);
- cachedDevice.onActiveDeviceChanged(isActive, bluetoothProfile);
- }
- }
-
public synchronized boolean onProfileConnectionStateChangedIfProcessed(CachedBluetoothDevice
cachedDevice, int state) {
return mHearingAidDeviceManager.onProfileConnectionStateChangedIfProcessed(cachedDevice,
@@ -257,12 +248,6 @@
}
}
- public synchronized void dispatchAudioModeChanged() {
- for (CachedBluetoothDevice cachedDevice : mCachedDevices) {
- cachedDevice.onAudioModeChanged();
- }
- }
-
private void log(String msg) {
if (DEBUG) {
Log.d(TAG, msg);
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java b/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
index 274696b..69487d5 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
@@ -39,6 +39,7 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
+import android.os.UserManager;
import com.android.settingslib.R;
@@ -176,8 +177,8 @@
boolean isManaged = context.getSystemService(DevicePolicyManager.class)
.getProfileOwnerAsUser(userId) != null;
if (isManaged) {
- badge = getDrawableForDisplayDensity(
- context, com.android.internal.R.drawable.ic_corp_badge_case);
+ badge = getDrawableForDisplayDensity(context,
+ context.getSystemService(UserManager.class).getUserBadgeResId(userId));
}
}
return setBadge(badge);
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/OWNERS b/packages/SettingsLib/src/com/android/settingslib/wifi/OWNERS
index d5d2e9e..f506b7c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/OWNERS
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/OWNERS
@@ -1,7 +1,7 @@
# Default reviewers for this and subdirectories.
+qal@google.com
+arcwang@google.com
+govenliu@google.com
asapperstein@google.com
-asargent@google.com
-dling@google.com
-zhfan@google.com
# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
index 2c70cbb..ba1dc64 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
@@ -15,6 +15,8 @@
*/
package com.android.settingslib.bluetooth;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -41,6 +43,9 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import java.util.ArrayList;
+import java.util.List;
+
@RunWith(RobolectricTestRunner.class)
public class BluetoothEventManagerTest {
@@ -54,10 +59,24 @@
private CachedBluetoothDevice mCachedBluetoothDevice;
@Mock
private BluetoothDevice mBluetoothDevice;
+ @Mock
+ private HeadsetProfile mHfpProfile;
+ @Mock
+ private A2dpProfile mA2dpProfile;
+ @Mock
+ private HearingAidProfile mHearingAidProfile;
+ @Mock
+ private BluetoothDevice mDevice1;
+ @Mock
+ private BluetoothDevice mDevice2;
+ @Mock
+ private LocalBluetoothProfileManager mLocalProfileManager;
private Context mContext;
private Intent mIntent;
private BluetoothEventManager mBluetoothEventManager;
+ private CachedBluetoothDevice mCachedDevice1;
+ private CachedBluetoothDevice mCachedDevice2;
@Before
public void setUp() {
@@ -67,6 +86,12 @@
mBluetoothEventManager = new BluetoothEventManager(mLocalAdapter,
mCachedDeviceManager, mContext, /* handler= */ null, /* userHandle= */ null);
when(mCachedDeviceManager.findDevice(mBluetoothDevice)).thenReturn(mCachedBluetoothDevice);
+ when(mHfpProfile.isProfileReady()).thenReturn(true);
+ when(mA2dpProfile.isProfileReady()).thenReturn(true);
+ when(mHearingAidProfile.isProfileReady()).thenReturn(true);
+
+ mCachedDevice1 = new CachedBluetoothDevice(mContext, mLocalProfileManager, mDevice1);
+ mCachedDevice2 = new CachedBluetoothDevice(mContext, mLocalProfileManager, mDevice2);
}
@Test
@@ -194,4 +219,129 @@
verify(mBluetoothCallback, never()).onAclConnectionStateChanged(mCachedBluetoothDevice,
BluetoothAdapter.STATE_CONNECTED);
}
+
+ /**
+ * Test to verify onActiveDeviceChanged().
+ */
+ @Test
+ public void dispatchActiveDeviceChanged_connectedDevices_activeDeviceChanged() {
+ final List<CachedBluetoothDevice> cachedDevices = new ArrayList<>();
+ cachedDevices.add(mCachedDevice1);
+ cachedDevices.add(mCachedDevice2);
+
+ when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ when(mDevice2.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(cachedDevices);
+
+ // Connect both devices for A2DP and HFP
+ mCachedDevice1.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
+ mCachedDevice2.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
+ mCachedDevice1.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
+ mCachedDevice2.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
+
+ // Verify that both devices are connected and none is Active
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+
+ // The first device is active for A2DP, the second device is active for HFP
+ mBluetoothEventManager.dispatchActiveDeviceChanged(mCachedDevice1, BluetoothProfile.A2DP);
+ mBluetoothEventManager
+ .dispatchActiveDeviceChanged(mCachedDevice2, BluetoothProfile.HEADSET);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
+
+ // The first device is active for A2DP and HFP
+ mBluetoothEventManager
+ .dispatchActiveDeviceChanged(mCachedDevice1, BluetoothProfile.HEADSET);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+
+ // The second device is active for A2DP and HFP
+ mBluetoothEventManager.dispatchActiveDeviceChanged(mCachedDevice2, BluetoothProfile.A2DP);
+ mBluetoothEventManager
+ .dispatchActiveDeviceChanged(mCachedDevice2, BluetoothProfile.HEADSET);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
+
+ // No active device for A2DP
+ mBluetoothEventManager.dispatchActiveDeviceChanged(null, BluetoothProfile.A2DP);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
+
+ // No active device for HFP
+ mBluetoothEventManager.dispatchActiveDeviceChanged(null, BluetoothProfile.HEADSET);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ }
+
+ /**
+ * Test to verify onActiveDeviceChanged() with A2DP and Hearing Aid.
+ */
+ @Test
+ public void dispatchActiveDeviceChanged_withA2dpAndHearingAid() {
+ final List<CachedBluetoothDevice> cachedDevices = new ArrayList<>();
+ cachedDevices.add(mCachedDevice1);
+ cachedDevices.add(mCachedDevice2);
+
+ when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ when(mDevice2.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(cachedDevices);
+
+ // Connect device1 for A2DP and HFP and device2 for Hearing Aid
+ mCachedDevice1.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
+ mCachedDevice1.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
+ mCachedDevice2.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
+
+ // Verify that both devices are connected and none is Active
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
+
+ // The first device is active for A2DP and HFP
+ mBluetoothEventManager.dispatchActiveDeviceChanged(mCachedDevice1, BluetoothProfile.A2DP);
+ mBluetoothEventManager
+ .dispatchActiveDeviceChanged(mCachedDevice1, BluetoothProfile.HEADSET);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
+
+ // The second device is active for Hearing Aid and the first device is not active
+ mBluetoothEventManager.dispatchActiveDeviceChanged(null, BluetoothProfile.A2DP);
+ mBluetoothEventManager.dispatchActiveDeviceChanged(null, BluetoothProfile.HEADSET);
+ mBluetoothEventManager
+ .dispatchActiveDeviceChanged(mCachedDevice2, BluetoothProfile.HEARING_AID);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isTrue();
+
+ // No active device for Hearing Aid
+ mBluetoothEventManager.dispatchActiveDeviceChanged(null, BluetoothProfile.HEARING_AID);
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
+ assertThat(mCachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
+ }
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java
index 806f22f..2c4f57f 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java
@@ -26,7 +26,6 @@
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
import android.content.Context;
import org.junit.Before;
@@ -50,8 +49,6 @@
private final static String DEVICE_ADDRESS_1 = "AA:BB:CC:DD:EE:11";
private final static String DEVICE_ADDRESS_2 = "AA:BB:CC:DD:EE:22";
private final static String DEVICE_ADDRESS_3 = "AA:BB:CC:DD:EE:33";
- private final static String DEVICE_SUMMARY_1 = "summary 1";
- private final static String DEVICE_SUMMARY_2 = "summary 2";
private final static long HISYNCID1 = 10;
private final static long HISYNCID2 = 11;
private final BluetoothClass DEVICE_CLASS_1 =
@@ -95,9 +92,9 @@
when(mDevice1.getName()).thenReturn(DEVICE_NAME_1);
when(mDevice2.getName()).thenReturn(DEVICE_NAME_2);
when(mDevice3.getName()).thenReturn(DEVICE_NAME_3);
- when(mDevice1.getAliasName()).thenReturn(DEVICE_ALIAS_1);
- when(mDevice2.getAliasName()).thenReturn(DEVICE_ALIAS_2);
- when(mDevice3.getAliasName()).thenReturn(DEVICE_ALIAS_3);
+ when(mDevice1.getAlias()).thenReturn(DEVICE_ALIAS_1);
+ when(mDevice2.getAlias()).thenReturn(DEVICE_ALIAS_2);
+ when(mDevice3.getAlias()).thenReturn(DEVICE_ALIAS_3);
when(mDevice1.getBluetoothClass()).thenReturn(DEVICE_CLASS_1);
when(mDevice2.getBluetoothClass()).thenReturn(DEVICE_CLASS_2);
when(mDevice3.getBluetoothClass()).thenReturn(DEVICE_CLASS_2);
@@ -243,7 +240,7 @@
assertThat(cachedDevice1.getName()).isEqualTo(DEVICE_ALIAS_1);
final String newAliasName = "NewAliasName";
- when(mDevice1.getAliasName()).thenReturn(newAliasName);
+ when(mDevice1.getAlias()).thenReturn(newAliasName);
mCachedDeviceManager.onDeviceNameUpdated(mDevice1);
assertThat(cachedDevice1.getName()).isEqualTo(newAliasName);
}
@@ -401,124 +398,4 @@
when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
assertThat(mCachedDeviceManager.onDeviceDisappeared(cachedDevice1)).isTrue();
}
-
- /**
- * Test to verify onActiveDeviceChanged().
- */
- @Test
- public void onActiveDeviceChanged_connectedDevices_activeDeviceChanged() {
- CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);
- assertThat(cachedDevice1).isNotNull();
- CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
- assertThat(cachedDevice2).isNotNull();
-
- when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
- when(mDevice2.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
-
- // Connect both devices for A2DP and HFP
- cachedDevice1.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
- cachedDevice2.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
- cachedDevice1.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
- cachedDevice2.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
-
- // Verify that both devices are connected and none is Active
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
-
- // The first device is active for A2DP, the second device is active for HFP
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice1, BluetoothProfile.A2DP);
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice2, BluetoothProfile.HEADSET);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
-
- // The first device is active for A2DP and HFP
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice1, BluetoothProfile.HEADSET);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
-
- // The second device is active for A2DP and HFP
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice2, BluetoothProfile.A2DP);
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice2, BluetoothProfile.HEADSET);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
-
- // No active device for A2DP
- mCachedDeviceManager.onActiveDeviceChanged(null, BluetoothProfile.A2DP);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
-
- // No active device for HFP
- mCachedDeviceManager.onActiveDeviceChanged(null, BluetoothProfile.HEADSET);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- }
-
- /**
- * Test to verify onActiveDeviceChanged() with A2DP and Hearing Aid.
- */
- @Test
- public void onActiveDeviceChanged_withA2dpAndHearingAid() {
- CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);
- assertThat(cachedDevice1).isNotNull();
- CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
- assertThat(cachedDevice2).isNotNull();
-
- when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
- when(mDevice2.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
-
- // Connect device1 for A2DP and HFP and device2 for Hearing Aid
- cachedDevice1.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
- cachedDevice1.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
- cachedDevice2.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
-
- // Verify that both devices are connected and none is Active
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
-
- // The first device is active for A2DP and HFP
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice1, BluetoothProfile.A2DP);
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice1, BluetoothProfile.HEADSET);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isTrue();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isTrue();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
-
- // The second device is active for Hearing Aid and the first device is not active
- mCachedDeviceManager.onActiveDeviceChanged(null, BluetoothProfile.A2DP);
- mCachedDeviceManager.onActiveDeviceChanged(null, BluetoothProfile.HEADSET);
- mCachedDeviceManager.onActiveDeviceChanged(cachedDevice2, BluetoothProfile.HEARING_AID);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isTrue();
-
- // No active device for Hearing Aid
- mCachedDeviceManager.onActiveDeviceChanged(null, BluetoothProfile.HEARING_AID);
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice1.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.A2DP)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();
- assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();
- }
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java
index 5c89a01..53ff1a1 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java
@@ -702,7 +702,7 @@
@Test
public void deviceName_testAliasNameAvailable() {
- when(mDevice.getAliasName()).thenReturn(DEVICE_ALIAS);
+ when(mDevice.getAlias()).thenReturn(DEVICE_ALIAS);
when(mDevice.getName()).thenReturn(DEVICE_NAME);
CachedBluetoothDevice cachedBluetoothDevice =
new CachedBluetoothDevice(mContext, mProfileManager, mDevice);
@@ -725,7 +725,7 @@
@Test
public void deviceName_testRenameDevice() {
final String[] alias = {DEVICE_ALIAS};
- doAnswer(invocation -> alias[0]).when(mDevice).getAliasName();
+ doAnswer(invocation -> alias[0]).when(mDevice).getAlias();
doAnswer(invocation -> {
alias[0] = (String) invocation.getArguments()[0];
return true;
@@ -842,14 +842,14 @@
@Test
public void getName_aliasNameNotNull_returnAliasName() {
- when(mDevice.getAliasName()).thenReturn(DEVICE_NAME);
+ when(mDevice.getAlias()).thenReturn(DEVICE_NAME);
assertThat(mCachedDevice.getName()).isEqualTo(DEVICE_NAME);
}
@Test
public void getName_aliasNameIsNull_returnAddress() {
- when(mDevice.getAliasName()).thenReturn(null);
+ when(mDevice.getAlias()).thenReturn(null);
assertThat(mCachedDevice.getName()).isEqualTo(DEVICE_ADDRESS);
}
@@ -857,7 +857,7 @@
@Test
public void setName_setDeviceNameIsNotNull() {
final String name = "test name";
- when(mDevice.getAliasName()).thenReturn(DEVICE_NAME);
+ when(mDevice.getAlias()).thenReturn(DEVICE_NAME);
mCachedDevice.setName(name);
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java
index 2b5466c..7be176a 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java
@@ -75,8 +75,8 @@
when(mDevice2.getAddress()).thenReturn(DEVICE_ADDRESS_2);
when(mDevice1.getName()).thenReturn(DEVICE_NAME_1);
when(mDevice2.getName()).thenReturn(DEVICE_NAME_2);
- when(mDevice1.getAliasName()).thenReturn(DEVICE_ALIAS_1);
- when(mDevice2.getAliasName()).thenReturn(DEVICE_ALIAS_2);
+ when(mDevice1.getAlias()).thenReturn(DEVICE_ALIAS_1);
+ when(mDevice2.getAlias()).thenReturn(DEVICE_ALIAS_2);
when(mDevice1.getBluetoothClass()).thenReturn(DEVICE_CLASS);
when(mDevice2.getBluetoothClass()).thenReturn(DEVICE_CLASS);
when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 7765935..f5d1ccf 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -154,7 +154,6 @@
private static final String TABLE_SYSTEM = "system";
private static final String TABLE_SECURE = "secure";
private static final String TABLE_GLOBAL = "global";
- private static final String TABLE_CONFIG = "config";
// Old tables no longer exist.
private static final String TABLE_FAVORITES = "favorites";
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 10d990a..289ac80 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -605,6 +605,7 @@
Settings.Secure.ASSIST_GESTURE_SETUP_COMPLETE,
Settings.Secure.ASSIST_SCREENSHOT_ENABLED,
Settings.Secure.ASSIST_STRUCTURE_ENABLED,
+ Settings.Secure.ATTENTIVE_TIMEOUT,
Settings.Secure.AUTOFILL_FEATURE_FIELD_CLASSIFICATION,
Settings.Secure.AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT,
Settings.Secure.AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE,
diff --git a/packages/SystemUI/README.md b/packages/SystemUI/README.md
index a4dbf38..f170a11 100644
--- a/packages/SystemUI/README.md
+++ b/packages/SystemUI/README.md
@@ -24,12 +24,6 @@
ConfigurationController). They also receive a callback for onBootCompleted
since these objects may be started before the device has finished booting.
-SystemUI and SystemUIApplication also have methods for putComponent and
-getComponent which were existing systems to get a hold of other parts of
-sysui before Dependency existed. Generally new things should not be added
-to putComponent, instead Dependency and other refactoring is preferred to
-make sysui structure cleaner.
-
Each SystemUI service is expected to be a major part of system ui and the
goal is to minimize communication between them. So in general they should be
relatively silo'd.
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java
new file mode 100644
index 0000000..bd86407
--- /dev/null
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.plugins;
+
+import android.graphics.Point;
+import android.view.MotionEvent;
+import android.view.WindowManager;
+
+import com.android.systemui.plugins.annotations.ProvidesInterface;
+
+/** Plugin to handle navigation edge gestures for Back. */
+@ProvidesInterface(
+ action = NavigationEdgeBackPlugin.ACTION,
+ version = NavigationEdgeBackPlugin.VERSION)
+public interface NavigationEdgeBackPlugin extends Plugin {
+ String ACTION = "com.android.systemui.action.PLUGIN_NAVIGATION_EDGE_BACK_ACTION";
+ int VERSION = 1;
+
+
+ /** Specifies if the UI should be rendered on the left side of the screen. */
+ void setIsLeftPanel(boolean isLeftPanel);
+
+ /** Sets the insets for the gesture handling area. */
+ void setInsets(int leftInset, int rightInset);
+
+ /** Sets the display size. */
+ void setDisplaySize(Point displaySize);
+
+ /** Sets the callback that should be invoked when a Back gesture is detected. */
+ void setBackCallback(BackCallback callback);
+
+ /** Sets the base LayoutParams for the UI. */
+ void setLayoutParams(WindowManager.LayoutParams layoutParams);
+
+ /** Updates the UI based on the motion events passed in device coordinates. */
+ void onMotionEvent(MotionEvent motionEvent);
+
+ /** Callback to let the system react to the detected back gestures. */
+ interface BackCallback {
+ /** Indicates that a Back gesture was recognized and the system should go back. */
+ void triggerBack();
+
+ /** Indicates that the gesture was cancelled and the system should not go back. */
+ void cancelBack();
+ }
+}
diff --git a/packages/SystemUI/res/drawable/ic_create_bubble.xml b/packages/SystemUI/res/drawable/ic_create_bubble.xml
new file mode 100644
index 0000000..1947f58
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_create_bubble.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M12,3c-4.97,0 -9,4.03 -9,9c0,1.39 0.32,2.69 0.88,3.86l1.53,-1.53C5.15,13.6 5,12.82 5,12c0,-3.86 3.14,-7 7,-7s7,3.14 7,7s-3.14,7 -7,7c-0.83,0 -1.62,-0.15 -2.35,-0.42l-1.53,1.53C9.3,20.67 10.61,21 12,21c4.97,0 9,-4.03 9,-9C21,7.03 16.97,3 12,3z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M12.99,15.99l2,0l0,-7l-7,0l0,2l3.59,0l-8.79,8.8l1.41,1.41l8.79,-8.79z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/layout-television/inattentive_sleep_warning.xml b/packages/SystemUI/res/layout-television/inattentive_sleep_warning.xml
new file mode 100644
index 0000000..eb21c43
--- /dev/null
+++ b/packages/SystemUI/res/layout-television/inattentive_sleep_warning.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2019 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.
+ -->
+
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/sleep_warning_dialog_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:theme="@android:style/Theme.DeviceDefault.Dialog"
+ android:focusable="true">
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/black"
+ android:alpha="?android:backgroundDimAmount" />
+ <LinearLayout
+ android:layout_width="380dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/rounded_bg_full"
+ android:padding="16dp"
+ android:layout_margin="32dp"
+ android:layout_gravity="bottom|right"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/inattentive_sleep_warning_title"
+ android:layout_marginBottom="8dp"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/inattentive_sleep_warning_message"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault"/>
+ </LinearLayout>
+</FrameLayout>
diff --git a/packages/SystemUI/res/layout/inattentive_sleep_warning.xml b/packages/SystemUI/res/layout/inattentive_sleep_warning.xml
new file mode 100644
index 0000000..f1f9b1f
--- /dev/null
+++ b/packages/SystemUI/res/layout/inattentive_sleep_warning.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2019 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.
+ -->
+
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/sleep_warning_dialog_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:theme="@android:style/Theme.Material.Dialog"
+ android:focusable="true">
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/black"
+ android:alpha="?android:backgroundDimAmount" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/rounded_bg_full"
+ android:layout_margin="8dp"
+ android:padding="16dp"
+ android:layout_gravity="top"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/inattentive_sleep_warning_title"
+ android:layout_marginBottom="8dp"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="@android:style/TextAppearance.Material.Large"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/inattentive_sleep_warning_message"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textAppearance="@android:style/TextAppearance.Material"/>
+ </LinearLayout>
+</FrameLayout>
diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml
index 87de9d4..964a591 100644
--- a/packages/SystemUI/res/layout/notification_info.xml
+++ b/packages/SystemUI/res/layout/notification_info.xml
@@ -220,6 +220,58 @@
android:orientation="vertical">
<com.android.systemui.statusbar.notification.row.ButtonLinearLayout
+ android:id="@+id/bubble"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/notification_importance_button_padding"
+ android:layout_marginBottom="@dimen/notification_importance_button_separation"
+ android:clickable="true"
+ android:focusable="true"
+ android:background="@drawable/notification_guts_priority_button_bg"
+ android:orientation="vertical">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center"
+ >
+ <ImageView
+ android:id="@+id/bubble_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_create_bubble"
+ android:background="@android:color/transparent"
+ android:tint="@color/notification_guts_priority_contents"
+ android:clickable="false"
+ android:focusable="false"/>
+ <TextView
+ android:id="@+id/bubble_label"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/notification_importance_drawable_padding"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:clickable="false"
+ android:focusable="false"
+ android:textAppearance="@style/TextAppearance.NotificationImportanceButton"
+ android:text="@string/notification_bubble_title"/>
+ </LinearLayout>
+ <TextView
+ android:id="@+id/bubble_summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/notification_importance_button_description_top_margin"
+ android:visibility="gone"
+ android:text="@string/notification_channel_summary_bubble"
+ android:clickable="false"
+ android:focusable="false"
+ android:ellipsize="end"
+ android:maxLines="2"
+ android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>
+ </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>
+
+ <com.android.systemui.statusbar.notification.row.ButtonLinearLayout
android:id="@+id/alert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index dff21cf..c3f410e 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -281,6 +281,7 @@
<item>com.android.systemui.statusbar.phone.StatusBar</item>
<item>com.android.systemui.usb.StorageNotification</item>
<item>com.android.systemui.power.PowerUI</item>
+ <item>com.android.systemui.power.InattentiveSleepWarningController</item>
<item>com.android.systemui.media.RingtonePlayer</item>
<item>com.android.systemui.keyboard.KeyboardUI</item>
<item>com.android.systemui.pip.PipUI</item>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 0082949..3138547 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1717,12 +1717,18 @@
<!-- [CHAR LIMIT=100] Notification Importance title -->
<string name="notification_alert_title">Alerting</string>
+ <!-- [CHAR LIMIT=100] Notification Importance title -->
+ <string name="notification_bubble_title">Bubble</string>
+
<!-- [CHAR LIMIT=150] Notification Importance title: low importance level summary -->
<string name="notification_channel_summary_low">Helps you focus without sound or vibration.</string>
<!-- [CHAR LIMIT=150] Notification Importance title: normal importance level summary -->
<string name="notification_channel_summary_default">Gets your attention with sound or vibration.</string>
+ <!-- [CHAR LIMIT=150] Notification Importance title: bubble level summary -->
+ <string name="notification_channel_summary_bubble">Keeps your attention with a floating shortcut to this content.</string>
+
<!-- Notification: Control panel: Label that displays when the app's notifications cannot be blocked. -->
<string name="notification_unblockable_desc">These notifications can\'t be modified.</string>
@@ -2501,4 +2507,11 @@
<!-- Notification content text when switching to a default launcher that supports gesture navigation [CHAR LIMIT=NONE] -->
<string name="notification_content_gesture_nav_available">Go to Settings to update system navigation</string>
+ <!-- Title of the overlay warning the user to interact with the device or it will go to sleep. [CHAR LIMIT=25] -->
+ <string name="inattentive_sleep_warning_title">Standby</string>
+ <!-- Message of the overlay warning the user to interact with the device or it will go to sleep. [CHAR LIMIT=NONE] -->
+ <string name="inattentive_sleep_warning_message" product="tv">The Android TV device will soon turn off; press a button to keep it on.</string>
+ <!-- Message of the overlay warning the user to interact with the device or it will go to sleep. [CHAR LIMIT=NONE] -->
+ <string name="inattentive_sleep_warning_message" product="default">The device will soon turn off; press to keep it on.</string>
+
</resources>
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index b9fe933..91b22d1 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -46,6 +46,7 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
+import com.android.settingslib.utils.ThreadUtils;
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.SystemUIFactory;
@@ -617,6 +618,15 @@
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__SUCCESS);
mLockPatternUtils.reportSuccessfulPasswordAttempt(userId);
+ // Force a garbage collection in an attempt to erase any lockscreen password left in
+ // memory. Do it asynchronously with a 5-sec delay to avoid making the keyguard
+ // dismiss animation janky.
+ ThreadUtils.postOnBackgroundThread(() -> {
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException ignored) { }
+ Runtime.getRuntime().gc();
+ });
} else {
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__FAILURE);
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index 91ee1b9..1a0690c 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -75,10 +75,10 @@
import com.android.systemui.statusbar.VibratorHelper;
import com.android.systemui.statusbar.notification.NotificationAlertingManager;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
+import com.android.systemui.statusbar.notification.NotificationEntryManager.KeyguardEnvironment;
import com.android.systemui.statusbar.notification.NotificationFilter;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.ChannelEditorDialogController;
import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;
@@ -125,6 +125,7 @@
import com.android.systemui.util.leak.LeakDetector;
import com.android.systemui.util.leak.LeakReporter;
import com.android.systemui.util.sensors.AsyncSensorManager;
+import com.android.systemui.wm.DisplayWindowController;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -332,6 +333,7 @@
@Inject Lazy<CommandQueue> mCommandQueue;
@Inject Lazy<Recents> mRecents;
@Inject Lazy<StatusBar> mStatusBar;
+ @Inject Lazy<DisplayWindowController> mDisplayWindowController;
@Inject
public Dependency() {
@@ -523,6 +525,7 @@
mProviders.put(CommandQueue.class, mCommandQueue::get);
mProviders.put(Recents.class, mRecents::get);
mProviders.put(StatusBar.class, mStatusBar::get);
+ mProviders.put(DisplayWindowController.class, mDisplayWindowController::get);
// TODO(b/118592525): to support multi-display , we start to add something which is
// per-display, while others may be global. I think it's time to add
diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java
index 385de4a..15a5c27 100644
--- a/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java
+++ b/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java
@@ -139,8 +139,7 @@
// Update appOp if there's an associated pending or visible notification:
final String foregroundKey = getStandardLayoutKey(userId, packageName);
if (foregroundKey != null) {
- final NotificationEntry entry = mEntryManager.getPendingOrCurrentNotif(
- foregroundKey);
+ final NotificationEntry entry = mEntryManager.getPendingOrActiveNotif(foregroundKey);
if (entry != null
&& uid == entry.getSbn().getUid()
&& packageName.equals(entry.getSbn().getPackageName())) {
diff --git a/packages/SystemUI/src/com/android/systemui/SysUiServiceProvider.java b/packages/SystemUI/src/com/android/systemui/SysUiServiceProvider.java
deleted file mode 100644
index ff4b7cb..0000000
--- a/packages/SystemUI/src/com/android/systemui/SysUiServiceProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.systemui;
-
-import android.content.Context;
-
-/**
- * The interface for getting core components of SysUI. Exists for Testability
- * since tests don't have SystemUIApplication as their ApplicationContext.
- */
-public interface SysUiServiceProvider {
- <T> T getComponent(Class<T> interfaceType);
-
- public static <T> T getComponent(Context context, Class<T> interfaceType) {
- return ((SysUiServiceProvider) context.getApplicationContext()).getComponent(interfaceType);
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUI.java b/packages/SystemUI/src/com/android/systemui/SystemUI.java
index 7570037..f795faf 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUI.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUI.java
@@ -23,11 +23,9 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
-import java.util.Map;
-public abstract class SystemUI implements SysUiServiceProvider {
+public abstract class SystemUI {
protected final Context mContext;
- public Map<Class<?>, Object> mComponents;
public SystemUI(Context context) {
mContext = context;
@@ -44,17 +42,6 @@
protected void onBootCompleted() {
}
- @SuppressWarnings("unchecked")
- public <T> T getComponent(Class<T> interfaceType) {
- return (T) (mComponents != null ? mComponents.get(interfaceType) : null);
- }
-
- public <T, C extends T> void putComponent(Class<T> interfaceType, C component) {
- if (mComponents != null) {
- mComponents.put(interfaceType, component);
- }
- }
-
public static void overrideNotificationAppName(Context context, Notification.Builder n,
boolean system) {
final Bundle extras = new Bundle();
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
index aab4041..f0317b4 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
@@ -36,13 +36,11 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
/**
* Application class for SystemUI.
*/
-public class SystemUIApplication extends Application implements SysUiServiceProvider,
+public class SystemUIApplication extends Application implements
SystemUIAppComponentFactory.ContextInitializer {
public static final String TAG = "SystemUIService";
@@ -56,7 +54,6 @@
private SystemUI[] mServices;
private boolean mServicesStarted;
private boolean mBootCompleted;
- private final Map<Class<?>, Object> mComponents = new HashMap<>();
private SystemUIAppComponentFactory.ContextAvailableCallback mContextAvailableCallback;
public SystemUIApplication() {
@@ -141,7 +138,7 @@
public void startServicesIfNeeded() {
String[] names = getResources().getStringArray(R.array.config_systemUIServiceComponents);
- startServicesIfNeeded(names);
+ startServicesIfNeeded(/* metricsPrefix= */ "StartServices", names);
}
/**
@@ -153,10 +150,10 @@
void startSecondaryUserServicesIfNeeded() {
String[] names =
getResources().getStringArray(R.array.config_systemUIServiceComponentsPerUser);
- startServicesIfNeeded(names);
+ startServicesIfNeeded(/* metricsPrefix= */ "StartSecondaryServices", names);
}
- private void startServicesIfNeeded(String[] services) {
+ private void startServicesIfNeeded(String metricsPrefix, String[] services) {
if (mServicesStarted) {
return;
}
@@ -177,12 +174,12 @@
Process.myUserHandle().getIdentifier() + ".");
TimingsTraceLog log = new TimingsTraceLog("SystemUIBootTiming",
Trace.TRACE_TAG_APP);
- log.traceBegin("StartServices");
+ log.traceBegin(metricsPrefix);
final int N = services.length;
for (int i = 0; i < N; i++) {
String clsName = services[i];
if (DEBUG) Log.d(TAG, "loading: " + clsName);
- log.traceBegin("StartServices" + clsName);
+ log.traceBegin(metricsPrefix + clsName);
long ti = System.currentTimeMillis();
try {
SystemUI obj = mComponentHelper.resolveSystemUI(clsName);
@@ -199,7 +196,6 @@
throw new RuntimeException(ex);
}
- mServices[i].mComponents = mComponents;
if (DEBUG) Log.d(TAG, "running: " + mServices[i]);
mServices[i].start();
log.traceEnd();
@@ -232,11 +228,6 @@
}
}
- @SuppressWarnings("unchecked")
- public <T> T getComponent(Class<T> interfaceType) {
- return (T) mComponents.get(interfaceType);
- }
-
public SystemUI[] getServices() {
return mServices;
}
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java
index 4516996..170c25a 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java
@@ -71,7 +71,7 @@
private final Runnable mHideHandles = this::hideHandles;
private final Runnable mShowAndGo = this::showAndGoInternal;
private final Provider<AssistHandleViewController> mAssistHandleViewController;
- private final PhenotypeHelper mPhenotypeHelper;
+ private final DeviceConfigHelper mDeviceConfigHelper;
private final Map<AssistHandleBehavior, BehaviorController> mBehaviorMap;
private boolean mHandlesShowing = false;
@@ -90,7 +90,7 @@
AssistUtils assistUtils,
@Named(ASSIST_HANDLE_THREAD_NAME) Handler handler,
Provider<AssistHandleViewController> assistHandleViewController,
- PhenotypeHelper phenotypeHelper,
+ DeviceConfigHelper deviceConfigHelper,
Map<AssistHandleBehavior, BehaviorController> behaviorMap,
NavigationModeController navigationModeController,
DumpController dumpController) {
@@ -98,14 +98,14 @@
mAssistUtils = assistUtils;
mHandler = handler;
mAssistHandleViewController = assistHandleViewController;
- mPhenotypeHelper = phenotypeHelper;
+ mDeviceConfigHelper = deviceConfigHelper;
mBehaviorMap = behaviorMap;
mInGesturalMode = QuickStepContract.isGesturalMode(
navigationModeController.addListener(this::handleNavigationModeChange));
setBehavior(getBehaviorMode());
- mPhenotypeHelper.addOnPropertiesChangedListener(
+ mDeviceConfigHelper.addOnPropertiesChangedListener(
mHandler::post,
(properties) -> {
if (properties.getKeyset().contains(
@@ -205,19 +205,19 @@
}
private long getShownFrequencyThreshold() {
- return mPhenotypeHelper.getLong(
+ return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS,
DEFAULT_SHOWN_FREQUENCY_THRESHOLD_MS);
}
private long getShowAndGoDuration() {
- return mPhenotypeHelper.getLong(
+ return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DURATION_MS,
DEFAULT_SHOW_AND_GO_DURATION_MS);
}
private String getBehaviorMode() {
- return mPhenotypeHelper.getString(
+ return mDeviceConfigHelper.getString(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_BEHAVIOR_MODE,
DEFAULT_BEHAVIOR.toString());
}
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
index 46ae84a..9793d72 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
@@ -155,7 +155,7 @@
private final Clock mClock;
private final Handler mHandler;
- private final PhenotypeHelper mPhenotypeHelper;
+ private final DeviceConfigHelper mDeviceConfigHelper;
private final Lazy<StatusBarStateController> mStatusBarStateController;
private final Lazy<ActivityManagerWrapper> mActivityManagerWrapper;
private final Lazy<OverviewProxyService> mOverviewProxyService;
@@ -189,7 +189,7 @@
AssistHandleReminderExpBehavior(
@Named(UPTIME_NAME) Clock clock,
@Named(ASSIST_HANDLE_THREAD_NAME) Handler handler,
- PhenotypeHelper phenotypeHelper,
+ DeviceConfigHelper deviceConfigHelper,
Lazy<StatusBarStateController> statusBarStateController,
Lazy<ActivityManagerWrapper> activityManagerWrapper,
Lazy<OverviewProxyService> overviewProxyService,
@@ -199,7 +199,7 @@
Lazy<BroadcastDispatcher> broadcastDispatcher) {
mClock = clock;
mHandler = handler;
- mPhenotypeHelper = phenotypeHelper;
+ mDeviceConfigHelper = deviceConfigHelper;
mStatusBarStateController = statusBarStateController;
mActivityManagerWrapper = activityManagerWrapper;
mOverviewProxyService = overviewProxyService;
@@ -465,55 +465,55 @@
}
private long getLearningTimeMs() {
- return mPhenotypeHelper.getLong(
+ return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_LEARN_TIME_MS,
DEFAULT_LEARNING_TIME_MS);
}
private int getLearningCount() {
- return mPhenotypeHelper.getInt(
+ return mDeviceConfigHelper.getInt(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_LEARN_COUNT,
DEFAULT_LEARNING_COUNT);
}
private long getShowAndGoDelayedShortDelayMs() {
- return mPhenotypeHelper.getLong(
+ return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAYED_SHORT_DELAY_MS,
DEFAULT_SHOW_AND_GO_DELAYED_SHORT_DELAY_MS);
}
private long getShowAndGoDelayedLongDelayMs() {
- return mPhenotypeHelper.getLong(
+ return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAYED_LONG_DELAY_MS,
DEFAULT_SHOW_AND_GO_DELAYED_LONG_DELAY_MS);
}
private long getShowAndGoDelayResetTimeoutMs() {
- return mPhenotypeHelper.getLong(
+ return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAY_RESET_TIMEOUT_MS,
DEFAULT_SHOW_AND_GO_DELAY_RESET_TIMEOUT_MS);
}
private boolean getSuppressOnLockscreen() {
- return mPhenotypeHelper.getBoolean(
+ return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_LOCKSCREEN,
DEFAULT_SUPPRESS_ON_LOCKSCREEN);
}
private boolean getSuppressOnLauncher() {
- return mPhenotypeHelper.getBoolean(
+ return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_LAUNCHER,
DEFAULT_SUPPRESS_ON_LAUNCHER);
}
private boolean getSuppressOnApps() {
- return mPhenotypeHelper.getBoolean(
+ return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_APPS,
DEFAULT_SUPPRESS_ON_APPS);
}
private boolean getShowWhenTaught() {
- return mPhenotypeHelper.getBoolean(
+ return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_WHEN_TAUGHT,
DEFAULT_SHOW_WHEN_TAUGHT);
}
diff --git a/packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java b/packages/SystemUI/src/com/android/systemui/assist/DeviceConfigHelper.java
similarity index 93%
rename from packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java
rename to packages/SystemUI/src/com/android/systemui/assist/DeviceConfigHelper.java
index 05a01dd..86b7c74 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/DeviceConfigHelper.java
@@ -28,15 +28,15 @@
import javax.inject.Singleton;
/**
- * Wrapper class for retrieving phenotype flag values.
+ * Wrapper class for retrieving System UI device configuration values.
*
* Can be mocked in tests for ease of testing the effects of particular values.
*/
@Singleton
-public class PhenotypeHelper {
+public class DeviceConfigHelper {
@Inject
- public PhenotypeHelper() {}
+ public DeviceConfigHelper() {}
public long getLong(String name, long defaultValue) {
return whitelistIpcs(() ->
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
index 9f7bdd4..db1185f 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
@@ -47,6 +47,7 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.RemoteException;
@@ -78,10 +79,10 @@
import com.android.systemui.statusbar.notification.NotificationEntryListener;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.phone.NotificationGroupManager;
import com.android.systemui.statusbar.phone.ShadeController;
+import com.android.systemui.statusbar.phone.StatusBar;
import com.android.systemui.statusbar.phone.StatusBarWindowController;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.ZenModeController;
@@ -352,14 +353,13 @@
* @param userId the id of the user
*/
private void restoreBubbles(@UserIdInt int userId) {
- NotificationData notificationData =
- mNotificationEntryManager.getNotificationData();
ArraySet<String> savedBubbleKeys = mSavedBubbleKeysPerUser.get(userId);
if (savedBubbleKeys == null) {
// There were no bubbles saved for this used.
return;
}
- for (NotificationEntry e : notificationData.getNotificationsForCurrentUser()) {
+ for (NotificationEntry e :
+ mNotificationEntryManager.getActiveNotificationsForCurrentUser()) {
if (savedBubbleKeys.contains(e.getKey())
&& mNotificationInterruptionStateProvider.shouldBubbleUp(e)
&& canLaunchInActivityView(mContext, e)) {
@@ -458,7 +458,7 @@
public boolean isBubbleNotificationSuppressedFromShade(String key) {
boolean isBubbleAndSuppressed = mBubbleData.hasBubbleWithKey(key)
&& !mBubbleData.getBubbleWithKey(key).showInShadeWhenBubble();
- NotificationEntry entry = mNotificationEntryManager.getNotificationData().get(key);
+ NotificationEntry entry = mNotificationEntryManager.getActiveNotificationUnfiltered(key);
String groupKey = entry != null ? entry.getSbn().getGroupKey() : null;
boolean isSuppressedSummary = mBubbleData.isSummarySuppressed(groupKey);
boolean isSummary = key.equals(mBubbleData.getSummaryKey(groupKey));
@@ -571,7 +571,8 @@
new NotificationRemoveInterceptor() {
@Override
public boolean onNotificationRemoveRequested(String key, int reason) {
- NotificationEntry entry = mNotificationEntryManager.getNotificationData().get(key);
+ NotificationEntry entry =
+ mNotificationEntryManager.getActiveNotificationUnfiltered(key);
String groupKey = entry != null ? entry.getSbn().getGroupKey() : null;
ArrayList<Bubble> bubbleChildren = mBubbleData.getBubblesInGroup(groupKey);
@@ -768,7 +769,7 @@
String notifKey = mBubbleData.getSummaryKey(groupKey);
mBubbleData.removeSuppressedSummary(groupKey);
NotificationEntry entry =
- mNotificationEntryManager.getNotificationData().get(notifKey);
+ mNotificationEntryManager.getActiveNotificationUnfiltered(notifKey);
mNotificationEntryManager.performRemoveNotification(
entry.getSbn(), UNDEFINED_DISMISS_REASON);
}
@@ -1007,8 +1008,10 @@
Log.w(TAG, "Unable to create bubble -- no intent: " + entry.getKey());
return false;
}
+ PackageManager packageManager = StatusBar.getPackageManagerForUser(
+ context, entry.getSbn().getUser().getIdentifier());
ActivityInfo info =
- intent.getIntent().resolveActivityInfo(context.getPackageManager(), 0);
+ intent.getIntent().resolveActivityInfo(packageManager, 0);
if (info == null) {
Log.w(TAG, "Unable to send as bubble, "
+ entry.getKey() + " couldn't find activity info for intent: "
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
index f4d48b2..2ca993b 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
@@ -184,8 +184,9 @@
if (DEBUG_BUBBLE_DATA) {
Log.d(TAG, "notificationEntryUpdated: " + entry);
}
+
Bubble bubble = getBubbleWithKey(entry.getKey());
- suppressFlyout = !entry.getRanking().visuallyInterruptive() || suppressFlyout;
+ suppressFlyout |= !shouldShowFlyout(entry);
if (bubble == null) {
// Create a new bubble
@@ -298,6 +299,15 @@
return bubbleChildren;
}
+ private boolean shouldShowFlyout(NotificationEntry notif) {
+ if (notif.getRanking().visuallyInterruptive()) {
+ return true;
+ }
+ final boolean suppressedFromShade = hasBubbleWithKey(notif.getKey())
+ && !getBubbleWithKey(notif.getKey()).showInShadeWhenBubble();
+ return suppressedFromShade;
+ }
+
private void doAdd(Bubble bubble) {
if (DEBUG_BUBBLE_DATA) {
Log.d(TAG, "doAdd: " + bubble);
@@ -510,7 +520,7 @@
* required to keep grouping intact.
*
* @param minPosition the first insert point to consider
- * @param newBubble the bubble to insert
+ * @param newBubble the bubble to insert
* @return the position where the bubble was inserted
*/
private int insertBubble(int minPosition, Bubble newBubble) {
@@ -683,15 +693,19 @@
* Description of current bubble data state.
*/
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- pw.print("selected: "); pw.println(mSelectedBubble != null
+ pw.print("selected: ");
+ pw.println(mSelectedBubble != null
? mSelectedBubble.getKey()
: "null");
- pw.print("expanded: "); pw.println(mExpanded);
- pw.print("count: "); pw.println(mBubbles.size());
+ pw.print("expanded: ");
+ pw.println(mExpanded);
+ pw.print("count: ");
+ pw.println(mBubbles.size());
for (Bubble bubble : mBubbles) {
bubble.dump(fd, pw, args);
}
- pw.print("summaryKeys: "); pw.println(mSuppressedGroupKeys.size());
+ pw.print("summaryKeys: ");
+ pw.println(mSuppressedGroupKeys.size());
for (String key : mSuppressedGroupKeys.keySet()) {
pw.println(" suppressing: " + key);
}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
index 3cf14d6..25986c5 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
@@ -25,6 +25,7 @@
import com.android.systemui.globalactions.GlobalActionsComponent;
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.pip.PipUI;
+import com.android.systemui.power.InattentiveSleepWarningController;
import com.android.systemui.power.PowerUI;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsModule;
@@ -102,6 +103,13 @@
@ClassKey(PowerUI.class)
public abstract SystemUI bindPowerUI(PowerUI sysui);
+ /** Inject into InattentiveSleepWarningController. */
+ @Binds
+ @IntoMap
+ @ClassKey(InattentiveSleepWarningController.class)
+ public abstract SystemUI bindInattentiveSleepWarningController(
+ InattentiveSleepWarningController sysui);
+
/** Inject into Recents. */
@Binds
@IntoMap
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java
index 48c72d3..f44eae7 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java
@@ -25,6 +25,7 @@
import com.android.systemui.dock.DockManager;
import com.android.systemui.dock.DockManagerImpl;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.power.EnhancedEstimatesImpl;
import com.android.systemui.recents.Recents;
@@ -33,10 +34,13 @@
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
+import com.android.systemui.statusbar.notification.NotificationEntryManager;
+import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
+import com.android.systemui.statusbar.phone.KeyguardBypassController;
import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.phone.StatusBar;
+import com.android.systemui.statusbar.policy.HeadsUpManager;
import java.util.Optional;
@@ -74,7 +78,7 @@
abstract DockManager bindDockManager(DockManagerImpl dockManager);
@Binds
- abstract NotificationData.KeyguardEnvironment bindKeyguardEnvironment(
+ abstract NotificationEntryManager.KeyguardEnvironment bindKeyguardEnvironment(
KeyguardEnvironmentImpl keyguardEnvironment);
@Binds
@@ -93,6 +97,17 @@
return new Divider(context, recentsOptionalLazy);
}
+ @Singleton
+ @Provides
+ static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,
+ StatusBarStateController statusBarStateController,
+ KeyguardBypassController bypassController) {
+ return new HeadsUpManagerPhone(context, statusBarStateController, bypassController);
+ }
+
+ @Binds
+ abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone);
+
@Provides
@Singleton
static Recents provideRecents(Context context, RecentsImplementation recentsImplementation,
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
index 6ae21b3..0ac158d 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
@@ -28,10 +28,15 @@
import com.android.systemui.recents.Recents;
import com.android.systemui.stackdivider.Divider;
import com.android.systemui.statusbar.CommandQueue;
+import com.android.systemui.statusbar.notification.collection.NotifListBuilderImpl;
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;
import com.android.systemui.statusbar.notification.people.PeopleHubModule;
import com.android.systemui.statusbar.phone.KeyguardLiftController;
import com.android.systemui.statusbar.phone.StatusBar;
+import com.android.systemui.statusbar.policy.HeadsUpManager;
import com.android.systemui.util.sensors.AsyncSensorManager;
+import com.android.systemui.util.time.SystemClock;
+import com.android.systemui.util.time.SystemClockImpl;
import javax.inject.Singleton;
@@ -80,8 +85,19 @@
abstract Divider optionalDivider();
@BindsOptionalOf
+ abstract HeadsUpManager optionalHeadsUpManager();
+
+ @BindsOptionalOf
abstract Recents optionalRecents();
@BindsOptionalOf
abstract StatusBar optionalStatusBar();
+
+ @Singleton
+ @Binds
+ abstract SystemClock bindSystemClock(SystemClockImpl systemClock);
+
+ @Singleton
+ @Binds
+ abstract NotifListBuilder bindNotifListBuilder(NotifListBuilderImpl impl);
}
diff --git a/packages/SystemUI/src/com/android/systemui/dock/DockManager.java b/packages/SystemUI/src/com/android/systemui/dock/DockManager.java
index d332f59..5239082 100644
--- a/packages/SystemUI/src/com/android/systemui/dock/DockManager.java
+++ b/packages/SystemUI/src/com/android/systemui/dock/DockManager.java
@@ -53,6 +53,11 @@
*/
boolean isDocked();
+ /**
+ * Returns true if it is hiding docking UI.
+ */
+ boolean isHidden();
+
/** Callback for receiving dock events */
interface DockEventListener {
/**
diff --git a/packages/SystemUI/src/com/android/systemui/dock/DockManagerImpl.java b/packages/SystemUI/src/com/android/systemui/dock/DockManagerImpl.java
index fa7f503..f770910 100644
--- a/packages/SystemUI/src/com/android/systemui/dock/DockManagerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/dock/DockManagerImpl.java
@@ -38,4 +38,9 @@
public boolean isDocked() {
return false;
}
+
+ @Override
+ public boolean isHidden() {
+ return false;
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java b/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java
index 419fd62..c16dce1 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java
@@ -16,9 +16,7 @@
package com.android.systemui.doze;
-import android.content.Context;
import android.hardware.display.AmbientDisplayConfiguration;
-import android.os.Handler;
import android.os.UserHandle;
import android.util.Log;
@@ -35,23 +33,19 @@
private static final String TAG = "DozeDockHandler";
private static final boolean DEBUG = DozeService.DEBUG;
- private final DozeMachine mMachine;
- private final DozeHost mDozeHost;
private final AmbientDisplayConfiguration mConfig;
- private final Handler mHandler;
- private final DockEventListener mDockEventListener = new DockEventListener();
+ private final DozeMachine mMachine;
private final DockManager mDockManager;
+ private final DockEventListener mDockEventListener;
private int mDockState = DockManager.STATE_NONE;
- private boolean mPulsePending;
- public DozeDockHandler(Context context, DozeMachine machine, DozeHost dozeHost,
- AmbientDisplayConfiguration config, Handler handler, DockManager dockManager) {
+ public DozeDockHandler(AmbientDisplayConfiguration config, DozeMachine machine,
+ DockManager dockManager) {
mMachine = machine;
- mDozeHost = dozeHost;
mConfig = config;
- mHandler = handler;
mDockManager = dockManager;
+ mDockEventListener = new DockEventListener();
}
@Override
@@ -60,18 +54,6 @@
case INITIALIZED:
mDockEventListener.register();
break;
- case DOZE_AOD:
- if (mDockState == DockManager.STATE_DOCKED_HIDE) {
- mMachine.requestState(State.DOZE);
- break;
- }
- // continue below
- case DOZE:
- if (mDockState == DockManager.STATE_DOCKED && !mPulsePending) {
- mPulsePending = true;
- mHandler.post(() -> requestPulse(newState));
- }
- break;
case FINISH:
mDockEventListener.unregister();
break;
@@ -80,64 +62,36 @@
}
}
- private void requestPulse(State dozeState) {
- if (!mDozeHost.isPulsingBlocked() && dozeState.canPulse()) {
- mMachine.requestPulse(DozeEvent.PULSE_REASON_DOCKING);
- }
- mPulsePending = false;
- }
-
- private void requestPulseOutNow(State dozeState) {
- if (dozeState == State.DOZE_REQUEST_PULSE || dozeState == State.DOZE_PULSING
- || dozeState == State.DOZE_PULSING_BRIGHT) {
- final int pulseReason = mMachine.getPulseReason();
- if (pulseReason == DozeEvent.PULSE_REASON_DOCKING) {
- mDozeHost.stopPulsing();
- }
- }
- }
-
- private boolean isDocked() {
- return mDockState == DockManager.STATE_DOCKED
- || mDockState == DockManager.STATE_DOCKED_HIDE;
- }
-
@Override
public void dump(PrintWriter pw) {
- pw.print(" DozeDockTriggers docking="); pw.println(isDocked());
+ pw.println("DozeDockHandler:");
+ pw.println(" dockState=" + mDockState);
}
private class DockEventListener implements DockManager.DockEventListener {
private boolean mRegistered;
@Override
- public void onEvent(int event) {
- if (DEBUG) Log.d(TAG, "dock event = " + event);
- final DozeMachine.State dozeState = mMachine.getState();
- mDockState = event;
+ public void onEvent(int dockState) {
+ if (DEBUG) Log.d(TAG, "dock event = " + dockState);
+ final DozeMachine.State nextState;
+ mDockState = dockState;
switch (mDockState) {
case DockManager.STATE_DOCKED:
- requestPulse(dozeState);
+ nextState = State.DOZE_AOD_DOCKED;
break;
case DockManager.STATE_NONE:
- if (dozeState == State.DOZE
- && mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT)) {
- mMachine.requestState(State.DOZE_AOD);
- }
- else {
- requestPulseOutNow(dozeState);
- }
+ nextState = mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT) ? State.DOZE_AOD
+ : State.DOZE;
break;
case DockManager.STATE_DOCKED_HIDE:
- if (dozeState == State.DOZE_AOD) {
- mMachine.requestState(State.DOZE);
- } else {
- requestPulseOutNow(dozeState);
- }
+ nextState = State.DOZE;
break;
default:
- // no-op
+ return;
}
+
+ mMachine.requestState(nextState);
}
void register() {
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java b/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java
index 71e1593..43db85b 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java
@@ -102,7 +102,7 @@
wrappedService, mDozeParameters);
DozeMachine machine = new DozeMachine(wrappedService, config, wakeLock,
- mWakefulnessLifecycle, mBatteryController, mDozeLog);
+ mWakefulnessLifecycle, mBatteryController, mDozeLog, mDockManager);
machine.setParts(new DozeMachine.Part[]{
new DozePauser(mHandler, machine, mAlarmManager, mDozeParameters.getPolicy()),
new DozeFalsingManagerAdapter(mFalsingManager),
@@ -117,8 +117,7 @@
mDozeServiceHost, mDozeParameters, mHandler),
new DozeWallpaperState(mWallpaperManager, mBiometricUnlockController,
mDozeParameters),
- new DozeDockHandler(dozeService, machine, mDozeServiceHost, config, mHandler,
- mDockManager),
+ new DozeDockHandler(config, machine, mDockManager),
new DozeAuthRemover(dozeService)
});
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
index 75b1d6c..40603ab 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
@@ -24,6 +24,7 @@
import android.view.Display;
import com.android.internal.util.Preconditions;
+import com.android.systemui.dock.DockManager;
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.keyguard.WakefulnessLifecycle.Wakefulness;
import com.android.systemui.statusbar.phone.DozeParameters;
@@ -72,7 +73,9 @@
/** AOD, but the display is temporarily off. */
DOZE_AOD_PAUSED,
/** AOD, prox is near, transitions to DOZE_AOD_PAUSED after a timeout. */
- DOZE_AOD_PAUSING;
+ DOZE_AOD_PAUSING,
+ /** Always-on doze. Device is awake, showing docking UI and listening for pulse triggers. */
+ DOZE_AOD_DOCKED;
boolean canPulse() {
switch (this) {
@@ -80,6 +83,7 @@
case DOZE_AOD:
case DOZE_AOD_PAUSED:
case DOZE_AOD_PAUSING:
+ case DOZE_AOD_DOCKED:
return true;
default:
return false;
@@ -91,6 +95,7 @@
case DOZE_REQUEST_PULSE:
case DOZE_PULSING:
case DOZE_PULSING_BRIGHT:
+ case DOZE_AOD_DOCKED:
return true;
default:
return false;
@@ -109,6 +114,7 @@
return Display.STATE_OFF;
case DOZE_PULSING:
case DOZE_PULSING_BRIGHT:
+ case DOZE_AOD_DOCKED:
return Display.STATE_ON;
case DOZE_AOD:
case DOZE_AOD_PAUSING:
@@ -130,16 +136,18 @@
private State mState = State.UNINITIALIZED;
private int mPulseReason;
private boolean mWakeLockHeldForCurrentState = false;
+ private DockManager mDockManager;
- public DozeMachine(Service service, AmbientDisplayConfiguration config,
- WakeLock wakeLock, WakefulnessLifecycle wakefulnessLifecycle,
- BatteryController batteryController, DozeLog dozeLog) {
+ public DozeMachine(Service service, AmbientDisplayConfiguration config, WakeLock wakeLock,
+ WakefulnessLifecycle wakefulnessLifecycle, BatteryController batteryController,
+ DozeLog dozeLog, DockManager dockManager) {
mDozeService = service;
mConfig = config;
mWakefulnessLifecycle = wakefulnessLifecycle;
mWakeLock = wakeLock;
mBatteryController = batteryController;
mDozeLog = dozeLog;
+ mDockManager = dockManager;
}
/** Initializes the set of {@link Part}s. Must be called exactly once after construction. */
@@ -352,6 +360,8 @@
if (wakefulness == WakefulnessLifecycle.WAKEFULNESS_AWAKE
|| wakefulness == WakefulnessLifecycle.WAKEFULNESS_WAKING) {
nextState = State.FINISH;
+ } else if (mDockManager.isDocked()) {
+ nextState = mDockManager.isHidden() ? State.DOZE : State.DOZE_AOD_DOCKED;
} else if (mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT)) {
nextState = State.DOZE_AOD;
} else {
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
index 39a2562..c9faf69 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
@@ -113,6 +113,7 @@
break;
case DOZE_AOD:
case DOZE_REQUEST_PULSE:
+ case DOZE_AOD_DOCKED:
setLightSensorEnabled(true);
break;
case DOZE:
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
index e1b4f31..3abeea9 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
@@ -18,6 +18,7 @@
import static com.android.systemui.doze.DozeMachine.State.DOZE;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD;
+import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_DOCKED;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSED;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSING;
import static com.android.systemui.doze.DozeMachine.State.DOZE_PULSE_DONE;
@@ -89,10 +90,10 @@
}
final boolean messagePending = mHandler.hasCallbacks(mApplyPendingScreenState);
- final boolean pulseEnding = oldState == DOZE_PULSE_DONE && newState == DOZE_AOD;
- final boolean turningOn = (oldState == DOZE_AOD_PAUSED
- || oldState == DOZE) && newState == DOZE_AOD;
- final boolean turningOff = (oldState == DOZE_AOD && newState == DOZE)
+ final boolean pulseEnding = oldState == DOZE_PULSE_DONE && isAlwaysOnState(newState);
+ final boolean turningOn = (oldState == DOZE_AOD_PAUSED || oldState == DOZE)
+ && isAlwaysOnState(newState);
+ final boolean turningOff = (isAlwaysOnState(oldState) && newState == DOZE)
|| (oldState == DOZE_AOD_PAUSING && newState == DOZE_AOD_PAUSED);
final boolean justInitialized = oldState == DozeMachine.State.INITIALIZED;
if (messagePending || justInitialized || pulseEnding || turningOn) {
@@ -131,6 +132,10 @@
}
}
+ private boolean isAlwaysOnState(DozeMachine.State state) {
+ return state == DOZE_AOD || state == DOZE_AOD_DOCKED;
+ }
+
private void applyPendingScreenState() {
applyScreenState(mPendingScreenState);
mPendingScreenState = Display.STATE_UNKNOWN;
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index 1134268..2d6b946 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -304,9 +304,7 @@
case INITIALIZED:
mBroadcastReceiver.register(mBroadcastDispatcher);
mDozeHost.addCallback(mHostCallback);
- if (mDockManager != null) {
- mDockManager.addListener(mDockEventListener);
- }
+ mDockManager.addListener(mDockEventListener);
mDozeSensors.requestTemporaryDisable();
checkTriggersAtInit();
break;
@@ -326,6 +324,7 @@
break;
case DOZE_PULSING:
case DOZE_PULSING_BRIGHT:
+ case DOZE_AOD_DOCKED:
mDozeSensors.setTouchscreenSensorsListening(false);
mDozeSensors.setProxListening(true);
mDozeSensors.setPaused(false);
@@ -339,9 +338,7 @@
case FINISH:
mBroadcastReceiver.unregister(mBroadcastDispatcher);
mDozeHost.removeCallback(mHostCallback);
- if (mDockManager != null) {
- mDockManager.removeListener(mDockEventListener);
- }
+ mDockManager.removeListener(mDockEventListener);
mDozeSensors.setListening(false);
mDozeSensors.setProxListening(false);
break;
@@ -399,7 +396,8 @@
private boolean canPulse() {
return mMachine.getState() == DozeMachine.State.DOZE
- || mMachine.getState() == DozeMachine.State.DOZE_AOD;
+ || mMachine.getState() == DozeMachine.State.DOZE_AOD
+ || mMachine.getState() == DozeMachine.State.DOZE_AOD_DOCKED;
}
private void continuePulseRequest(int reason) {
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
index f155783..a6aa909 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
@@ -121,6 +121,7 @@
public void transitionTo(DozeMachine.State oldState, DozeMachine.State newState) {
switch (newState) {
case DOZE_AOD:
+ case DOZE_AOD_DOCKED:
if (oldState == DOZE_AOD_PAUSED || oldState == DOZE) {
// Whenever turning on the display, it's necessary to push a new frame.
// The display buffers will be empty and need to be filled.
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java b/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java
index 9457dc9..7f1b356 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeWallpaperState.java
@@ -54,6 +54,7 @@
switch (newState) {
case DOZE:
case DOZE_AOD:
+ case DOZE_AOD_DOCKED:
case DOZE_AOD_PAUSING:
case DOZE_AOD_PAUSED:
case DOZE_REQUEST_PULSE:
diff --git a/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningController.java b/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningController.java
new file mode 100644
index 0000000..7169431
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningController.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.power;
+
+import android.content.Context;
+
+import com.android.systemui.SystemUI;
+import com.android.systemui.statusbar.CommandQueue;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Receives messages sent from {@link com.android.server.power.InattentiveSleepWarningController}
+ * and shows the appropriate inattentive sleep UI (e.g. {@link InattentiveSleepWarningView}).
+ */
+@Singleton
+public class InattentiveSleepWarningController extends SystemUI implements CommandQueue.Callbacks {
+ private final CommandQueue mCommandQueue;
+ private InattentiveSleepWarningView mOverlayView;
+
+ @Inject
+ public InattentiveSleepWarningController(Context context, CommandQueue commandQueue) {
+ super(context);
+ mCommandQueue = commandQueue;
+ }
+
+ @Override
+ public void start() {
+ mCommandQueue.addCallback(this);
+ }
+
+ @Override
+ public void showInattentiveSleepWarning() {
+ if (mOverlayView == null) {
+ mOverlayView = new InattentiveSleepWarningView(mContext);
+ }
+
+ mOverlayView.show();
+ }
+
+ @Override
+ public void dismissInattentiveSleepWarning() {
+ if (mOverlayView != null) {
+ mOverlayView.dismiss();
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningView.java b/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningView.java
new file mode 100644
index 0000000..8ccc679
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningView.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.power;
+
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.os.Binder;
+import android.os.IBinder;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+import com.android.systemui.R;
+
+/**
+ * View that shows a warning shortly before the device goes into sleep
+ * after prolonged user inactivity when bound to.
+ */
+public class InattentiveSleepWarningView extends FrameLayout {
+ private final IBinder mWindowToken = new Binder();
+ private final WindowManager mWindowManager;
+
+ InattentiveSleepWarningView(Context context) {
+ super(context);
+ mWindowManager = mContext.getSystemService(WindowManager.class);
+
+ final LayoutInflater layoutInflater = LayoutInflater.from(mContext);
+ layoutInflater.inflate(R.layout.inattentive_sleep_warning, this, true /* attachToRoot */);
+
+ setFocusable(true);
+ setOnKeyListener((v, keyCode, event) -> {
+ // overlay consumes key presses
+ return true;
+ });
+ }
+
+ /**
+ * Show the warning.
+ */
+ public void show() {
+ if (getParent() == null) {
+ mWindowManager.addView(this, getLayoutParams(mWindowToken));
+ }
+ }
+
+ /**
+ * Dismiss the warning.
+ */
+ public void dismiss() {
+ if (getParent() != null) {
+ mWindowManager.removeView(this);
+ }
+ }
+
+ /**
+ * @param windowToken token for the window
+ */
+ private WindowManager.LayoutParams getLayoutParams(IBinder windowToken) {
+ final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+ WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT);
+ lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
+ lp.setTitle("InattentiveSleepWarning");
+ lp.token = windowToken;
+ return lp;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java b/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java
index 6949640..1a4c327 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java
@@ -47,7 +47,9 @@
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+import com.android.settingslib.media.MediaDevice;
import com.android.settingslib.media.MediaOutputSliceConstants;
+import com.android.settingslib.widget.AdaptiveIcon;
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.plugins.ActivityStarter;
@@ -61,10 +63,13 @@
private Context mContext;
private LinearLayout mMediaNotifView;
+ private View mSeamless;
private MediaSession.Token mToken;
private MediaController mController;
private int mWidth;
private int mHeight;
+ private int mForegroundColor;
+ private int mBackgroundColor;
/**
*
@@ -93,15 +98,17 @@
* @param iconColor foreground color (for text, icons)
* @param bgColor background color
* @param actionsContainer a LinearLayout containing the media action buttons
- * @param notif
+ * @param notif reference to original notification
+ * @param device current playback device
*/
public void setMediaSession(MediaSession.Token token, Icon icon, int iconColor, int bgColor,
- View actionsContainer, Notification notif) {
+ View actionsContainer, Notification notif, MediaDevice device) {
Log.d(TAG, "got media session: " + token);
mToken = token;
+ mForegroundColor = iconColor;
+ mBackgroundColor = bgColor;
mController = new MediaController(mContext, token);
MediaMetadata mMediaMetadata = mController.getMetadata();
-
if (mMediaMetadata == null) {
Log.e(TAG, "Media metadata was null");
return;
@@ -123,9 +130,6 @@
headerView.removeAllViews();
headerView.addView(result);
- View seamless = headerView.findViewById(com.android.internal.R.id.media_seamless);
- seamless.setVisibility(View.VISIBLE);
-
// App icon
ImageView appIcon = headerView.findViewById(com.android.internal.R.id.icon);
Drawable iconDrawable = icon.loadDrawable(mContext);
@@ -168,23 +172,11 @@
}
// Transfer chip
- View transferBackgroundView = headerView.findViewById(
- com.android.internal.R.id.media_seamless);
- LinearLayout viewLayout = (LinearLayout) transferBackgroundView;
- RippleDrawable bkgDrawable = (RippleDrawable) viewLayout.getBackground();
- GradientDrawable rect = (GradientDrawable) bkgDrawable.getDrawable(0);
- rect.setStroke(2, iconColor);
- rect.setColor(bgColor);
- ImageView transferIcon = headerView.findViewById(
- com.android.internal.R.id.media_seamless_image);
- transferIcon.setBackgroundColor(bgColor);
- transferIcon.setImageTintList(ColorStateList.valueOf(iconColor));
- TextView transferText = headerView.findViewById(
- com.android.internal.R.id.media_seamless_text);
- transferText.setTextColor(iconColor);
-
+ mSeamless = headerView.findViewById(com.android.internal.R.id.media_seamless);
+ mSeamless.setVisibility(View.VISIBLE);
+ updateChip(device);
ActivityStarter mActivityStarter = Dependency.get(ActivityStarter.class);
- transferBackgroundView.setOnClickListener(v -> {
+ mSeamless.setOnClickListener(v -> {
final Intent intent = new Intent()
.setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT);
mActivityStarter.startActivity(intent, false, true /* dismissShade */,
@@ -219,10 +211,13 @@
com.android.internal.R.id.action3,
com.android.internal.R.id.action4
};
- for (int i = 0; i < parentActionsLayout.getChildCount() && i < actionIds.length; i++) {
+
+ int i = 0;
+ for (; i < parentActionsLayout.getChildCount() && i < actionIds.length; i++) {
ImageButton thisBtn = mMediaNotifView.findViewById(actionIds[i]);
ImageButton thatBtn = parentActionsLayout.findViewById(notifActionIds[i]);
- if (thatBtn == null || thatBtn.getDrawable() == null) {
+ if (thatBtn == null || thatBtn.getDrawable() == null
+ || thatBtn.getVisibility() != View.VISIBLE) {
thisBtn.setVisibility(View.GONE);
continue;
}
@@ -235,6 +230,13 @@
thatBtn.performClick();
});
}
+
+ // Hide any unused buttons
+ for (; i < actionIds.length; i++) {
+ ImageButton thisBtn = mMediaNotifView.findViewById(actionIds[i]);
+ thisBtn.setVisibility(View.GONE);
+ Log.d(TAG, "hid a button");
+ }
}
public MediaSession.Token getMediaSessionToken() {
@@ -284,6 +286,7 @@
mMediaNotifView.setBackground(roundedDrawable);
} else {
Log.e(TAG, "No album art available");
+ mMediaNotifView.setBackground(null);
}
}
@@ -303,4 +306,41 @@
return cropped;
}
+
+ protected void updateChip(MediaDevice device) {
+ if (mSeamless == null) {
+ return;
+ }
+ ColorStateList fgTintList = ColorStateList.valueOf(mForegroundColor);
+
+ // Update the outline color
+ LinearLayout viewLayout = (LinearLayout) mSeamless;
+ RippleDrawable bkgDrawable = (RippleDrawable) viewLayout.getBackground();
+ GradientDrawable rect = (GradientDrawable) bkgDrawable.getDrawable(0);
+ rect.setStroke(2, mForegroundColor);
+ rect.setColor(mBackgroundColor);
+
+ ImageView iconView = mSeamless.findViewById(com.android.internal.R.id.media_seamless_image);
+ TextView deviceName = mSeamless.findViewById(com.android.internal.R.id.media_seamless_text);
+ deviceName.setTextColor(fgTintList);
+
+ if (device != null) {
+ Drawable icon = device.getIcon();
+ iconView.setVisibility(View.VISIBLE);
+ iconView.setImageTintList(fgTintList);
+
+ if (icon instanceof AdaptiveIcon) {
+ AdaptiveIcon aIcon = (AdaptiveIcon) icon;
+ aIcon.setBackgroundColor(mBackgroundColor);
+ iconView.setImageDrawable(aIcon);
+ } else {
+ iconView.setImageDrawable(icon);
+ }
+ deviceName.setText(device.getName());
+ } else {
+ // Reset to default
+ iconView.setVisibility(View.GONE);
+ deviceName.setText(com.android.internal.R.string.ext_media_seamless_action);
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index cac9025..5e98f93 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -46,6 +46,8 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.Utils;
+import com.android.settingslib.media.LocalMediaManager;
+import com.android.settingslib.media.MediaDevice;
import com.android.systemui.Dependency;
import com.android.systemui.DumpController;
import com.android.systemui.Dumpable;
@@ -70,6 +72,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
@@ -92,6 +95,8 @@
private final LinearLayout mMediaCarousel;
private final ArrayList<QSMediaPlayer> mMediaPlayers = new ArrayList<>();
+ private LocalMediaManager mLocalMediaManager;
+ private MediaDevice mDevice;
protected boolean mExpanded;
protected boolean mListening;
@@ -117,6 +122,31 @@
private final PluginManager mPluginManager;
private NPVPluginManager mNPVPluginManager;
+ private final LocalMediaManager.DeviceCallback mDeviceCallback =
+ new LocalMediaManager.DeviceCallback() {
+ @Override
+ public void onDeviceListUpdate(List<MediaDevice> devices) {
+ MediaDevice currentDevice = mLocalMediaManager.getCurrentConnectedDevice();
+ // Check because this can be called several times while changing devices
+ if (mDevice == null || !mDevice.equals(currentDevice)) {
+ mDevice = currentDevice;
+ for (QSMediaPlayer p : mMediaPlayers) {
+ p.updateChip(mDevice);
+ }
+ }
+ }
+
+ @Override
+ public void onSelectedDeviceStateChanged(MediaDevice device, int state) {
+ if (mDevice == null || !mDevice.equals(device)) {
+ mDevice = device;
+ for (QSMediaPlayer p : mMediaPlayers) {
+ p.updateChip(mDevice);
+ }
+ }
+ }
+ };
+
public QSPanel(Context context) {
this(context, null);
}
@@ -208,6 +238,11 @@
Log.e(TAG, "Tried to add media session without player!");
return;
}
+ if (token == null) {
+ Log.e(TAG, "Media session token was null!");
+ return;
+ }
+
QSMediaPlayer player = null;
String packageName = notif.getPackageName();
for (QSMediaPlayer p : mMediaPlayers) {
@@ -250,10 +285,17 @@
Log.d(TAG, "setting player session");
player.setMediaSession(token, icon, iconColor, bgColor, actionsContainer,
- notif.getNotification());
+ notif.getNotification(), mDevice);
if (mMediaPlayers.size() > 0) {
((View) mMediaCarousel.getParent()).setVisibility(View.VISIBLE);
+
+ // Set up listener for device changes
+ // TODO: integrate with MediaTransferManager?
+ mLocalMediaManager = new LocalMediaManager(mContext, null, null);
+ mLocalMediaManager.startScan();
+ mDevice = mLocalMediaManager.getCurrentConnectedDevice();
+ mLocalMediaManager.registerCallback(mDeviceCallback);
}
}
@@ -326,6 +368,10 @@
mBrightnessMirrorController.removeCallback(this);
}
if (mDumpController != null) mDumpController.unregisterDumpable(this);
+ if (mLocalMediaManager != null) {
+ mLocalMediaManager.stopScan();
+ mLocalMediaManager.unregisterCallback(mDeviceCallback);
+ }
super.onDetachedFromWindow();
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java
index 3ec71ac..d7b8b83 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java
@@ -76,9 +76,11 @@
* @param iconColor foreground color (for text, icons)
* @param bgColor background color
* @param actionsContainer a LinearLayout containing the media action buttons
+ * @param actionsToShow indices of which actions to display in the mini player
+ * (max 3: Notification.MediaStyle.MAX_MEDIA_BUTTONS_IN_COMPACT)
*/
public void setMediaSession(MediaSession.Token token, Icon icon, int iconColor, int bgColor,
- View actionsContainer) {
+ View actionsContainer, int[] actionsToShow) {
Log.d(TAG, "Setting media session: " + token);
mToken = token;
mController = new MediaController(mContext, token);
@@ -110,32 +112,46 @@
titleText.setText(songName);
titleText.setTextColor(iconColor);
- // Action buttons
- LinearLayout parentActionsLayout = (LinearLayout) actionsContainer;
+ // Buttons we can display
final int[] actionIds = {R.id.action0, R.id.action1, R.id.action2};
- // TODO some apps choose different buttons to show in compact mode
+ // Existing buttons in the notification
+ LinearLayout parentActionsLayout = (LinearLayout) actionsContainer;
final int[] notifActionIds = {
+ com.android.internal.R.id.action0,
com.android.internal.R.id.action1,
com.android.internal.R.id.action2,
- com.android.internal.R.id.action3
+ com.android.internal.R.id.action3,
+ com.android.internal.R.id.action4
};
- for (int i = 0; i < parentActionsLayout.getChildCount() && i < actionIds.length; i++) {
- ImageButton thisBtn = mMediaNotifView.findViewById(actionIds[i]);
- ImageButton thatBtn = parentActionsLayout.findViewById(notifActionIds[i]);
- if (thatBtn == null || thatBtn.getDrawable() == null) {
- thisBtn.setVisibility(View.GONE);
- continue;
+
+ int i = 0;
+ if (actionsToShow != null) {
+ int maxButtons = Math.min(actionsToShow.length, parentActionsLayout.getChildCount());
+ maxButtons = Math.min(maxButtons, actionIds.length);
+ for (; i < maxButtons; i++) {
+ ImageButton thisBtn = mMediaNotifView.findViewById(actionIds[i]);
+ int thatId = notifActionIds[actionsToShow[i]];
+ ImageButton thatBtn = parentActionsLayout.findViewById(thatId);
+ if (thatBtn == null || thatBtn.getDrawable() == null
+ || thatBtn.getVisibility() != View.VISIBLE) {
+ thisBtn.setVisibility(View.GONE);
+ continue;
+ }
+
+ Drawable thatIcon = thatBtn.getDrawable();
+ thisBtn.setImageDrawable(thatIcon.mutate());
+ thisBtn.setVisibility(View.VISIBLE);
+ thisBtn.setOnClickListener(v -> {
+ thatBtn.performClick();
+ });
}
+ }
- Drawable thatIcon = thatBtn.getDrawable();
- thisBtn.setImageDrawable(thatIcon.mutate());
- thisBtn.setVisibility(View.VISIBLE);
-
- thisBtn.setOnClickListener(v -> {
- Log.d(TAG, "clicking on other button");
- thatBtn.performClick();
- });
+ // Hide any unused buttons
+ for (; i < actionIds.length; i++) {
+ ImageButton thisBtn = mMediaNotifView.findViewById(actionIds[i]);
+ thisBtn.setVisibility(View.GONE);
}
}
@@ -186,6 +202,7 @@
mMediaNotifView.setBackground(roundedDrawable);
} else {
Log.e(TAG, "No album art available");
+ mMediaNotifView.setBackground(null);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
index 94a1cf0..d377f1c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
@@ -319,7 +319,14 @@
} else{
mColumns = mCellWidth == 0 ? 1 :
Math.min(maxTiles, availableWidth / mCellWidth );
- mCellMarginHorizontal = (availableWidth - mColumns * mCellWidth) / (mColumns - 1);
+ // If we can only fit one column, use mCellMarginHorizontal to center it.
+ if (mColumns == 1) {
+ mCellMarginHorizontal = (availableWidth - mCellWidth) / 2;
+ } else {
+ mCellMarginHorizontal =
+ (availableWidth - mColumns * mCellWidth) / (mColumns - 1);
+ }
+
}
return mColumns != prevNumColumns;
}
@@ -357,6 +364,10 @@
@Override
protected int getColumnStart(int column) {
+ if (mColumns == 1) {
+ // Only one column/tile. Use the margin to center the tile.
+ return getPaddingStart() + mCellMarginHorizontal;
+ }
return getPaddingStart() + column * (mCellWidth + mCellMarginHorizontal);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java
index 60bc6b6..fcdd234 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyRecentsImpl.java
@@ -35,7 +35,6 @@
import com.android.systemui.Dependency;
import com.android.systemui.R;
-import com.android.systemui.SysUiServiceProvider;
import com.android.systemui.shared.recents.IOverviewProxy;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.stackdivider.Divider;
@@ -73,7 +72,7 @@
}
@Override
- public void onStart(Context context, SysUiServiceProvider sysUiServiceProvider) {
+ public void onStart(Context context) {
mContext = context;
mHandler = new Handler();
mTrustManager = (TrustManager) context.getSystemService(Context.TRUST_SERVICE);
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
index 882930b..5f37cc45 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
@@ -45,7 +45,7 @@
@Override
public void start() {
mCommandQueue.addCallback(this);
- mImpl.onStart(mContext, this);
+ mImpl.onStart(mContext);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java
index 8cd17e9..1d29ac6 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImplementation.java
@@ -19,15 +19,13 @@
import android.content.res.Configuration;
import android.graphics.Rect;
-import com.android.systemui.SysUiServiceProvider;
-
import java.io.PrintWriter;
/**
* API for creating a Recents view.
*/
public interface RecentsImplementation {
- default void onStart(Context context, SysUiServiceProvider sysUiServiceProvider) {}
+ default void onStart(Context context) {}
default void onBootCompleted() {}
default void onAppTransitionFinished() {}
default void onConfigurationChanged(Configuration newConfig) {}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/DeleteImageInBackgroundTask.java b/packages/SystemUI/src/com/android/systemui/screenshot/DeleteImageInBackgroundTask.java
new file mode 100644
index 0000000..8c48655
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/DeleteImageInBackgroundTask.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.screenshot;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.net.Uri;
+import android.os.AsyncTask;
+
+/**
+ * An AsyncTask that deletes an image from the media store in the background.
+ */
+class DeleteImageInBackgroundTask extends AsyncTask<Uri, Void, Void> {
+ private Context mContext;
+
+ DeleteImageInBackgroundTask(Context context) {
+ mContext = context;
+ }
+
+ @Override
+ protected Void doInBackground(Uri... params) {
+ if (params.length != 1) return null;
+
+ Uri screenshotUri = params[0];
+ ContentResolver resolver = mContext.getContentResolver();
+ resolver.delete(screenshotUri, null, null);
+ return null;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index 3ff6d0d..7963203 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@ -32,49 +32,31 @@
import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.ActivityOptions;
-import android.app.ActivityTaskManager;
import android.app.Notification;
-import android.app.Notification.BigPictureStyle;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
-import android.content.ClipData;
-import android.content.ClipDescription;
import android.content.ComponentName;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.UserInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Picture;
import android.graphics.PixelFormat;
import android.graphics.PointF;
import android.graphics.Rect;
import android.media.MediaActionSound;
import android.net.Uri;
import android.os.AsyncTask;
-import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.os.PowerManager;
-import android.os.Process;
-import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserHandle;
-import android.os.UserManager;
import android.provider.DeviceConfig;
-import android.provider.MediaStore;
-import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.Slog;
@@ -90,25 +72,15 @@
import android.widget.Toast;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
import com.android.systemui.R;
import com.android.systemui.SystemUI;
-import com.android.systemui.SystemUIFactory;
import com.android.systemui.dagger.qualifiers.MainResources;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.statusbar.phone.StatusBar;
import com.android.systemui.util.NotificationChannels;
-import libcore.io.IoUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -131,7 +103,7 @@
/**
* POD used in the AsyncTask which saves an image in the background.
*/
- private static class SaveImageInBackgroundData {
+ static class SaveImageInBackgroundData {
public Context context;
public Bitmap image;
public Uri imageUri;
@@ -147,396 +119,12 @@
imageUri = null;
iconSize = 0;
}
+
void clearContext() {
context = null;
}
}
- /**
- * An AsyncTask that saves an image to the media store in the background.
- */
- private static class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
- private static final String TAG = "SaveImageInBackgroundTask";
-
- private static final String SCREENSHOT_FILE_NAME_TEMPLATE = "Screenshot_%s.png";
- private static final String SCREENSHOT_SHARE_SUBJECT_TEMPLATE = "Screenshot (%s)";
-
- private final SaveImageInBackgroundData mParams;
- private final NotificationManager mNotificationManager;
- private final Notification.Builder mNotificationBuilder, mPublicNotificationBuilder;
- private final String mImageFileName;
- private final long mImageTime;
- private final BigPictureStyle mNotificationStyle;
- private final int mImageWidth;
- private final int mImageHeight;
- private final Handler mHandler;
- private final ScreenshotNotificationSmartActionsProvider mSmartActionsProvider;
-
- SaveImageInBackgroundTask(Context context, SaveImageInBackgroundData data,
- NotificationManager nManager) {
- Resources r = context.getResources();
-
- // Prepare all the output metadata
- mParams = data;
- mImageTime = System.currentTimeMillis();
- String imageDate = new SimpleDateFormat("yyyyMMdd-HHmmss").format(new Date(mImageTime));
- mImageFileName = String.format(SCREENSHOT_FILE_NAME_TEMPLATE, imageDate);
-
- // Initialize screenshot notification smart actions provider.
- mHandler = new Handler();
- mSmartActionsProvider =
- SystemUIFactory.getInstance().createScreenshotNotificationSmartActionsProvider();
-
- // Create the large notification icon
- mImageWidth = data.image.getWidth();
- mImageHeight = data.image.getHeight();
- int iconSize = data.iconSize;
- int previewWidth = data.previewWidth;
- int previewHeight = data.previewheight;
-
- Paint paint = new Paint();
- ColorMatrix desat = new ColorMatrix();
- desat.setSaturation(0.25f);
- paint.setColorFilter(new ColorMatrixColorFilter(desat));
- Matrix matrix = new Matrix();
- int overlayColor = 0x40FFFFFF;
-
- matrix.setTranslate((previewWidth - mImageWidth) / 2,
- (previewHeight - mImageHeight) / 2);
- Bitmap picture = generateAdjustedHwBitmap(data.image, previewWidth, previewHeight,
- matrix, paint, overlayColor);
-
- // Note, we can't use the preview for the small icon, since it is non-square
- float scale = (float) iconSize / Math.min(mImageWidth, mImageHeight);
- matrix.setScale(scale, scale);
- matrix.postTranslate((iconSize - (scale * mImageWidth)) / 2,
- (iconSize - (scale * mImageHeight)) / 2);
- Bitmap icon = generateAdjustedHwBitmap(data.image, iconSize, iconSize, matrix, paint,
- overlayColor);
-
- mNotificationManager = nManager;
- final long now = System.currentTimeMillis();
-
- // Setup the notification
- mNotificationStyle = new Notification.BigPictureStyle()
- .bigPicture(picture.createAshmemBitmap());
-
- // The public notification will show similar info but with the actual screenshot omitted
- mPublicNotificationBuilder =
- new Notification.Builder(context, NotificationChannels.SCREENSHOTS_HEADSUP)
- .setContentTitle(r.getString(R.string.screenshot_saving_title))
- .setSmallIcon(R.drawable.stat_notify_image)
- .setCategory(Notification.CATEGORY_PROGRESS)
- .setWhen(now)
- .setShowWhen(true)
- .setColor(r.getColor(
- com.android.internal.R.color.system_notification_accent_color));
- SystemUI.overrideNotificationAppName(context, mPublicNotificationBuilder, true);
-
- mNotificationBuilder = new Notification.Builder(context,
- NotificationChannels.SCREENSHOTS_HEADSUP)
- .setContentTitle(r.getString(R.string.screenshot_saving_title))
- .setSmallIcon(R.drawable.stat_notify_image)
- .setWhen(now)
- .setShowWhen(true)
- .setColor(r.getColor(
- com.android.internal.R.color.system_notification_accent_color))
- .setStyle(mNotificationStyle)
- .setPublicVersion(mPublicNotificationBuilder.build());
- mNotificationBuilder.setFlag(Notification.FLAG_NO_CLEAR, true);
- SystemUI.overrideNotificationAppName(context, mNotificationBuilder, true);
-
- mNotificationManager.notify(SystemMessage.NOTE_GLOBAL_SCREENSHOT,
- mNotificationBuilder.build());
-
- /**
- * NOTE: The following code prepares the notification builder for updating the
- * notification after the screenshot has been written to disk.
- */
-
- // On the tablet, the large icon makes the notification appear as if it is clickable
- // (and on small devices, the large icon is not shown) so defer showing the large icon
- // until we compose the final post-save notification below.
- mNotificationBuilder.setLargeIcon(icon.createAshmemBitmap());
- // But we still don't set it for the expanded view, allowing the smallIcon to show here.
- mNotificationStyle.bigLargeIcon((Bitmap) null);
- }
-
- private int getUserHandleOfForegroundApplication(Context context) {
- // This logic matches
- // com.android.systemui.statusbar.phone.PhoneStatusBarPolicy#updateManagedProfile
- try {
- return ActivityTaskManager.getService().getLastResumedActivityUserId();
- } catch (RemoteException e) {
- Slog.w(TAG, "getUserHandleOfForegroundApplication: ", e);
- return context.getUserId();
- }
- }
-
- private boolean isManagedProfile(Context context) {
- UserManager manager = UserManager.get(context);
- UserInfo info = manager.getUserInfo(getUserHandleOfForegroundApplication(context));
- return info.isManagedProfile();
- }
-
- /**
- * Generates a new hardware bitmap with specified values, copying the content from the
- * passed in bitmap.
- */
- private Bitmap generateAdjustedHwBitmap(Bitmap bitmap, int width, int height, Matrix matrix,
- Paint paint, int color) {
- Picture picture = new Picture();
- Canvas canvas = picture.beginRecording(width, height);
- canvas.drawColor(color);
- canvas.drawBitmap(bitmap, matrix, paint);
- picture.endRecording();
- return Bitmap.createBitmap(picture);
- }
-
- @Override
- protected Void doInBackground(Void... paramsUnused) {
- if (isCancelled()) {
- return null;
- }
-
- // By default, AsyncTask sets the worker thread to have background thread priority,
- // so bump it back up so that we save a little quicker.
- Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
-
- Context context = mParams.context;
- Bitmap image = mParams.image;
- boolean smartActionsEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
- SystemUiDeviceConfigFlags.ENABLE_SCREENSHOT_NOTIFICATION_SMART_ACTIONS, true);
- CompletableFuture<List<Notification.Action>> smartActionsFuture = getSmartActionsFuture(
- context, image, mSmartActionsProvider, mHandler, smartActionsEnabled,
- isManagedProfile(context));
-
- Resources r = context.getResources();
-
- try {
- // Save the screenshot to the MediaStore
- final MediaStore.PendingParams params = new MediaStore.PendingParams(
- MediaStore.Images.Media.EXTERNAL_CONTENT_URI, mImageFileName, "image/png");
- params.setRelativePath(Environment.DIRECTORY_PICTURES + File.separator
- + Environment.DIRECTORY_SCREENSHOTS);
-
- final Uri uri = MediaStore.createPending(context, params);
- final MediaStore.PendingSession session = MediaStore.openPending(context, uri);
- try {
- try (OutputStream out = session.openOutputStream()) {
- if (!image.compress(Bitmap.CompressFormat.PNG, 100, out)) {
- throw new IOException("Failed to compress");
- }
- }
- session.publish();
- } catch (Exception e) {
- session.abandon();
- throw e;
- } finally {
- IoUtils.closeQuietly(session);
- }
-
- // Note: Both the share and edit actions are proxied through ActionProxyReceiver in
- // order to do some common work like dismissing the keyguard and sending
- // closeSystemWindows
-
- // Create a share intent, this will always go through the chooser activity first
- // which should not trigger auto-enter PiP
- String subjectDate = DateFormat.getDateTimeInstance().format(new Date(mImageTime));
- String subject = String.format(SCREENSHOT_SHARE_SUBJECT_TEMPLATE, subjectDate);
- Intent sharingIntent = new Intent(Intent.ACTION_SEND);
- sharingIntent.setType("image/png");
- sharingIntent.putExtra(Intent.EXTRA_STREAM, uri);
- // Include URI in ClipData also, so that grantPermission picks it up.
- // We don't use setData here because some apps interpret this as "to:".
- ClipData clipdata = new ClipData(new ClipDescription("content",
- new String[]{ClipDescription.MIMETYPE_TEXT_PLAIN}),
- new ClipData.Item(uri));
- sharingIntent.setClipData(clipdata);
- sharingIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
- sharingIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
- // Make sure pending intents for the system user are still unique across users
- // by setting the (otherwise unused) request code to the current user id.
- int requestCode = context.getUserId();
-
- PendingIntent chooserAction = PendingIntent.getBroadcast(context, requestCode,
- new Intent(context, GlobalScreenshot.TargetChosenReceiver.class),
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
- Intent sharingChooserIntent = Intent.createChooser(sharingIntent, null,
- chooserAction.getIntentSender())
- .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
- .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
- // Create a share action for the notification
- PendingIntent shareAction = PendingIntent.getBroadcastAsUser(context, requestCode,
- new Intent(context, GlobalScreenshot.ActionProxyReceiver.class)
- .putExtra(EXTRA_ACTION_INTENT, sharingChooserIntent)
- .putExtra(EXTRA_DISALLOW_ENTER_PIP, true)
- .setAction(Intent.ACTION_SEND),
- PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);
- Notification.Action.Builder shareActionBuilder = new Notification.Action.Builder(
- R.drawable.ic_screenshot_share,
- r.getString(com.android.internal.R.string.share), shareAction);
- mNotificationBuilder.addAction(shareActionBuilder.build());
-
- // Create an edit intent, if a specific package is provided as the editor, then
- // launch that directly
- String editorPackage = context.getString(R.string.config_screenshotEditor);
- Intent editIntent = new Intent(Intent.ACTION_EDIT);
- if (!TextUtils.isEmpty(editorPackage)) {
- editIntent.setComponent(ComponentName.unflattenFromString(editorPackage));
- }
- editIntent.setType("image/png");
- editIntent.setData(uri);
- editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- editIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-
- // Create a edit action
- PendingIntent editAction = PendingIntent.getBroadcastAsUser(context, requestCode,
- new Intent(context, GlobalScreenshot.ActionProxyReceiver.class)
- .putExtra(EXTRA_ACTION_INTENT, editIntent)
- .putExtra(EXTRA_CANCEL_NOTIFICATION,
- editIntent.getComponent() != null)
- .setAction(Intent.ACTION_EDIT),
- PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);
- Notification.Action.Builder editActionBuilder = new Notification.Action.Builder(
- R.drawable.ic_screenshot_edit,
- r.getString(com.android.internal.R.string.screenshot_edit), editAction);
- mNotificationBuilder.addAction(editActionBuilder.build());
- if (editAction != null && mParams.onEditReady != null) {
- mParams.onEditReady.apply(editAction);
- }
-
- // Create a delete action for the notification
- PendingIntent deleteAction = PendingIntent.getBroadcast(context, requestCode,
- new Intent(context, GlobalScreenshot.DeleteScreenshotReceiver.class)
- .putExtra(GlobalScreenshot.SCREENSHOT_URI_ID, uri.toString()),
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
- Notification.Action.Builder deleteActionBuilder = new Notification.Action.Builder(
- R.drawable.ic_screenshot_delete,
- r.getString(com.android.internal.R.string.delete), deleteAction);
- mNotificationBuilder.addAction(deleteActionBuilder.build());
-
- mParams.imageUri = uri;
- mParams.image = null;
- mParams.errorMsgResId = 0;
-
- if (smartActionsEnabled) {
- int timeoutMs = DeviceConfig.getInt(DeviceConfig.NAMESPACE_SYSTEMUI,
- SystemUiDeviceConfigFlags
- .SCREENSHOT_NOTIFICATION_SMART_ACTIONS_TIMEOUT_MS,
- 1000);
- List<Notification.Action> smartActions = getSmartActions(smartActionsFuture,
- timeoutMs);
- for (Notification.Action action : smartActions) {
- mNotificationBuilder.addAction(action);
- }
- }
- } catch (Exception e) {
- // IOException/UnsupportedOperationException may be thrown if external storage is
- // not mounted
- Slog.e(TAG, "unable to save screenshot", e);
- mParams.clearImage();
- mParams.errorMsgResId = R.string.screenshot_failed_to_save_text;
- }
-
- // Recycle the bitmap data
- if (image != null) {
- image.recycle();
- }
-
- return null;
- }
-
- @Override
- protected void onPostExecute(Void params) {
- if (mParams.errorMsgResId != 0) {
- // Show a message that we've failed to save the image to disk
- GlobalScreenshot.notifyScreenshotError(mParams.context, mNotificationManager,
- mParams.errorMsgResId);
- } else {
- if (mParams.onEditReady != null) {
- // Cancel the "saving screenshot" notification
- mNotificationManager.cancel(SystemMessage.NOTE_GLOBAL_SCREENSHOT);
- } else {
- // Show the final notification to indicate screenshot saved
- Context context = mParams.context;
- Resources r = context.getResources();
-
- // Create the intent to show the screenshot in gallery
- Intent launchIntent = new Intent(Intent.ACTION_VIEW);
- launchIntent.setDataAndType(mParams.imageUri, "image/png");
- launchIntent.setFlags(
- Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
- final long now = System.currentTimeMillis();
-
- // Update the text and the icon for the existing notification
- mPublicNotificationBuilder
- .setContentTitle(r.getString(R.string.screenshot_saved_title))
- .setContentText(r.getString(R.string.screenshot_saved_text))
- .setContentIntent(
- PendingIntent.getActivity(mParams.context, 0, launchIntent, 0))
- .setWhen(now)
- .setAutoCancel(true)
- .setColor(context.getColor(
- com.android.internal.R.color.system_notification_accent_color));
- mNotificationBuilder
- .setContentTitle(r.getString(R.string.screenshot_saved_title))
- .setContentText(r.getString(R.string.screenshot_saved_text))
- .setContentIntent(PendingIntent.getActivity(mParams.context, 0,
- launchIntent, 0))
- .setWhen(now)
- .setAutoCancel(true)
- .setColor(context.getColor(
- com.android.internal.R.color.system_notification_accent_color))
- .setPublicVersion(mPublicNotificationBuilder.build())
- .setFlag(Notification.FLAG_NO_CLEAR, false);
-
- mNotificationManager.notify(SystemMessage.NOTE_GLOBAL_SCREENSHOT,
- mNotificationBuilder.build());
- }
- }
- mParams.finisher.run();
- mParams.clearContext();
- }
-
- @Override
- protected void onCancelled(Void params) {
- // If we are cancelled while the task is running in the background, we may get null
- // params. The finisher is expected to always be called back, so just use the baked-in
- // params from the ctor in any case.
- mParams.finisher.run();
- mParams.clearImage();
- mParams.clearContext();
-
- // Cancel the posted notification
- mNotificationManager.cancel(SystemMessage.NOTE_GLOBAL_SCREENSHOT);
- }
- }
-
- /**
- * An AsyncTask that deletes an image from the media store in the background.
- */
- private static class DeleteImageInBackgroundTask extends AsyncTask<Uri, Void, Void> {
- private Context mContext;
-
- DeleteImageInBackgroundTask(Context context) {
- mContext = context;
- }
-
- @Override
- protected Void doInBackground(Uri... params) {
- if (params.length != 1) return null;
-
- Uri screenshotUri = params[0];
- ContentResolver resolver = mContext.getContentResolver();
- resolver.delete(screenshotUri, null, null);
- return null;
- }
- }
-
static final String SCREENSHOT_URI_ID = "android:screenshot_uri_id";
static final String EXTRA_ACTION_INTENT = "android:screenshot_action_intent";
static final String EXTRA_CANCEL_NOTIFICATION = "android:screenshot_cancel_notification";
@@ -600,7 +188,6 @@
}
};
-
/**
* @param context everything needs a context :(
*/
@@ -631,25 +218,25 @@
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, 0, 0,
WindowManager.LayoutParams.TYPE_SCREENSHOT,
WindowManager.LayoutParams.FLAG_FULLSCREEN
- | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
- | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED,
+ | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+ | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED,
PixelFormat.TRANSLUCENT);
mWindowLayoutParams.setTitle("ScreenshotAnimation");
mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
mNotificationManager =
- (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);
+ (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);
mDisplay = mWindowManager.getDefaultDisplay();
mDisplayMetrics = new DisplayMetrics();
mDisplay.getRealMetrics(mDisplayMetrics);
// Get the various target sizes
mNotificationIconSize =
- resources.getDimensionPixelSize(android.R.dimen.notification_large_icon_height);
+ resources.getDimensionPixelSize(android.R.dimen.notification_large_icon_height);
// Scale has to account for both sides of the bg
mBgPadding = (float) resources.getDimensionPixelSize(R.dimen.global_screenshot_bg_padding);
- mBgPaddingScale = mBgPadding / mDisplayMetrics.widthPixels;
+ mBgPaddingScale = mBgPadding / mDisplayMetrics.widthPixels;
// determine the optimal preview size
int panelWidth = 0;
@@ -877,6 +464,7 @@
mScreenshotAnimation.start();
});
}
+
private ValueAnimator createScreenshotDropInAnimation() {
final float flashPeakDurationPct = ((float) (SCREENSHOT_FLASH_TO_PEAK_DURATION)
/ SCREENSHOT_DROP_IN_DURATION);
@@ -926,6 +514,7 @@
mScreenshotFlash.setAlpha(0f);
mScreenshotFlash.setVisibility(View.VISIBLE);
}
+
@Override
public void onAnimationEnd(android.animation.Animator animation) {
mScreenshotFlash.setVisibility(View.GONE);
@@ -936,7 +525,7 @@
public void onAnimationUpdate(ValueAnimator animation) {
float t = (Float) animation.getAnimatedValue();
float scaleT = (SCREENSHOT_SCALE + mBgPaddingScale)
- - scaleInterpolator.getInterpolation(t)
+ - scaleInterpolator.getInterpolation(t)
* (SCREENSHOT_SCALE - SCREENSHOT_DROP_IN_MIN_SCALE);
mBackgroundView.setAlpha(scaleInterpolator.getInterpolation(t) * BACKGROUND_ALPHA);
mScreenshotView.setAlpha(t);
@@ -947,6 +536,7 @@
});
return anim;
}
+
private ValueAnimator createScreenshotDropOutAnimation(int w, int h, boolean statusBarVisible,
boolean navBarVisible) {
ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
@@ -968,7 +558,8 @@
public void onAnimationUpdate(ValueAnimator animation) {
float t = (Float) animation.getAnimatedValue();
float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)
- - t * (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);
+ - t * (SCREENSHOT_DROP_IN_MIN_SCALE
+ - SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);
mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);
mScreenshotView.setAlpha(1f - t);
mScreenshotView.setScaleX(scaleT);
@@ -995,8 +586,10 @@
float halfScreenHeight = (h - 2f * mBgPadding) / 2f;
final float offsetPct = SCREENSHOT_DROP_OUT_MIN_SCALE_OFFSET;
final PointF finalPos = new PointF(
- -halfScreenWidth + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,
- -halfScreenHeight + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);
+ -halfScreenWidth
+ + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,
+ -halfScreenHeight
+ + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);
// Animate the screenshot to the status bar
anim.setDuration(SCREENSHOT_DROP_OUT_DURATION);
@@ -1005,7 +598,7 @@
public void onAnimationUpdate(ValueAnimator animation) {
float t = (Float) animation.getAnimatedValue();
float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)
- - scaleInterpolator.getInterpolation(t)
+ - scaleInterpolator.getInterpolation(t)
* (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_DROP_OUT_MIN_SCALE);
mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);
mScreenshotView.setAlpha(1f - scaleInterpolator.getInterpolation(t));
@@ -1066,15 +659,15 @@
// Repurpose the existing notification to notify the user of the error
Notification.Builder b = new Notification.Builder(context, NotificationChannels.ALERTS)
- .setTicker(r.getString(R.string.screenshot_failed_title))
- .setContentTitle(r.getString(R.string.screenshot_failed_title))
- .setContentText(errorMsg)
- .setSmallIcon(R.drawable.stat_notify_image_error)
- .setWhen(System.currentTimeMillis())
- .setVisibility(Notification.VISIBILITY_PUBLIC) // ok to show outside lockscreen
- .setCategory(Notification.CATEGORY_ERROR)
- .setAutoCancel(true)
- .setColor(context.getColor(
+ .setTicker(r.getString(R.string.screenshot_failed_title))
+ .setContentTitle(r.getString(R.string.screenshot_failed_title))
+ .setContentText(errorMsg)
+ .setSmallIcon(R.drawable.stat_notify_image_error)
+ .setWhen(System.currentTimeMillis())
+ .setVisibility(Notification.VISIBILITY_PUBLIC) // ok to show outside lockscreen
+ .setCategory(Notification.CATEGORY_ERROR)
+ .setAutoCancel(true)
+ .setColor(context.getColor(
com.android.internal.R.color.system_notification_accent_color));
final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
Context.DEVICE_POLICY_SERVICE);
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java b/packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
new file mode 100644
index 0000000..083f971
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
@@ -0,0 +1,472 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.screenshot;
+
+import android.app.ActivityTaskManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Picture;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.DeviceConfig;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.util.Slog;
+
+import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
+import com.android.internal.messages.nano.SystemMessageProto;
+import com.android.systemui.R;
+import com.android.systemui.SystemUI;
+import com.android.systemui.SystemUIFactory;
+import com.android.systemui.util.NotificationChannels;
+
+import libcore.io.IoUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * An AsyncTask that saves an image to the media store in the background.
+ */
+class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
+ private static final String TAG = "SaveImageInBackgroundTask";
+
+ private static final String SCREENSHOT_FILE_NAME_TEMPLATE = "Screenshot_%s.png";
+ private static final String SCREENSHOT_SHARE_SUBJECT_TEMPLATE = "Screenshot (%s)";
+
+ private final GlobalScreenshot.SaveImageInBackgroundData mParams;
+ private final NotificationManager mNotificationManager;
+ private final Notification.Builder mNotificationBuilder, mPublicNotificationBuilder;
+ private final String mImageFileName;
+ private final long mImageTime;
+ private final Notification.BigPictureStyle mNotificationStyle;
+ private final int mImageWidth;
+ private final int mImageHeight;
+ private final Handler mHandler;
+ private final ScreenshotNotificationSmartActionsProvider mSmartActionsProvider;
+
+ SaveImageInBackgroundTask(Context context, GlobalScreenshot.SaveImageInBackgroundData data,
+ NotificationManager nManager) {
+ Resources r = context.getResources();
+
+ // Prepare all the output metadata
+ mParams = data;
+ mImageTime = System.currentTimeMillis();
+ String imageDate = new SimpleDateFormat("yyyyMMdd-HHmmss").format(new Date(mImageTime));
+ mImageFileName = String.format(SCREENSHOT_FILE_NAME_TEMPLATE, imageDate);
+
+ // Initialize screenshot notification smart actions provider.
+ mHandler = new Handler();
+ mSmartActionsProvider =
+ SystemUIFactory.getInstance().createScreenshotNotificationSmartActionsProvider();
+
+ // Create the large notification icon
+ mImageWidth = data.image.getWidth();
+ mImageHeight = data.image.getHeight();
+ int iconSize = data.iconSize;
+ int previewWidth = data.previewWidth;
+ int previewHeight = data.previewheight;
+
+ Paint paint = new Paint();
+ ColorMatrix desat = new ColorMatrix();
+ desat.setSaturation(0.25f);
+ paint.setColorFilter(new ColorMatrixColorFilter(desat));
+ Matrix matrix = new Matrix();
+ int overlayColor = 0x40FFFFFF;
+
+ matrix.setTranslate((previewWidth - mImageWidth) / 2,
+ (previewHeight - mImageHeight) / 2);
+ Bitmap picture = generateAdjustedHwBitmap(data.image, previewWidth, previewHeight,
+ matrix, paint, overlayColor);
+
+ // Note, we can't use the preview for the small icon, since it is non-square
+ float scale = (float) iconSize / Math.min(mImageWidth, mImageHeight);
+ matrix.setScale(scale, scale);
+ matrix.postTranslate((iconSize - (scale * mImageWidth)) / 2,
+ (iconSize - (scale * mImageHeight)) / 2);
+ Bitmap icon = generateAdjustedHwBitmap(data.image, iconSize, iconSize, matrix, paint,
+ overlayColor);
+
+ mNotificationManager = nManager;
+ final long now = System.currentTimeMillis();
+
+ // Setup the notification
+ mNotificationStyle = new Notification.BigPictureStyle()
+ .bigPicture(picture.createAshmemBitmap());
+
+ // The public notification will show similar info but with the actual screenshot omitted
+ mPublicNotificationBuilder =
+ new Notification.Builder(context, NotificationChannels.SCREENSHOTS_HEADSUP)
+ .setContentTitle(r.getString(R.string.screenshot_saving_title))
+ .setSmallIcon(R.drawable.stat_notify_image)
+ .setCategory(Notification.CATEGORY_PROGRESS)
+ .setWhen(now)
+ .setShowWhen(true)
+ .setColor(r.getColor(
+ com.android.internal.R.color.system_notification_accent_color));
+ SystemUI.overrideNotificationAppName(context, mPublicNotificationBuilder, true);
+
+ mNotificationBuilder = new Notification.Builder(context,
+ NotificationChannels.SCREENSHOTS_HEADSUP)
+ .setContentTitle(r.getString(R.string.screenshot_saving_title))
+ .setSmallIcon(R.drawable.stat_notify_image)
+ .setWhen(now)
+ .setShowWhen(true)
+ .setColor(r.getColor(
+ com.android.internal.R.color.system_notification_accent_color))
+ .setStyle(mNotificationStyle)
+ .setPublicVersion(mPublicNotificationBuilder.build());
+ mNotificationBuilder.setFlag(Notification.FLAG_NO_CLEAR, true);
+ SystemUI.overrideNotificationAppName(context, mNotificationBuilder, true);
+
+ mNotificationManager.notify(SystemMessageProto.SystemMessage.NOTE_GLOBAL_SCREENSHOT,
+ mNotificationBuilder.build());
+
+ /**
+ * NOTE: The following code prepares the notification builder for updating the
+ * notification after the screenshot has been written to disk.
+ */
+
+ // On the tablet, the large icon makes the notification appear as if it is clickable
+ // (and on small devices, the large icon is not shown) so defer showing the large icon
+ // until we compose the final post-save notification below.
+ mNotificationBuilder.setLargeIcon(icon.createAshmemBitmap());
+ // But we still don't set it for the expanded view, allowing the smallIcon to show here.
+ mNotificationStyle.bigLargeIcon((Bitmap) null);
+ }
+
+ private int getUserHandleOfForegroundApplication(Context context) {
+ // This logic matches
+ // com.android.systemui.statusbar.phone.PhoneStatusBarPolicy#updateManagedProfile
+ try {
+ return ActivityTaskManager.getService().getLastResumedActivityUserId();
+ } catch (RemoteException e) {
+ Slog.w(TAG, "getUserHandleOfForegroundApplication: ", e);
+ return context.getUserId();
+ }
+ }
+
+ private boolean isManagedProfile(Context context) {
+ UserManager manager = UserManager.get(context);
+ UserInfo info = manager.getUserInfo(getUserHandleOfForegroundApplication(context));
+ return info.isManagedProfile();
+ }
+
+ /**
+ * Generates a new hardware bitmap with specified values, copying the content from the
+ * passed in bitmap.
+ */
+ private Bitmap generateAdjustedHwBitmap(Bitmap bitmap, int width, int height, Matrix matrix,
+ Paint paint, int color) {
+ Picture picture = new Picture();
+ Canvas canvas = picture.beginRecording(width, height);
+ canvas.drawColor(color);
+ canvas.drawBitmap(bitmap, matrix, paint);
+ picture.endRecording();
+ return Bitmap.createBitmap(picture);
+ }
+
+ @Override
+ protected Void doInBackground(Void... paramsUnused) {
+ if (isCancelled()) {
+ return null;
+ }
+
+ // By default, AsyncTask sets the worker thread to have background thread priority,
+ // so bump it back up so that we save a little quicker.
+ Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
+
+ Context context = mParams.context;
+ Bitmap image = mParams.image;
+ boolean smartActionsEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
+ SystemUiDeviceConfigFlags.ENABLE_SCREENSHOT_NOTIFICATION_SMART_ACTIONS, true);
+ CompletableFuture<List<Notification.Action>>
+ smartActionsFuture = GlobalScreenshot.getSmartActionsFuture(
+ context, image, mSmartActionsProvider, mHandler, smartActionsEnabled,
+ isManagedProfile(context));
+
+ Resources r = context.getResources();
+
+ try {
+ // Save the screenshot to the MediaStore
+ final MediaStore.PendingParams params = new MediaStore.PendingParams(
+ MediaStore.Images.Media.EXTERNAL_CONTENT_URI, mImageFileName, "image/png");
+ params.setRelativePath(Environment.DIRECTORY_PICTURES + File.separator
+ + Environment.DIRECTORY_SCREENSHOTS);
+
+ final Uri uri = MediaStore.createPending(context, params);
+ final MediaStore.PendingSession session = MediaStore.openPending(context, uri);
+ try {
+ // First, write the actual data for our screenshot
+ try (OutputStream out = session.openOutputStream()) {
+ if (!image.compress(Bitmap.CompressFormat.PNG, 100, out)) {
+ throw new IOException("Failed to compress");
+ }
+ }
+
+ // Next, write metadata to help index the screenshot
+ try (ParcelFileDescriptor pfd = session.open()) {
+ final ExifInterface exif = new ExifInterface(pfd.getFileDescriptor());
+
+ exif.setAttribute(ExifInterface.TAG_SOFTWARE,
+ "Android " + Build.DISPLAY);
+
+ exif.setAttribute(ExifInterface.TAG_IMAGE_WIDTH,
+ Integer.toString(image.getWidth()));
+ exif.setAttribute(ExifInterface.TAG_IMAGE_LENGTH,
+ Integer.toString(image.getHeight()));
+
+ final ZonedDateTime time = ZonedDateTime.ofInstant(
+ Instant.ofEpochMilli(mImageTime), ZoneId.systemDefault());
+ exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL,
+ DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").format(time));
+ exif.setAttribute(ExifInterface.TAG_SUBSEC_TIME_ORIGINAL,
+ DateTimeFormatter.ofPattern("SSS").format(time));
+
+ if (Objects.equals(time.getOffset(), ZoneOffset.UTC)) {
+ exif.setAttribute(ExifInterface.TAG_OFFSET_TIME_ORIGINAL, "+00:00");
+ } else {
+ exif.setAttribute(ExifInterface.TAG_OFFSET_TIME_ORIGINAL,
+ DateTimeFormatter.ofPattern("XXX").format(time));
+ }
+
+ exif.saveAttributes();
+ }
+ session.publish();
+ } catch (Exception e) {
+ session.abandon();
+ throw e;
+ } finally {
+ IoUtils.closeQuietly(session);
+ }
+
+ // Note: Both the share and edit actions are proxied through ActionProxyReceiver in
+ // order to do some common work like dismissing the keyguard and sending
+ // closeSystemWindows
+
+ // Create a share intent, this will always go through the chooser activity first
+ // which should not trigger auto-enter PiP
+ String subjectDate = DateFormat.getDateTimeInstance().format(new Date(mImageTime));
+ String subject = String.format(SCREENSHOT_SHARE_SUBJECT_TEMPLATE, subjectDate);
+ Intent sharingIntent = new Intent(Intent.ACTION_SEND);
+ sharingIntent.setType("image/png");
+ sharingIntent.putExtra(Intent.EXTRA_STREAM, uri);
+ // Include URI in ClipData also, so that grantPermission picks it up.
+ // We don't use setData here because some apps interpret this as "to:".
+ ClipData clipdata = new ClipData(new ClipDescription("content",
+ new String[]{ClipDescription.MIMETYPE_TEXT_PLAIN}),
+ new ClipData.Item(uri));
+ sharingIntent.setClipData(clipdata);
+ sharingIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
+ sharingIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+ // Make sure pending intents for the system user are still unique across users
+ // by setting the (otherwise unused) request code to the current user id.
+ int requestCode = context.getUserId();
+
+ PendingIntent chooserAction = PendingIntent.getBroadcast(context, requestCode,
+ new Intent(context, GlobalScreenshot.TargetChosenReceiver.class),
+ PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ Intent sharingChooserIntent = Intent.createChooser(sharingIntent, null,
+ chooserAction.getIntentSender())
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
+ .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+ // Create a share action for the notification
+ PendingIntent shareAction = PendingIntent.getBroadcastAsUser(context, requestCode,
+ new Intent(context, GlobalScreenshot.ActionProxyReceiver.class)
+ .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, sharingChooserIntent)
+ .putExtra(GlobalScreenshot.EXTRA_DISALLOW_ENTER_PIP, true)
+ .setAction(Intent.ACTION_SEND),
+ PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);
+ Notification.Action.Builder shareActionBuilder = new Notification.Action.Builder(
+ R.drawable.ic_screenshot_share,
+ r.getString(com.android.internal.R.string.share), shareAction);
+ mNotificationBuilder.addAction(shareActionBuilder.build());
+
+ // Create an edit intent, if a specific package is provided as the editor, then
+ // launch that directly
+ String editorPackage = context.getString(R.string.config_screenshotEditor);
+ Intent editIntent = new Intent(Intent.ACTION_EDIT);
+ if (!TextUtils.isEmpty(editorPackage)) {
+ editIntent.setComponent(ComponentName.unflattenFromString(editorPackage));
+ }
+ editIntent.setType("image/png");
+ editIntent.setData(uri);
+ editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ editIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+
+ // Create a edit action
+ PendingIntent editAction = PendingIntent.getBroadcastAsUser(context, requestCode,
+ new Intent(context, GlobalScreenshot.ActionProxyReceiver.class)
+ .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, editIntent)
+ .putExtra(GlobalScreenshot.EXTRA_CANCEL_NOTIFICATION,
+ editIntent.getComponent() != null)
+ .setAction(Intent.ACTION_EDIT),
+ PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);
+ Notification.Action.Builder editActionBuilder = new Notification.Action.Builder(
+ R.drawable.ic_screenshot_edit,
+ r.getString(com.android.internal.R.string.screenshot_edit), editAction);
+ mNotificationBuilder.addAction(editActionBuilder.build());
+ if (editAction != null && mParams.onEditReady != null) {
+ mParams.onEditReady.apply(editAction);
+ }
+
+ // Create a delete action for the notification
+ PendingIntent deleteAction = PendingIntent.getBroadcast(context, requestCode,
+ new Intent(context, GlobalScreenshot.DeleteScreenshotReceiver.class)
+ .putExtra(GlobalScreenshot.SCREENSHOT_URI_ID, uri.toString()),
+ PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ Notification.Action.Builder deleteActionBuilder = new Notification.Action.Builder(
+ R.drawable.ic_screenshot_delete,
+ r.getString(com.android.internal.R.string.delete), deleteAction);
+ mNotificationBuilder.addAction(deleteActionBuilder.build());
+
+ mParams.imageUri = uri;
+ mParams.image = null;
+ mParams.errorMsgResId = 0;
+
+ if (smartActionsEnabled) {
+ int timeoutMs = DeviceConfig.getInt(DeviceConfig.NAMESPACE_SYSTEMUI,
+ SystemUiDeviceConfigFlags
+ .SCREENSHOT_NOTIFICATION_SMART_ACTIONS_TIMEOUT_MS,
+ 1000);
+ List<Notification.Action> smartActions = GlobalScreenshot.getSmartActions(
+ smartActionsFuture,
+ timeoutMs);
+ for (Notification.Action action : smartActions) {
+ mNotificationBuilder.addAction(action);
+ }
+ }
+ } catch (Exception e) {
+ // IOException/UnsupportedOperationException may be thrown if external storage is
+ // not mounted
+ Slog.e(TAG, "unable to save screenshot", e);
+ mParams.clearImage();
+ mParams.errorMsgResId = R.string.screenshot_failed_to_save_text;
+ }
+
+ // Recycle the bitmap data
+ if (image != null) {
+ image.recycle();
+ }
+
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void params) {
+ if (mParams.errorMsgResId != 0) {
+ // Show a message that we've failed to save the image to disk
+ GlobalScreenshot.notifyScreenshotError(mParams.context, mNotificationManager,
+ mParams.errorMsgResId);
+ } else {
+ if (mParams.onEditReady != null) {
+ // Cancel the "saving screenshot" notification
+ mNotificationManager.cancel(
+ SystemMessageProto.SystemMessage.NOTE_GLOBAL_SCREENSHOT);
+ } else {
+ // Show the final notification to indicate screenshot saved
+ Context context = mParams.context;
+ Resources r = context.getResources();
+
+ // Create the intent to show the screenshot in gallery
+ Intent launchIntent = new Intent(Intent.ACTION_VIEW);
+ launchIntent.setDataAndType(mParams.imageUri, "image/png");
+ launchIntent.setFlags(
+ Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+ final long now = System.currentTimeMillis();
+
+ // Update the text and the icon for the existing notification
+ mPublicNotificationBuilder
+ .setContentTitle(r.getString(R.string.screenshot_saved_title))
+ .setContentText(r.getString(R.string.screenshot_saved_text))
+ .setContentIntent(
+ PendingIntent.getActivity(mParams.context, 0, launchIntent, 0))
+ .setWhen(now)
+ .setAutoCancel(true)
+ .setColor(context.getColor(
+ com.android.internal.R.color.system_notification_accent_color));
+ mNotificationBuilder
+ .setContentTitle(r.getString(R.string.screenshot_saved_title))
+ .setContentText(r.getString(R.string.screenshot_saved_text))
+ .setContentIntent(PendingIntent.getActivity(mParams.context, 0,
+ launchIntent, 0))
+ .setWhen(now)
+ .setAutoCancel(true)
+ .setColor(context.getColor(
+ com.android.internal.R.color.system_notification_accent_color))
+ .setPublicVersion(mPublicNotificationBuilder.build())
+ .setFlag(Notification.FLAG_NO_CLEAR, false);
+
+ mNotificationManager.notify(SystemMessageProto.SystemMessage.NOTE_GLOBAL_SCREENSHOT,
+ mNotificationBuilder.build());
+ }
+ }
+ mParams.finisher.run();
+ mParams.clearContext();
+ }
+
+ @Override
+ protected void onCancelled(Void params) {
+ // If we are cancelled while the task is running in the background, we may get null
+ // params. The finisher is expected to always be called back, so just use the baked-in
+ // params from the ctor in any case.
+ mParams.finisher.run();
+ mParams.clearImage();
+ mParams.clearContext();
+
+ // Cancel the posted notification
+ mNotificationManager.cancel(SystemMessageProto.SystemMessage.NOTE_GLOBAL_SCREENSHOT);
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 621f101..88b6fdd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -70,53 +70,55 @@
private static final int OP_SET_ICON = 1;
private static final int OP_REMOVE_ICON = 2;
- private static final int MSG_ICON = 1 << MSG_SHIFT;
- private static final int MSG_DISABLE = 2 << MSG_SHIFT;
- private static final int MSG_EXPAND_NOTIFICATIONS = 3 << MSG_SHIFT;
- private static final int MSG_COLLAPSE_PANELS = 4 << MSG_SHIFT;
- private static final int MSG_EXPAND_SETTINGS = 5 << MSG_SHIFT;
- private static final int MSG_SYSTEM_BAR_APPEARANCE_CHANGED = 6 << MSG_SHIFT;
- private static final int MSG_DISPLAY_READY = 7 << MSG_SHIFT;
- private static final int MSG_SHOW_IME_BUTTON = 8 << MSG_SHIFT;
- private static final int MSG_TOGGLE_RECENT_APPS = 9 << MSG_SHIFT;
- private static final int MSG_PRELOAD_RECENT_APPS = 10 << MSG_SHIFT;
- private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 11 << MSG_SHIFT;
- private static final int MSG_SET_WINDOW_STATE = 12 << MSG_SHIFT;
- private static final int MSG_SHOW_RECENT_APPS = 13 << MSG_SHIFT;
- private static final int MSG_HIDE_RECENT_APPS = 14 << MSG_SHIFT;
- private static final int MSG_SHOW_SCREEN_PIN_REQUEST = 18 << MSG_SHIFT;
- private static final int MSG_APP_TRANSITION_PENDING = 19 << MSG_SHIFT;
- private static final int MSG_APP_TRANSITION_CANCELLED = 20 << MSG_SHIFT;
- private static final int MSG_APP_TRANSITION_STARTING = 21 << MSG_SHIFT;
- private static final int MSG_ASSIST_DISCLOSURE = 22 << MSG_SHIFT;
- private static final int MSG_START_ASSIST = 23 << MSG_SHIFT;
- private static final int MSG_CAMERA_LAUNCH_GESTURE = 24 << MSG_SHIFT;
- private static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS = 25 << MSG_SHIFT;
- private static final int MSG_SHOW_PICTURE_IN_PICTURE_MENU = 26 << MSG_SHIFT;
- private static final int MSG_ADD_QS_TILE = 27 << MSG_SHIFT;
- private static final int MSG_REMOVE_QS_TILE = 28 << MSG_SHIFT;
- private static final int MSG_CLICK_QS_TILE = 29 << MSG_SHIFT;
- private static final int MSG_TOGGLE_APP_SPLIT_SCREEN = 30 << MSG_SHIFT;
- private static final int MSG_APP_TRANSITION_FINISHED = 31 << MSG_SHIFT;
- private static final int MSG_DISMISS_KEYBOARD_SHORTCUTS = 32 << MSG_SHIFT;
- private static final int MSG_HANDLE_SYSTEM_KEY = 33 << MSG_SHIFT;
- private static final int MSG_SHOW_GLOBAL_ACTIONS = 34 << MSG_SHIFT;
- private static final int MSG_TOGGLE_PANEL = 35 << MSG_SHIFT;
- private static final int MSG_SHOW_SHUTDOWN_UI = 36 << MSG_SHIFT;
- private static final int MSG_SET_TOP_APP_HIDES_STATUS_BAR = 37 << MSG_SHIFT;
- private static final int MSG_ROTATION_PROPOSAL = 38 << MSG_SHIFT;
- private static final int MSG_BIOMETRIC_SHOW = 39 << MSG_SHIFT;
- private static final int MSG_BIOMETRIC_AUTHENTICATED = 40 << MSG_SHIFT;
- private static final int MSG_BIOMETRIC_HELP = 41 << MSG_SHIFT;
- private static final int MSG_BIOMETRIC_ERROR = 42 << MSG_SHIFT;
- private static final int MSG_BIOMETRIC_HIDE = 43 << MSG_SHIFT;
- private static final int MSG_SHOW_CHARGING_ANIMATION = 44 << MSG_SHIFT;
- private static final int MSG_SHOW_PINNING_TOAST_ENTER_EXIT = 45 << MSG_SHIFT;
- private static final int MSG_SHOW_PINNING_TOAST_ESCAPE = 46 << MSG_SHIFT;
- private static final int MSG_RECENTS_ANIMATION_STATE_CHANGED = 47 << MSG_SHIFT;
- private static final int MSG_SHOW_TRANSIENT = 48 << MSG_SHIFT;
- private static final int MSG_ABORT_TRANSIENT = 49 << MSG_SHIFT;
- private static final int MSG_TOP_APP_WINDOW_CHANGED = 50 << MSG_SHIFT;
+ private static final int MSG_ICON = 1 << MSG_SHIFT;
+ private static final int MSG_DISABLE = 2 << MSG_SHIFT;
+ private static final int MSG_EXPAND_NOTIFICATIONS = 3 << MSG_SHIFT;
+ private static final int MSG_COLLAPSE_PANELS = 4 << MSG_SHIFT;
+ private static final int MSG_EXPAND_SETTINGS = 5 << MSG_SHIFT;
+ private static final int MSG_SYSTEM_BAR_APPEARANCE_CHANGED = 6 << MSG_SHIFT;
+ private static final int MSG_DISPLAY_READY = 7 << MSG_SHIFT;
+ private static final int MSG_SHOW_IME_BUTTON = 8 << MSG_SHIFT;
+ private static final int MSG_TOGGLE_RECENT_APPS = 9 << MSG_SHIFT;
+ private static final int MSG_PRELOAD_RECENT_APPS = 10 << MSG_SHIFT;
+ private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 11 << MSG_SHIFT;
+ private static final int MSG_SET_WINDOW_STATE = 12 << MSG_SHIFT;
+ private static final int MSG_SHOW_RECENT_APPS = 13 << MSG_SHIFT;
+ private static final int MSG_HIDE_RECENT_APPS = 14 << MSG_SHIFT;
+ private static final int MSG_SHOW_SCREEN_PIN_REQUEST = 18 << MSG_SHIFT;
+ private static final int MSG_APP_TRANSITION_PENDING = 19 << MSG_SHIFT;
+ private static final int MSG_APP_TRANSITION_CANCELLED = 20 << MSG_SHIFT;
+ private static final int MSG_APP_TRANSITION_STARTING = 21 << MSG_SHIFT;
+ private static final int MSG_ASSIST_DISCLOSURE = 22 << MSG_SHIFT;
+ private static final int MSG_START_ASSIST = 23 << MSG_SHIFT;
+ private static final int MSG_CAMERA_LAUNCH_GESTURE = 24 << MSG_SHIFT;
+ private static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS = 25 << MSG_SHIFT;
+ private static final int MSG_SHOW_PICTURE_IN_PICTURE_MENU = 26 << MSG_SHIFT;
+ private static final int MSG_ADD_QS_TILE = 27 << MSG_SHIFT;
+ private static final int MSG_REMOVE_QS_TILE = 28 << MSG_SHIFT;
+ private static final int MSG_CLICK_QS_TILE = 29 << MSG_SHIFT;
+ private static final int MSG_TOGGLE_APP_SPLIT_SCREEN = 30 << MSG_SHIFT;
+ private static final int MSG_APP_TRANSITION_FINISHED = 31 << MSG_SHIFT;
+ private static final int MSG_DISMISS_KEYBOARD_SHORTCUTS = 32 << MSG_SHIFT;
+ private static final int MSG_HANDLE_SYSTEM_KEY = 33 << MSG_SHIFT;
+ private static final int MSG_SHOW_GLOBAL_ACTIONS = 34 << MSG_SHIFT;
+ private static final int MSG_TOGGLE_PANEL = 35 << MSG_SHIFT;
+ private static final int MSG_SHOW_SHUTDOWN_UI = 36 << MSG_SHIFT;
+ private static final int MSG_SET_TOP_APP_HIDES_STATUS_BAR = 37 << MSG_SHIFT;
+ private static final int MSG_ROTATION_PROPOSAL = 38 << MSG_SHIFT;
+ private static final int MSG_BIOMETRIC_SHOW = 39 << MSG_SHIFT;
+ private static final int MSG_BIOMETRIC_AUTHENTICATED = 40 << MSG_SHIFT;
+ private static final int MSG_BIOMETRIC_HELP = 41 << MSG_SHIFT;
+ private static final int MSG_BIOMETRIC_ERROR = 42 << MSG_SHIFT;
+ private static final int MSG_BIOMETRIC_HIDE = 43 << MSG_SHIFT;
+ private static final int MSG_SHOW_CHARGING_ANIMATION = 44 << MSG_SHIFT;
+ private static final int MSG_SHOW_PINNING_TOAST_ENTER_EXIT = 45 << MSG_SHIFT;
+ private static final int MSG_SHOW_PINNING_TOAST_ESCAPE = 46 << MSG_SHIFT;
+ private static final int MSG_RECENTS_ANIMATION_STATE_CHANGED = 47 << MSG_SHIFT;
+ private static final int MSG_SHOW_TRANSIENT = 48 << MSG_SHIFT;
+ private static final int MSG_ABORT_TRANSIENT = 49 << MSG_SHIFT;
+ private static final int MSG_TOP_APP_WINDOW_CHANGED = 50 << MSG_SHIFT;
+ private static final int MSG_SHOW_INATTENTIVE_SLEEP_WARNING = 51 << MSG_SHIFT;
+ private static final int MSG_DISMISS_INATTENTIVE_SLEEP_WARNING = 52 << MSG_SHIFT;
public static final int FLAG_EXCLUDE_NONE = 0;
public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -294,6 +296,18 @@
*/
default void topAppWindowChanged(int displayId, boolean isFullscreen, boolean isImmersive) {
}
+
+ /**
+ * Called to notify System UI that a warning about the device going to sleep
+ * due to prolonged user inactivity should be shown.
+ */
+ default void showInattentiveSleepWarning() { }
+
+ /**
+ * Called to notify System UI that the warning about the device going to sleep
+ * due to prolonged user inactivity should be dismissed.
+ */
+ default void dismissInattentiveSleepWarning() { }
}
public CommandQueue(Context context) {
@@ -793,6 +807,22 @@
}
}
+ @Override
+ public void showInattentiveSleepWarning() {
+ synchronized (mLock) {
+ mHandler.obtainMessage(MSG_SHOW_INATTENTIVE_SLEEP_WARNING)
+ .sendToTarget();
+ }
+ }
+
+ @Override
+ public void dismissInattentiveSleepWarning() {
+ synchronized (mLock) {
+ mHandler.obtainMessage(MSG_DISMISS_INATTENTIVE_SLEEP_WARNING)
+ .sendToTarget();
+ }
+ }
+
private void handleShowImeButton(int displayId, IBinder token, int vis, int backDisposition,
boolean showImeSwitcher, boolean isMultiClientImeEnabled) {
if (displayId == INVALID_DISPLAY) return;
@@ -1138,6 +1168,16 @@
args.recycle();
break;
}
+ case MSG_SHOW_INATTENTIVE_SLEEP_WARNING:
+ for (int i = 0; i < mCallbacks.size(); i++) {
+ mCallbacks.get(i).showInattentiveSleepWarning();
+ }
+ break;
+ case MSG_DISMISS_INATTENTIVE_SLEEP_WARNING:
+ for (int i = 0; i < mCallbacks.size(); i++) {
+ mCallbacks.get(i).dismissInattentiveSleepWarning();
+ }
+ break;
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/MediaTransferManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/MediaTransferManager.java
index 926ae71..18574f0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/MediaTransferManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/MediaTransferManager.java
@@ -19,10 +19,12 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.RippleDrawable;
import android.service.notification.StatusBarNotification;
import android.util.FeatureFlagUtils;
+import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
@@ -30,19 +32,29 @@
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.internal.R;
+import com.android.settingslib.media.LocalMediaManager;
+import com.android.settingslib.media.MediaDevice;
import com.android.settingslib.media.MediaOutputSliceConstants;
+import com.android.settingslib.widget.AdaptiveIcon;
import com.android.systemui.Dependency;
import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Class for handling MediaTransfer state over a set of notifications.
*/
public class MediaTransferManager {
private final Context mContext;
private final ActivityStarter mActivityStarter;
+ private MediaDevice mDevice;
+ private List<View> mViews = new ArrayList<>();
+ private LocalMediaManager mLocalMediaManager;
+
+ private static final String TAG = "MediaTransferManager";
private final View.OnClickListener mOnClickHandler = new View.OnClickListener() {
@Override
@@ -59,7 +71,7 @@
ViewParent parent = view.getParent();
StatusBarNotification statusBarNotification =
- getRowForParent(parent).getStatusBarNotification();
+ getRowForParent(parent).getEntry().getSbn();
final Intent intent = new Intent()
.setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
@@ -70,9 +82,50 @@
}
};
+ private final LocalMediaManager.DeviceCallback mMediaDeviceCallback =
+ new LocalMediaManager.DeviceCallback() {
+ @Override
+ public void onDeviceListUpdate(List<MediaDevice> devices) {
+ MediaDevice currentDevice = mLocalMediaManager.getCurrentConnectedDevice();
+ // Check because this can be called several times while changing devices
+ if (mDevice == null || !mDevice.equals(currentDevice)) {
+ mDevice = currentDevice;
+ updateAllChips();
+ }
+ }
+
+ @Override
+ public void onSelectedDeviceStateChanged(MediaDevice device, int state) {
+ if (mDevice == null || !mDevice.equals(device)) {
+ mDevice = device;
+ updateAllChips();
+ }
+ }
+ };
+
public MediaTransferManager(Context context) {
mContext = context;
mActivityStarter = Dependency.get(ActivityStarter.class);
+ mLocalMediaManager = new LocalMediaManager(mContext, null, null);
+ }
+
+ /**
+ * Mark a view as removed. If no views remain the media device listener will be unregistered.
+ * @param root
+ */
+ public void setRemoved(View root) {
+ if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SEAMLESS_TRANSFER)
+ || mLocalMediaManager == null || root == null) {
+ return;
+ }
+ View view = root.findViewById(com.android.internal.R.id.media_seamless);
+ if (mViews.remove(view)) {
+ if (mViews.size() == 0) {
+ mLocalMediaManager.unregisterCallback(mMediaDeviceCallback);
+ }
+ } else {
+ Log.e(TAG, "Tried to remove unknown view " + view);
+ }
}
private ExpandableNotificationRow getRowForParent(ViewParent parent) {
@@ -92,7 +145,8 @@
* @param entry The entry of MediaTransfer action button.
*/
public void applyMediaTransferView(ViewGroup root, NotificationEntry entry) {
- if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SEAMLESS_TRANSFER)) {
+ if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SEAMLESS_TRANSFER)
+ || mLocalMediaManager == null || root == null) {
return;
}
@@ -103,23 +157,59 @@
view.setVisibility(View.VISIBLE);
view.setOnClickListener(mOnClickHandler);
+ if (!mViews.contains(view)) {
+ mViews.add(view);
+ if (mViews.size() == 1) {
+ mLocalMediaManager.registerCallback(mMediaDeviceCallback);
+ }
+ }
+ // Initial update
+ mLocalMediaManager.startScan();
+ mDevice = mLocalMediaManager.getCurrentConnectedDevice();
+ updateChip(view);
+ }
+
+ private void updateAllChips() {
+ for (View view : mViews) {
+ updateChip(view);
+ }
+ }
+
+ private void updateChip(View view) {
ExpandableNotificationRow enr = getRowForParent(view.getParent());
- int color = enr.getNotificationHeader().getOriginalIconColor();
- ColorStateList tintList = ColorStateList.valueOf(color);
+ int fgColor = enr.getNotificationHeader().getOriginalIconColor();
+ ColorStateList fgTintList = ColorStateList.valueOf(fgColor);
+ int bgColor = enr.getCurrentBackgroundTint();
- // Update the outline color
+ // Update outline color
LinearLayout viewLayout = (LinearLayout) view;
RippleDrawable bkgDrawable = (RippleDrawable) viewLayout.getBackground();
GradientDrawable rect = (GradientDrawable) bkgDrawable.getDrawable(0);
- rect.setStroke(2, color);
+ rect.setStroke(2, fgColor);
+ rect.setColor(bgColor);
- // Update the image color
- ImageView image = view.findViewById(R.id.media_seamless_image);
- image.setImageTintList(tintList);
+ ImageView iconView = view.findViewById(com.android.internal.R.id.media_seamless_image);
+ TextView deviceName = view.findViewById(com.android.internal.R.id.media_seamless_text);
+ deviceName.setTextColor(fgTintList);
- // Update the text color
- TextView text = view.findViewById(R.id.media_seamless_text);
- text.setTextColor(tintList);
+ if (mDevice != null) {
+ Drawable icon = mDevice.getIcon();
+ iconView.setVisibility(View.VISIBLE);
+ iconView.setImageTintList(fgTintList);
+
+ if (icon instanceof AdaptiveIcon) {
+ AdaptiveIcon aIcon = (AdaptiveIcon) icon;
+ aIcon.setBackgroundColor(bgColor);
+ iconView.setImageDrawable(aIcon);
+ } else {
+ iconView.setImageDrawable(icon);
+ }
+ deviceName.setText(mDevice.getName());
+ } else {
+ // Reset to default
+ iconView.setVisibility(View.GONE);
+ deviceName.setText(com.android.internal.R.string.ext_media_seamless_action);
+ }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java
index ef40d98..0bfcdbd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java
@@ -44,7 +44,7 @@
private static final DataExtractor sIconExtractor = new DataExtractor() {
@Override
public Object extractData(ExpandableNotificationRow row) {
- return row.getStatusBarNotification().getNotification();
+ return row.getEntry().getSbn().getNotification();
}
};
private static final IconComparator sIconVisibilityComparator = new IconComparator() {
@@ -207,7 +207,7 @@
}
// in case no view is visible we make sure the time is visible
int timeVisibility = !hasVisibleText
- || mRow.getStatusBarNotification().getNotification().showsTime()
+ || mRow.getEntry().getSbn().getNotification().showsTime()
? View.VISIBLE : View.GONE;
time.setVisibility(timeVisibility);
View left = null;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
index c4de2d3..98a2675 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
@@ -110,8 +110,7 @@
}
String key = sbn.getKey();
- boolean isUpdate =
- mEntryManager.getNotificationData().get(key) != null;
+ boolean isUpdate = mEntryManager.getActiveNotificationUnfiltered(key) != null;
// In case we don't allow child notifications, we ignore children of
// notifications that have a summary, since` we're not going to show them
// anyway. This is true also when the summary is canceled,
@@ -126,8 +125,7 @@
if (isUpdate) {
mEntryManager.removeNotification(key, rankingMap, UNDEFINED_DISMISS_REASON);
} else {
- mEntryManager.getNotificationData()
- .updateRanking(rankingMap, "onNotificationPosted");
+ mEntryManager.updateRanking(rankingMap, "onNotificationPosted");
}
return;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
index 571d3d7..021e7e1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
@@ -15,6 +15,7 @@
*/
package com.android.systemui.statusbar;
+import static android.app.Notification.VISIBILITY_SECRET;
import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED;
import static com.android.systemui.DejankUtils.whitelistIpcs;
@@ -126,7 +127,7 @@
updatePublicMode();
// The filtering needs to happen before the update call below in order to make sure
// the presenter has the updated notifications from the new user
- getEntryManager().getNotificationData().filterAndSort("user switched");
+ getEntryManager().reapplyFilterAndSort("user switched");
mPresenter.onUserSwitched(mCurrentUserId);
for (UserChangedListener listener : mListeners) {
@@ -148,17 +149,17 @@
}
}
if (notificationKey != null) {
- final int count =
- getEntryManager().getNotificationData().getActiveNotifications().size();
- final int rank = getEntryManager().getNotificationData().getRank(notificationKey);
+ NotificationEntry entry =
+ getEntryManager().getActiveNotificationUnfiltered(notificationKey);
+ final int count = getEntryManager().getActiveNotificationsCount();
+ final int rank = entry != null ? entry.getRanking().getRank() : 0;
NotificationVisibility.NotificationLocation location =
- NotificationLogger.getNotificationLocation(
- getEntryManager().getNotificationData().get(notificationKey));
+ NotificationLogger.getNotificationLocation(entry);
final NotificationVisibility nv = NotificationVisibility.obtain(notificationKey,
rank, count, true, location);
try {
mBarService.onNotificationClick(notificationKey, nv);
- } catch (RemoteException e) {
+ } catch (RemoteException exception) {
/* ignore */
}
}
@@ -311,9 +312,9 @@
Log.wtf(TAG, "mEntryManager was null!", new Throwable());
return true;
}
- return isLockscreenPublicMode(mCurrentUserId)
- && getEntryManager().getNotificationData().getVisibilityOverride(key) ==
- Notification.VISIBILITY_SECRET;
+ NotificationEntry visibleEntry = getEntryManager().getActiveNotificationUnfiltered(key);
+ return isLockscreenPublicMode(mCurrentUserId) && visibleEntry != null
+ && visibleEntry.getRanking().getVisibilityOverride() == VISIBILITY_SECRET;
}
public boolean shouldShowOnKeyguard(NotificationEntry entry) {
@@ -326,8 +327,7 @@
&& hideSilentNotificationsOnLockscreen()) {
exceedsPriorityThreshold = entry.getBucket() != BUCKET_SILENT;
} else {
- exceedsPriorityThreshold =
- !getEntryManager().getNotificationData().isAmbient(entry.getKey());
+ exceedsPriorityThreshold = !entry.getRanking().isAmbient();
}
return mShowLockscreenNotifications && exceedsPriorityThreshold;
}
@@ -467,8 +467,9 @@
Log.wtf(TAG, "mEntryManager was null!", new Throwable());
return true;
}
- return getEntryManager().getNotificationData().getVisibilityOverride(key) ==
- Notification.VISIBILITY_PRIVATE;
+ NotificationEntry entry = getEntryManager().getActiveNotificationUnfiltered(key);
+ return entry != null
+ && entry.getRanking().getVisibilityOverride() == Notification.VISIBILITY_PRIVATE;
}
private void updateCurrentProfilesCache() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
index d668665..a98f826 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
@@ -102,8 +102,7 @@
}
- // Late binding
- private NotificationEntryManager mEntryManager;
+ private final NotificationEntryManager mEntryManager;
// Late binding, also @Nullable due to being in com.android.systemui.statusbar.phone package
@Nullable
@@ -258,8 +257,9 @@
if (mMediaNotificationKey == null) {
return null;
}
- synchronized (mEntryManager.getNotificationData()) {
- NotificationEntry entry = mEntryManager.getNotificationData().get(mMediaNotificationKey);
+ synchronized (mEntryManager) {
+ NotificationEntry entry = mEntryManager
+ .getActiveNotificationUnfiltered(mMediaNotificationKey);
if (entry == null || entry.expandedIcon == null) {
return null;
}
@@ -281,8 +281,9 @@
public void findAndUpdateMediaNotifications() {
boolean metaDataChanged = false;
- synchronized (mEntryManager.getNotificationData()) {
- Set<NotificationEntry> allNotifications = mEntryManager.getAllNotifs();
+ synchronized (mEntryManager) {
+ Set<NotificationEntry> allNotifications =
+ mEntryManager.getPendingAndActiveNotifications();
// Promote the media notification with a controller in 'playing' state, if any.
NotificationEntry mediaNotification = null;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
index 35f06f9..c556bc0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
@@ -184,8 +184,9 @@
ViewGroup actionGroup = (ViewGroup) parent;
buttonIndex = actionGroup.indexOfChild(view);
}
- final int count = mEntryManager.getNotificationData().getActiveNotifications().size();
- final int rank = mEntryManager.getNotificationData().getRank(key);
+ final int count = mEntryManager.getActiveNotificationsCount();
+ final int rank = mEntryManager
+ .getActiveNotificationUnfiltered(key).getRanking().getRank();
// Notification may be updated before this function is executed, and thus play safe
// here and verify that the action object is still the one that where the click happens.
@@ -202,7 +203,7 @@
}
NotificationVisibility.NotificationLocation location =
NotificationLogger.getNotificationLocation(
- mEntryManager.getNotificationData().get(key));
+ mEntryManager.getActiveNotificationUnfiltered(key));
final NotificationVisibility nv =
NotificationVisibility.obtain(key, rank, count, true, location);
try {
@@ -215,7 +216,7 @@
private StatusBarNotification getNotificationForParent(ViewParent parent) {
while (parent != null) {
if (parent instanceof ExpandableNotificationRow) {
- return ((ExpandableNotificationRow) parent).getStatusBarNotification();
+ return ((ExpandableNotificationRow) parent).getEntry().getSbn();
}
parent = parent.getParent();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java
index 20a3e35..4204f68 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java
@@ -140,8 +140,7 @@
Assert.isMainThread();
beginUpdate();
- ArrayList<NotificationEntry> activeNotifications = mEntryManager.getNotificationData()
- .getActiveNotifications();
+ List<NotificationEntry> activeNotifications = mEntryManager.getVisibleNotifications();
ArrayList<ExpandableNotificationRow> toShow = new ArrayList<>(activeNotifications.size());
final int N = activeNotifications.size();
for (int i = 0; i < N; i++) {
@@ -205,7 +204,7 @@
}
for (ExpandableNotificationRow viewToRemove : viewsToRemove) {
- if (mGroupManager.isChildInGroupWithSummary(viewToRemove.getStatusBarNotification())) {
+ if (mGroupManager.isChildInGroupWithSummary(viewToRemove.getEntry().getSbn())) {
// we are only transferring this notification to its parent, don't generate an
// animation
mListContainer.setChildTransferInProgress(true);
@@ -339,8 +338,8 @@
}
for (ExpandableNotificationRow remove : toRemove) {
parent.removeChildNotification(remove);
- if (mEntryManager.getNotificationData().get(
- remove.getStatusBarNotification().getKey()) == null) {
+ if (mEntryManager.getActiveNotificationUnfiltered(
+ remove.getEntry().getSbn().getKey()) == null) {
// We only want to add an animation if the view is completely removed
// otherwise it's just a transfer
mListContainer.notifyGroupChildRemoved(remove,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java b/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java
index 7bdb21d..40f8e39 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SmartReplyController.java
@@ -73,8 +73,8 @@
public void smartActionClicked(
NotificationEntry entry, int actionIndex, Notification.Action action,
boolean generatedByAssistant) {
- final int count = mEntryManager.getNotificationData().getActiveNotifications().size();
- final int rank = mEntryManager.getNotificationData().getRank(entry.getKey());
+ final int count = mEntryManager.getActiveNotificationsCount();
+ final int rank = entry.getRanking().getRank();
NotificationVisibility.NotificationLocation location =
NotificationLogger.getNotificationLocation(entry);
final NotificationVisibility nv = NotificationVisibility.obtain(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java
index 9b31234..e48e819 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java
@@ -125,22 +125,21 @@
return mAnimationRunning;
}
- class AnimationRunner extends IRemoteAnimationRunner.Stub {
+ private class AnimationRunner extends IRemoteAnimationRunner.Stub {
- private final ExpandableNotificationRow mSourceNotification;
- private final ExpandAnimationParameters mParams;
+ private ExpandableNotificationRow mSourceNotification;
+ private final ExpandAnimationParameters mParams = new ExpandAnimationParameters();
private final Rect mWindowCrop = new Rect();
private final float mNotificationCornerRadius;
private float mCornerRadius;
private boolean mIsFullScreenLaunch = true;
private final SyncRtSurfaceTransactionApplier mSyncRtTransactionApplier;
- public AnimationRunner(ExpandableNotificationRow sourceNofitication) {
- mSourceNotification = sourceNofitication;
- mParams = new ExpandAnimationParameters();
- mSyncRtTransactionApplier = new SyncRtSurfaceTransactionApplier(mSourceNotification);
- mNotificationCornerRadius = Math.max(mSourceNotification.getCurrentTopRoundness(),
- mSourceNotification.getCurrentBottomRoundness());
+ AnimationRunner(ExpandableNotificationRow sourceNotification) {
+ mSourceNotification = sourceNotification;
+ mSyncRtTransactionApplier = new SyncRtSurfaceTransactionApplier(sourceNotification);
+ mNotificationCornerRadius = Math.max(sourceNotification.getCurrentTopRoundness(),
+ sourceNotification.getCurrentBottomRoundness());
}
@Override
@@ -155,6 +154,7 @@
setAnimationPending(false);
invokeCallback(iRemoteAnimationFinishedCallback);
mNotificationPanel.collapse(false /* delayed */, 1.0f /* speedUpFactor */);
+ mSourceNotification = null;
return;
}
@@ -254,6 +254,7 @@
mCallback.onExpandAnimationFinished(mIsFullScreenLaunch);
applyParamsToNotification(null);
applyParamsToNotificationList(null);
+ mSourceNotification = null;
}
}
@@ -281,6 +282,7 @@
mSourceNotification.post(() -> {
setAnimationPending(false);
mCallback.onLaunchAnimationCancelled();
+ mSourceNotification = null;
});
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/BypassHeadsUpNotifier.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/BypassHeadsUpNotifier.kt
index 314dc04..015c323 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/BypassHeadsUpNotifier.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/BypassHeadsUpNotifier.kt
@@ -37,14 +37,14 @@
*/
@Singleton
class BypassHeadsUpNotifier @Inject constructor(
- private val context: Context,
- private val bypassController: KeyguardBypassController,
- private val statusBarStateController: StatusBarStateController,
- private val headsUpManager: HeadsUpManagerPhone,
- private val notificationLockscreenUserManager: NotificationLockscreenUserManager,
- private val mediaManager: NotificationMediaManager,
- tunerService: TunerService) : StatusBarStateController.StateListener,
- NotificationMediaManager.MediaListener {
+ private val context: Context,
+ private val bypassController: KeyguardBypassController,
+ private val statusBarStateController: StatusBarStateController,
+ private val headsUpManager: HeadsUpManagerPhone,
+ private val notificationLockscreenUserManager: NotificationLockscreenUserManager,
+ private val mediaManager: NotificationMediaManager,
+ tunerService: TunerService
+) : StatusBarStateController.StateListener, NotificationMediaManager.MediaListener {
private lateinit var entryManager: NotificationEntryManager
private var currentMediaEntry: NotificationEntry? = null
@@ -77,7 +77,8 @@
override fun onMetadataOrStateChanged(metadata: MediaMetadata?, state: Int) {
val previous = currentMediaEntry
- var newEntry = entryManager.notificationData.get(mediaManager.mediaNotificationKey)
+ var newEntry = entryManager
+ .getActiveNotificationUnfiltered(mediaManager.mediaNotificationKey)
if (!NotificationMediaManager.isPlayingState(state)) {
newEntry = null
}
@@ -101,7 +102,7 @@
*/
private fun canAutoHeadsUp(entry: NotificationEntry): Boolean {
if (!isAutoHeadsUpAllowed()) {
- return false;
+ return false
}
if (entry.isSensitive) {
// filter sensitive notifications
@@ -111,7 +112,7 @@
// filter notifications invisible on Keyguard
return false
}
- if (!entryManager.notificationData.activeNotifications.contains(entry)) {
+ if (entryManager.getActiveNotificationUnfiltered(entry.key) != null) {
// filter notifications not the active list currently
return false
}
@@ -125,7 +126,7 @@
/**
* @return {@code true} if autoHeadsUp is possible right now.
*/
- private fun isAutoHeadsUpAllowed() : Boolean {
+ private fun isAutoHeadsUpAllowed(): Boolean {
if (!enabled) {
return false
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NewNotifPipeline.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NewNotifPipeline.java
deleted file mode 100644
index 31921a4..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NewNotifPipeline.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.notification;
-
-import android.util.Log;
-
-import com.android.systemui.statusbar.NotificationListener;
-import com.android.systemui.statusbar.notification.collection.NotifCollection;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * Initialization code for the new notification pipeline.
- */
-@Singleton
-public class NewNotifPipeline {
- private final NotifCollection mNotifCollection;
-
- @Inject
- public NewNotifPipeline(
- NotifCollection notifCollection) {
- mNotifCollection = notifCollection;
- }
-
- /** Hooks the new pipeline up to NotificationManager */
- public void initialize(
- NotificationListener notificationService) {
- mNotifCollection.attach(notificationService);
-
- Log.d(TAG, "Notif pipeline initialized");
- }
-
- private static final String TAG = "NewNotifPipeline";
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClicker.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClicker.java
index fd2f720..b5c6641 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClicker.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClicker.java
@@ -55,7 +55,7 @@
mShadeController.wakeUpIfDozing(SystemClock.uptimeMillis(), v, "NOTIFICATION_CLICK");
final ExpandableNotificationRow row = (ExpandableNotificationRow) v;
- final StatusBarNotification sbn = row.getStatusBarNotification();
+ final StatusBarNotification sbn = row.getEntry().getSbn();
if (sbn == null) {
Log.e(TAG, "NotificationClicker called on an unclickable notification,");
return;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java
index df78fa3..0694920 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java
@@ -99,7 +99,8 @@
/**
* Called whenever notification ranking changes, in response to
* {@link NotificationListenerService#onNotificationRankingUpdate}. This is called after
- * NotificationData has processed the update and notifications have been re-sorted and filtered.
+ * NotificationEntryManager has processed the update and notifications have been re-sorted
+ * and filtered.
*
* @param rankingMap provides access to ranking information on currently active notifications
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java
index 13d90ff..7a58097 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java
@@ -18,10 +18,12 @@
import static android.service.notification.NotificationListenerService.REASON_CANCEL;
import static android.service.notification.NotificationListenerService.REASON_ERROR;
+import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.Notification;
import android.service.notification.NotificationListenerService;
import android.service.notification.NotificationListenerService.Ranking;
+import android.service.notification.NotificationListenerService.RankingMap;
import android.service.notification.StatusBarNotification;
import android.util.ArrayMap;
import android.util.Log;
@@ -36,9 +38,8 @@
import com.android.systemui.statusbar.NotificationRemoveInterceptor;
import com.android.systemui.statusbar.NotificationUiAdjustment;
import com.android.systemui.statusbar.NotificationUpdateHandler;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
-import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+import com.android.systemui.statusbar.notification.collection.NotificationRankingManager;
import com.android.systemui.statusbar.notification.collection.NotificationRowBinder;
import com.android.systemui.statusbar.notification.logging.NotifEvent;
import com.android.systemui.statusbar.notification.logging.NotifLog;
@@ -46,12 +47,15 @@
import com.android.systemui.statusbar.notification.row.NotificationContentInflater;
import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;
import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
+import com.android.systemui.statusbar.phone.NotificationGroupManager;
import com.android.systemui.statusbar.policy.HeadsUpManager;
+import com.android.systemui.util.Assert;
import com.android.systemui.util.leak.LeakDetector;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -62,9 +66,29 @@
import javax.inject.Singleton;
/**
- * NotificationEntryManager is responsible for the adding, removing, and updating of notifications.
- * It also handles tasks such as their inflation and their interaction with other
- * Notification.*Manager objects.
+ * NotificationEntryManager is responsible for the adding, removing, and updating of
+ * {@link NotificationEntry}s. It also handles tasks such as their inflation and their interaction
+ * with other Notification.*Manager objects.
+ *
+ * We track notification entries through this lifecycle:
+ * 1. Pending
+ * 2. Active
+ * 3. Sorted / filtered (visible)
+ *
+ * Every entry spends some amount of time in the pending state, while it is being inflated. Once
+ * inflated, an entry moves into the active state, where it _could_ potentially be shown to the
+ * user. After an entry makes its way into the active state, we sort and filter the entire set to
+ * repopulate the visible set.
+ *
+ * There are a few different things that other classes may be interested in, and most of them
+ * involve the current set of notifications. Here's a brief overview of things you may want to know:
+ * @see #getVisibleNotifications() for the visible set
+ * @see #getActiveNotificationUnfiltered(String) to check if a key exists
+ * @see #getPendingNotificationsIterator() for an iterator over the pending notifications
+ * @see #getPendingOrActiveNotif(String) to find a notification exists for that key in any list
+ * @see #getPendingAndActiveNotifications() to get the entire set of Notifications that we're
+ * aware of
+ * @see #getActiveNotificationsForCurrentUser() to see every notification that the current user owns
*/
@Singleton
public class NotificationEntryManager implements
@@ -78,12 +102,23 @@
/**
* Used when a notification is removed and it doesn't have a reason that maps to one of the
* reasons defined in NotificationListenerService
- * (e.g. {@link NotificationListenerService.REASON_CANCEL})
+ * (e.g. {@link NotificationListenerService#REASON_CANCEL})
*/
public static final int UNDEFINED_DISMISS_REASON = 0;
+ /** Pending notifications are ones awaiting inflation */
@VisibleForTesting
protected final HashMap<String, NotificationEntry> mPendingNotifications = new HashMap<>();
+ /**
+ * Active notifications have been inflated / prepared and could become visible, but may get
+ * filtered out if for instance they are not for the current user
+ */
+ private final ArrayMap<String, NotificationEntry> mActiveNotifications = new ArrayMap<>();
+ @VisibleForTesting
+ /** This is the list of "active notifications for this user in this context" */
+ protected final ArrayList<NotificationEntry> mSortedAndFiltered = new ArrayList<>();
+ private final List<NotificationEntry> mReadOnlyNotifications =
+ Collections.unmodifiableList(mSortedAndFiltered);
private final Map<NotificationEntry, NotificationLifetimeExtender> mRetainedNotifications =
new ArrayMap<>();
@@ -92,10 +127,12 @@
private NotificationRemoteInputManager mRemoteInputManager;
private NotificationRowBinder mNotificationRowBinder;
+ private final KeyguardEnvironment mKeyguardEnvironment;
+ private final NotificationGroupManager mGroupManager;
+ private final NotificationRankingManager mRankingManager;
+
private NotificationPresenter mPresenter;
- private NotificationListenerService.RankingMap mLatestRankingMap;
- @VisibleForTesting
- protected NotificationData mNotificationData;
+ private RankingMap mLatestRankingMap;
private NotifLog mNotifLog;
@VisibleForTesting
@@ -129,10 +166,14 @@
@Inject
public NotificationEntryManager(
- NotificationData notificationData,
- NotifLog notifLog) {
- mNotificationData = notificationData;
+ NotifLog notifLog,
+ NotificationGroupManager groupManager,
+ NotificationRankingManager rankingManager,
+ KeyguardEnvironment keyguardEnvironment) {
mNotifLog = notifLog;
+ mGroupManager = groupManager;
+ mRankingManager = rankingManager;
+ mKeyguardEnvironment = keyguardEnvironment;
}
/** Adds a {@link NotificationEntryListener}. */
@@ -171,7 +212,6 @@
NotificationListContainer listContainer,
HeadsUpManager headsUpManager) {
mPresenter = presenter;
- mNotificationData.setHeadsUpManager(headsUpManager);
}
/** Adds multiple {@link NotificationLifetimeExtender}s. */
@@ -188,10 +228,6 @@
UNDEFINED_DISMISS_REASON));
}
- public NotificationData getNotificationData() {
- return mNotificationData;
- }
-
@Override
public void onReorderingAllowed() {
updateNotifications("reordering is now allowed");
@@ -212,10 +248,17 @@
}
private NotificationVisibility obtainVisibility(String key) {
- final int rank = mNotificationData.getRank(key);
- final int count = mNotificationData.getActiveNotifications().size();
+ NotificationEntry e = mActiveNotifications.get(key);
+ final int rank;
+ if (e != null) {
+ rank = e.getRanking().getRank();
+ } else {
+ rank = 0;
+ }
+
+ final int count = mActiveNotifications.size();
NotificationVisibility.NotificationLocation location =
- NotificationLogger.getNotificationLocation(getNotificationData().get(key));
+ NotificationLogger.getNotificationLocation(getActiveNotificationUnfiltered(key));
return NotificationVisibility.obtain(key, rank, count, true, location);
}
@@ -227,7 +270,7 @@
mNotifLog.log(NotifEvent.INFLATION_ABORTED, entry.getSbn(), null,
"PendingNotification aborted. " + reason);
}
- NotificationEntry addedEntry = mNotificationData.get(key);
+ NotificationEntry addedEntry = getActiveNotificationUnfiltered(key);
if (addedEntry != null) {
addedEntry.abortTask();
mNotifLog.log(NotifEvent.INFLATION_ABORTED, addedEntry.getSbn(),
@@ -258,13 +301,13 @@
// If there was an async task started after the removal, we don't want to add it back to
// the list, otherwise we might get leaks.
if (!entry.isRowRemoved()) {
- boolean isNew = mNotificationData.get(entry.getKey()) == null;
+ boolean isNew = getActiveNotificationUnfiltered(entry.getKey()) == null;
if (isNew) {
for (NotificationEntryListener listener : mNotificationEntryListeners) {
mNotifLog.log(NotifEvent.INFLATED, entry);
listener.onEntryInflated(entry, inflatedFlags);
}
- mNotificationData.add(entry);
+ addActiveNotification(entry);
updateNotifications("onAsyncInflationFinished");
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onNotificationAdded(entry);
@@ -278,8 +321,34 @@
}
}
+ /**
+ * Equivalent to the old NotificationData#add
+ * @param entry - an entry which is prepared for display
+ */
+ private void addActiveNotification(NotificationEntry entry) {
+ Assert.isMainThread();
+
+ mActiveNotifications.put(entry.getKey(), entry);
+ mGroupManager.onEntryAdded(entry);
+ updateRankingAndSort(mRankingManager.getRankingMap(), "addEntryInternalInternal");
+ }
+
+ /**
+ * Available so that tests can directly manipulate the list of active notifications easily
+ *
+ * @param entry the entry to add directly to the visible notification map
+ */
+ @VisibleForTesting
+ public void addActiveNotificationForTest(NotificationEntry entry) {
+ mActiveNotifications.put(entry.getKey(), entry);
+ mGroupManager.onEntryAdded(entry);
+
+ reapplyFilterAndSort("addVisibleNotification");
+ }
+
+
@Override
- public void removeNotification(String key, NotificationListenerService.RankingMap ranking,
+ public void removeNotification(String key, RankingMap ranking,
int reason) {
removeNotificationInternal(key, ranking, obtainVisibility(key), false /* forceRemove */,
false /* removedByUser */, reason);
@@ -287,7 +356,7 @@
private void removeNotificationInternal(
String key,
- @Nullable NotificationListenerService.RankingMap ranking,
+ @Nullable RankingMap ranking,
@Nullable NotificationVisibility visibility,
boolean forceRemove,
boolean removedByUser,
@@ -300,7 +369,7 @@
return;
}
- final NotificationEntry entry = mNotificationData.get(key);
+ final NotificationEntry entry = getActiveNotificationUnfiltered(key);
boolean lifetimeExtended = false;
// Notification was canceled before it got inflated
@@ -355,8 +424,7 @@
// Let's remove the children if this was a summary
handleGroupSummaryRemoved(key);
-
- mNotificationData.remove(key, ranking);
+ removeVisibleNotification(key);
updateNotifications("removeNotificationInternal");
Dependency.get(LeakDetector.class).trackGarbage(entry);
removedByUser |= entryDismissed;
@@ -381,7 +449,7 @@
*
*/
private void handleGroupSummaryRemoved(String key) {
- NotificationEntry entry = mNotificationData.get(key);
+ NotificationEntry entry = getActiveNotificationUnfiltered(key);
if (entry != null && entry.rowExists() && entry.isSummaryWithChildren()) {
if (entry.getSbn().getOverrideGroupKey() != null && !entry.isRowDismissed()) {
// We don't want to remove children for autobundled notifications as they are not
@@ -413,13 +481,14 @@
}
private void addNotificationInternal(StatusBarNotification notification,
- NotificationListenerService.RankingMap rankingMap) throws InflationException {
+ RankingMap rankingMap) throws InflationException {
String key = notification.getKey();
if (DEBUG) {
Log.d(TAG, "addNotification key=" + key);
}
- mNotificationData.updateRanking(rankingMap, "addNotificationInternal");
+ updateRankingAndSort(rankingMap, "addNotificationInternal");
+
Ranking ranking = new Ranking();
rankingMap.getRanking(key, ranking);
@@ -439,8 +508,7 @@
}
@Override
- public void addNotification(StatusBarNotification notification,
- NotificationListenerService.RankingMap ranking) {
+ public void addNotification(StatusBarNotification notification, RankingMap ranking) {
try {
addNotificationInternal(notification, ranking);
} catch (InflationException e) {
@@ -449,12 +517,12 @@
}
private void updateNotificationInternal(StatusBarNotification notification,
- NotificationListenerService.RankingMap ranking) throws InflationException {
+ RankingMap ranking) throws InflationException {
if (DEBUG) Log.d(TAG, "updateNotification(" + notification + ")");
final String key = notification.getKey();
abortExistingInflation(key, "updateNotification");
- NotificationEntry entry = mNotificationData.get(key);
+ NotificationEntry entry = getActiveNotificationUnfiltered(key);
if (entry == null) {
return;
}
@@ -463,7 +531,11 @@
// to keep its lifetime extended.
cancelLifetimeExtension(entry);
- mNotificationData.update(entry, ranking, notification, "updateNotificationInternal");
+ updateRankingAndSort(ranking, "updateNotificationInternal");
+ StatusBarNotification oldSbn = entry.getSbn();
+ entry.setSbn(notification);
+ mGroupManager.onEntryUpdated(entry, oldSbn);
+
mNotifLog.log(NotifEvent.NOTIF_UPDATED, entry.getSbn(), entry.getRanking());
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onPreEntryUpdated(entry);
@@ -486,8 +558,7 @@
}
@Override
- public void updateNotification(StatusBarNotification notification,
- NotificationListenerService.RankingMap ranking) {
+ public void updateNotification(StatusBarNotification notification, RankingMap ranking) {
try {
updateNotificationInternal(notification, ranking);
} catch (InflationException e) {
@@ -500,16 +571,16 @@
* @param reason why the notifications are updating
*/
public void updateNotifications(String reason) {
- mNotificationData.filterAndSort(reason);
+ reapplyFilterAndSort(reason);
if (mPresenter != null) {
mPresenter.updateNotificationViews();
}
}
@Override
- public void updateNotificationRanking(NotificationListenerService.RankingMap rankingMap) {
+ public void updateNotificationRanking(RankingMap rankingMap) {
List<NotificationEntry> entries = new ArrayList<>();
- entries.addAll(mNotificationData.getActiveNotifications());
+ entries.addAll(getVisibleNotifications());
entries.addAll(mPendingNotifications.values());
// Has a copy of the current UI adjustments.
@@ -523,7 +594,7 @@
}
// Populate notification entries from the new rankings.
- mNotificationData.updateRanking(rankingMap, "updateNotificationRanking");
+ updateRankingAndSort(rankingMap, "updateNotificationRanking");
updateRankingOfPendingNotifications(rankingMap);
// By comparing the old and new UI adjustments, reinflate the view accordingly.
@@ -542,8 +613,7 @@
}
}
- private void updateRankingOfPendingNotifications(
- @Nullable NotificationListenerService.RankingMap rankingMap) {
+ private void updateRankingOfPendingNotifications(@Nullable RankingMap rankingMap) {
if (rankingMap == null) {
return;
}
@@ -565,23 +635,35 @@
}
/**
- * @return all notification we're currently aware of (both pending and visible notifications)
+ * @return all notifications we're currently aware of (both pending and active notifications)
*/
- public Set<NotificationEntry> getAllNotifs() {
+ public Set<NotificationEntry> getPendingAndActiveNotifications() {
Set<NotificationEntry> allNotifs = new HashSet<>(mPendingNotifications.values());
- allNotifs.addAll(mNotificationData.getActiveNotifications());
+ allNotifs.addAll(mSortedAndFiltered);
return allNotifs;
}
/**
+ * Use this method to retrieve a notification entry that has been prepared for presentation.
+ * Note that the notification may be filtered out and never shown to the user.
+ *
+ * @see #getVisibleNotifications() for the currently sorted and filtered list
+ *
+ * @return a {@link NotificationEntry} if it has been prepared, else null
+ */
+ public NotificationEntry getActiveNotificationUnfiltered(String key) {
+ return mActiveNotifications.get(key);
+ }
+
+ /**
* Gets the pending or visible notification entry with the given key. Returns null if
* notification doesn't exist.
*/
- public NotificationEntry getPendingOrCurrentNotif(String key) {
+ public NotificationEntry getPendingOrActiveNotif(String key) {
if (mPendingNotifications.containsKey(key)) {
return mPendingNotifications.get(key);
} else {
- return mNotificationData.get(key);
+ return mActiveNotifications.get(key);
}
}
@@ -608,4 +690,136 @@
}
return mNotificationRowBinder;
}
+
+ /*
+ * -----
+ * Annexed from NotificationData below:
+ * Some of these methods may be redundant but require some reworking to remove. For now
+ * we'll try to keep the behavior the same and can simplify these interfaces in another pass
+ */
+
+ /** Internalization of NotificationData#remove */
+ private void removeVisibleNotification(String key) {
+ // no need to synchronize if we're on the main thread dawg
+ Assert.isMainThread();
+
+ NotificationEntry removed = mActiveNotifications.remove(key);
+
+ if (removed == null) return;
+ mGroupManager.onEntryRemoved(removed);
+ }
+
+ /** @return list of active notifications filtered for the current user */
+ public List<NotificationEntry> getActiveNotificationsForCurrentUser() {
+ Assert.isMainThread();
+ ArrayList<NotificationEntry> filtered = new ArrayList<>();
+
+ final int len = mActiveNotifications.size();
+ for (int i = 0; i < len; i++) {
+ NotificationEntry entry = mActiveNotifications.valueAt(i);
+ final StatusBarNotification sbn = entry.getSbn();
+ if (!mKeyguardEnvironment.isNotificationForCurrentProfiles(sbn)) {
+ continue;
+ }
+ filtered.add(entry);
+ }
+
+ return filtered;
+ }
+
+ //TODO: Get rid of this in favor of NotificationUpdateHandler#updateNotificationRanking
+ /**
+ * @param rankingMap the {@link RankingMap} to apply to the current notification list
+ * @param reason the reason for calling this method, for {@link NotifLog}
+ */
+ public void updateRanking(RankingMap rankingMap, String reason) {
+ updateRankingAndSort(rankingMap, reason);
+ }
+
+ /** Resorts / filters the current notification set with the current RankingMap */
+ public void reapplyFilterAndSort(String reason) {
+ updateRankingAndSort(mRankingManager.getRankingMap(), reason);
+ }
+
+ /** Calls to NotificationRankingManager and updates mSortedAndFiltered */
+ private void updateRankingAndSort(@NonNull RankingMap rankingMap, String reason) {
+ mSortedAndFiltered.clear();
+ mSortedAndFiltered.addAll(mRankingManager.updateRanking(
+ rankingMap, mActiveNotifications.values(), reason));
+ }
+
+ /** dump the current active notification list. Called from StatusBar */
+ public void dump(PrintWriter pw, String indent) {
+ pw.println("NotificationEntryManager");
+ int filteredLen = mSortedAndFiltered.size();
+ pw.print(indent);
+ pw.println("active notifications: " + filteredLen);
+ int active;
+ for (active = 0; active < filteredLen; active++) {
+ NotificationEntry e = mSortedAndFiltered.get(active);
+ dumpEntry(pw, indent, active, e);
+ }
+ synchronized (mActiveNotifications) {
+ int totalLen = mActiveNotifications.size();
+ pw.print(indent);
+ pw.println("inactive notifications: " + (totalLen - active));
+ int inactiveCount = 0;
+ for (int i = 0; i < totalLen; i++) {
+ NotificationEntry entry = mActiveNotifications.valueAt(i);
+ if (!mSortedAndFiltered.contains(entry)) {
+ dumpEntry(pw, indent, inactiveCount, entry);
+ inactiveCount++;
+ }
+ }
+ }
+ }
+
+ private void dumpEntry(PrintWriter pw, String indent, int i, NotificationEntry e) {
+ pw.print(indent);
+ pw.println(" [" + i + "] key=" + e.getKey() + " icon=" + e.icon);
+ StatusBarNotification n = e.getSbn();
+ pw.print(indent);
+ pw.println(" pkg=" + n.getPackageName() + " id=" + n.getId() + " importance="
+ + e.getRanking().getImportance());
+ pw.print(indent);
+ pw.println(" notification=" + n.getNotification());
+ }
+
+ /**
+ * This is the answer to the question "what notifications should the user be seeing right now?"
+ * These are sorted and filtered, and directly inform the notification shade what to show
+ *
+ * @return A read-only list of the currently active notifications
+ */
+ public List<NotificationEntry> getVisibleNotifications() {
+ return mReadOnlyNotifications;
+ }
+
+ /** @return A count of the active notifications */
+ public int getActiveNotificationsCount() {
+ return mReadOnlyNotifications.size();
+ }
+
+ /**
+ * @return {@code true} if there is at least one notification that should be visible right now
+ */
+ public boolean hasActiveNotifications() {
+ return mReadOnlyNotifications.size() != 0;
+ }
+
+ /*
+ * End annexation
+ * -----
+ */
+
+
+ /**
+ * Provides access to keyguard state and user settings dependent data.
+ */
+ public interface KeyguardEnvironment {
+ /** true if the device is provisioned (should always be true in practice) */
+ boolean isDeviceProvisioned();
+ /** true if the notification is for the current profiles */
+ boolean isNotificationForCurrentProfiles(StatusBarNotification sbn);
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java
index b116409..e5f44bd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java
@@ -28,7 +28,6 @@
import com.android.systemui.Dependency;
import com.android.systemui.ForegroundServiceController;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.phone.NotificationGroupManager;
import com.android.systemui.statusbar.phone.ShadeController;
@@ -44,7 +43,7 @@
private final NotificationGroupManager mGroupManager = Dependency.get(
NotificationGroupManager.class);
- private NotificationData.KeyguardEnvironment mEnvironment;
+ private NotificationEntryManager.KeyguardEnvironment mEnvironment;
private ShadeController mShadeController;
private ForegroundServiceController mFsc;
private NotificationLockscreenUserManager mUserManager;
@@ -52,9 +51,9 @@
@Inject
public NotificationFilter() {}
- private NotificationData.KeyguardEnvironment getEnvironment() {
+ private NotificationEntryManager.KeyguardEnvironment getEnvironment() {
if (mEnvironment == null) {
- mEnvironment = Dependency.get(NotificationData.KeyguardEnvironment.class);
+ mEnvironment = Dependency.get(NotificationEntryManager.KeyguardEnvironment.class);
}
return mEnvironment;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifListBuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/CollectionReadyForBuildListener.java
similarity index 96%
rename from packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifListBuilder.java
rename to packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/CollectionReadyForBuildListener.java
index 17fef68..cefb506 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifListBuilder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/CollectionReadyForBuildListener.java
@@ -22,7 +22,7 @@
* Interface for the class responsible for converting a NotifCollection into the final sorted,
* filtered, and grouped list of currently visible notifications.
*/
-public interface NotifListBuilder {
+public interface CollectionReadyForBuildListener {
/**
* Called after the NotifCollection has received an update from NotificationManager but before
* it dispatches any change events to its listeners. This is to inform the list builder that
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/GroupEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/GroupEntry.java
new file mode 100644
index 0000000..f9f3266
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/GroupEntry.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection;
+
+import android.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Represents a set of grouped notifications. The final notification list is usually a mix of
+ * GroupEntries and NotificationEntries.
+ */
+public class GroupEntry extends ListEntry {
+ @Nullable private NotificationEntry mSummary;
+ private final List<NotificationEntry> mChildren = new ArrayList<>();
+
+ private final List<NotificationEntry> mUnmodifiableChildren =
+ Collections.unmodifiableList(mChildren);
+
+ GroupEntry(String key) {
+ super(key);
+ }
+
+ @Override
+ public NotificationEntry getRepresentativeEntry() {
+ return mSummary;
+ }
+
+ @Nullable
+ public NotificationEntry getSummary() {
+ return mSummary;
+ }
+
+ public List<NotificationEntry> getChildren() {
+ return mUnmodifiableChildren;
+ }
+
+ void setSummary(@Nullable NotificationEntry summary) {
+ mSummary = summary;
+ }
+
+ void clearChildren() {
+ mChildren.clear();
+ }
+
+ void addChild(NotificationEntry child) {
+ mChildren.add(child);
+ }
+
+ void sortChildren(Comparator<? super NotificationEntry> c) {
+ mChildren.sort(c);
+ }
+
+ List<NotificationEntry> getRawChildren() {
+ return mChildren;
+ }
+
+ public static final GroupEntry ROOT_ENTRY = new GroupEntry("<root>");
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java
new file mode 100644
index 0000000..e1268f6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection;
+
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;
+
+import java.util.List;
+
+
+/**
+ * Utility class for dumping the results of a {@link NotifListBuilder} to a debug string.
+ */
+public class ListDumper {
+
+ /** See class description */
+ public static String dumpList(List<ListEntry> entries) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < entries.size(); i++) {
+ ListEntry entry = entries.get(i);
+ dumpEntry(entry, Integer.toString(i), "", sb);
+ if (entry instanceof GroupEntry) {
+ GroupEntry ge = (GroupEntry) entry;
+ for (int j = 0; j < ge.getChildren().size(); j++) {
+ dumpEntry(
+ ge.getChildren().get(j),
+ Integer.toString(j),
+ INDENT,
+ sb);
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+ private static void dumpEntry(
+ ListEntry entry, String index, String indent, StringBuilder sb) {
+ sb.append(indent)
+ .append("[").append(index).append("] ")
+ .append(entry.getKey())
+ .append(" (parent=")
+ .append(entry.getParent() != null ? entry.getParent().getKey() : null)
+ .append(")\n");
+ }
+
+ private static final String INDENT = " ";
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java
new file mode 100644
index 0000000..dc68c4b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection;
+
+import android.annotation.Nullable;
+
+/**
+ * Abstract superclass for top-level entries, i.e. things that can appear in the final notification
+ * list shown to users. In practice, this means either GroupEntries or NotificationEntries.
+ */
+public abstract class ListEntry {
+ private final String mKey;
+
+ @Nullable private GroupEntry mParent;
+ @Nullable private GroupEntry mPreviousParent;
+ private int mSection;
+ int mFirstAddedIteration = -1;
+
+ ListEntry(String key) {
+ mKey = key;
+ }
+
+ public String getKey() {
+ return mKey;
+ }
+
+ /**
+ * Should return the "representative entry" for this ListEntry. For NotificationEntries, its
+ * the entry itself. For groups, it should be the summary. This method exists to interface with
+ * legacy code that expects groups to also be NotificationEntries.
+ */
+ public abstract NotificationEntry getRepresentativeEntry();
+
+ @Nullable public GroupEntry getParent() {
+ return mParent;
+ }
+
+ void setParent(@Nullable GroupEntry parent) {
+ mParent = parent;
+ }
+
+ @Nullable public GroupEntry getPreviousParent() {
+ return mPreviousParent;
+ }
+
+ void setPreviousParent(@Nullable GroupEntry previousParent) {
+ mPreviousParent = previousParent;
+ }
+
+ /** The section this notification was assigned to (0 to N-1, where N is number of sections). */
+ public int getSection() {
+ return mSection;
+ }
+
+ void setSection(int section) {
+ mSection = section;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
index b551352..6f085c0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
@@ -95,7 +95,7 @@
private final Collection<NotificationEntry> mReadOnlyNotificationSet =
Collections.unmodifiableCollection(mNotificationSet.values());
- @Nullable private NotifListBuilder mListBuilder;
+ @Nullable private CollectionReadyForBuildListener mBuildListener;
private final List<NotifCollectionListener> mNotifCollectionListeners = new ArrayList<>();
private final List<NotifLifetimeExtender> mLifetimeExtenders = new ArrayList<>();
@@ -123,9 +123,9 @@
* Sets the class responsible for converting the collection into the list of currently-visible
* notifications.
*/
- public void setListBuilder(NotifListBuilder listBuilder) {
+ public void setBuildListener(CollectionReadyForBuildListener buildListener) {
Assert.isMainThread();
- mListBuilder = listBuilder;
+ mBuildListener = buildListener;
}
/**
@@ -282,8 +282,8 @@
}
private void rebuildList() {
- if (mListBuilder != null) {
- mListBuilder.onBuildList(mReadOnlyNotificationSet);
+ if (mBuildListener != null) {
+ mBuildListener.onBuildList(mReadOnlyNotificationSet);
}
}
@@ -339,8 +339,8 @@
private void dispatchOnEntryAdded(NotificationEntry entry) {
mAmDispatchingToOtherCode = true;
- if (mListBuilder != null) {
- mListBuilder.onBeginDispatchToListeners();
+ if (mBuildListener != null) {
+ mBuildListener.onBeginDispatchToListeners();
}
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onEntryAdded(entry);
@@ -350,8 +350,8 @@
private void dispatchOnEntryUpdated(NotificationEntry entry) {
mAmDispatchingToOtherCode = true;
- if (mListBuilder != null) {
- mListBuilder.onBeginDispatchToListeners();
+ if (mBuildListener != null) {
+ mBuildListener.onBeginDispatchToListeners();
}
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onEntryUpdated(entry);
@@ -364,8 +364,8 @@
@CancellationReason int reason,
boolean removedByUser) {
mAmDispatchingToOtherCode = true;
- if (mListBuilder != null) {
- mListBuilder.onBeginDispatchToListeners();
+ if (mBuildListener != null) {
+ mBuildListener.onBeginDispatchToListeners();
}
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onEntryRemoved(entry, reason, removedByUser);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImpl.java
new file mode 100644
index 0000000..21a4b4f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImpl.java
@@ -0,0 +1,737 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection;
+
+import static com.android.systemui.statusbar.notification.collection.GroupEntry.ROOT_ENTRY;
+import static com.android.systemui.statusbar.notification.collection.ListDumper.dumpList;
+import static com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState.STATE_BUILD_PENDING;
+import static com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState.STATE_BUILD_STARTED;
+import static com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState.STATE_FILTERING;
+import static com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState.STATE_FINALIZING;
+import static com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState.STATE_IDLE;
+import static com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState.STATE_SORTING;
+import static com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState.STATE_TRANSFORMING;
+
+import android.annotation.MainThread;
+import android.annotation.Nullable;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;
+import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener;
+import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeSortListener;
+import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeTransformGroupsListener;
+import com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.SectionsProvider;
+import com.android.systemui.util.Assert;
+import com.android.systemui.util.time.SystemClock;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * The implementation of {@link NotifListBuilder}.
+ */
+@MainThread
+@Singleton
+public class NotifListBuilderImpl implements NotifListBuilder {
+
+ private final SystemClock mSystemClock;
+
+ private final List<ListEntry> mNotifList = new ArrayList<>();
+
+ private final PipelineState mPipelineState = new PipelineState();
+ private final Map<String, GroupEntry> mGroups = new ArrayMap<>();
+ private Collection<NotificationEntry> mAllEntries = Collections.emptyList();
+ private final List<ListEntry> mNewEntries = new ArrayList<>();
+ private int mIterationCount = 0;
+
+ private final List<NotifFilter> mNotifFilters = new ArrayList<>();
+ private final List<NotifPromoter> mNotifPromoters = new ArrayList<>();
+ private final List<NotifComparator> mNotifComparators = new ArrayList<>();
+ private SectionsProvider mSectionsProvider = new DefaultSectionsProvider();
+
+ private final List<OnBeforeTransformGroupsListener> mOnBeforeTransformGroupsListeners =
+ new ArrayList<>();
+ private final List<OnBeforeSortListener> mOnBeforeSortListeners =
+ new ArrayList<>();
+ private final List<OnBeforeRenderListListener> mOnBeforeRenderListListeners =
+ new ArrayList<>();
+ @Nullable private OnRenderListListener mOnRenderListListener;
+
+ private final List<ListEntry> mReadOnlyNotifList = Collections.unmodifiableList(mNotifList);
+
+ @Inject
+ public NotifListBuilderImpl(SystemClock systemClock) {
+ Assert.isMainThread();
+ mSystemClock = systemClock;
+ }
+
+ /**
+ * Attach the list builder to the NotifCollection. After this is called, it will start building
+ * the notif list in response to changes to the colletion.
+ */
+ public void attach(NotifCollection collection) {
+ Assert.isMainThread();
+ collection.setBuildListener(mReadyForBuildListener);
+ }
+
+ /**
+ * Registers the listener that's responsible for rendering the notif list to the screen. Called
+ * At the very end of pipeline execution, after all other listeners and pluggables have fired.
+ */
+ public void setOnRenderListListener(OnRenderListListener onRenderListListener) {
+ Assert.isMainThread();
+
+ mPipelineState.requireState(STATE_IDLE);
+ mOnRenderListListener = onRenderListListener;
+ }
+
+ @Override
+ public void addOnBeforeTransformGroupsListener(OnBeforeTransformGroupsListener listener) {
+ Assert.isMainThread();
+
+ mPipelineState.requireState(STATE_IDLE);
+ mOnBeforeTransformGroupsListeners.add(listener);
+ }
+
+ @Override
+ public void addOnBeforeSortListener(OnBeforeSortListener listener) {
+ Assert.isMainThread();
+
+ mPipelineState.requireState(STATE_IDLE);
+ mOnBeforeSortListeners.add(listener);
+ }
+
+ @Override
+ public void addOnBeforeRenderListListener(OnBeforeRenderListListener listener) {
+ Assert.isMainThread();
+
+ mPipelineState.requireState(STATE_IDLE);
+ mOnBeforeRenderListListeners.add(listener);
+ }
+
+ @Override
+ public void addFilter(NotifFilter filter) {
+ Assert.isMainThread();
+ mPipelineState.requireState(STATE_IDLE);
+
+ mNotifFilters.add(filter);
+ filter.setInvalidationListener(this::onFilterInvalidated);
+ }
+
+ @Override
+ public void addPromoter(NotifPromoter promoter) {
+ Assert.isMainThread();
+ mPipelineState.requireState(STATE_IDLE);
+
+ mNotifPromoters.add(promoter);
+ promoter.setInvalidationListener(this::onPromoterInvalidated);
+ }
+
+ @Override
+ public void setSectionsProvider(SectionsProvider provider) {
+ Assert.isMainThread();
+ mPipelineState.requireState(STATE_IDLE);
+
+ mSectionsProvider = provider;
+ provider.setInvalidationListener(this::onSectionsProviderInvalidated);
+ }
+
+ @Override
+ public void setComparators(List<NotifComparator> comparators) {
+ Assert.isMainThread();
+ mPipelineState.requireState(STATE_IDLE);
+
+ mNotifComparators.clear();
+ for (NotifComparator comparator : comparators) {
+ mNotifComparators.add(comparator);
+ comparator.setInvalidationListener(this::onNotifComparatorInvalidated);
+ }
+ }
+
+ @Override
+ public List<ListEntry> getActiveNotifs() {
+ Assert.isMainThread();
+ return mReadOnlyNotifList;
+ }
+
+ private final CollectionReadyForBuildListener mReadyForBuildListener =
+ new CollectionReadyForBuildListener() {
+ @Override
+ public void onBeginDispatchToListeners() {
+ Assert.isMainThread();
+ mPipelineState.incrementTo(STATE_BUILD_PENDING);
+ }
+
+ @Override
+ public void onBuildList(Collection<NotificationEntry> entries) {
+ Assert.isMainThread();
+ mPipelineState.requireIsBefore(STATE_BUILD_STARTED);
+
+ Log.i(TAG, "Build request received from NotifCollection");
+ mAllEntries = entries;
+ buildList();
+ }
+ };
+
+ private void onFilterInvalidated(NotifFilter filter) {
+ Assert.isMainThread();
+
+ // TODO: Convert these log statements (here and elsewhere) into timeline logging
+ Log.i(TAG, String.format(
+ "Filter \"%s\" invalidated; pipeline state is %d",
+ filter.getName(),
+ mPipelineState.getState()));
+
+ rebuildListIfBefore(STATE_FILTERING);
+ }
+
+ private void onPromoterInvalidated(NotifPromoter filter) {
+ Assert.isMainThread();
+
+ Log.i(TAG, String.format(
+ "NotifPromoter \"%s\" invalidated; pipeline state is %d",
+ filter.getName(),
+ mPipelineState.getState()));
+
+ rebuildListIfBefore(STATE_TRANSFORMING);
+ }
+
+ private void onSectionsProviderInvalidated(SectionsProvider provider) {
+ Assert.isMainThread();
+
+ Log.i(TAG, String.format(
+ "Sections provider \"%s\" invalidated; pipeline state is %d",
+ provider.getName(),
+ mPipelineState.getState()));
+
+ rebuildListIfBefore(STATE_SORTING);
+ }
+
+ private void onNotifComparatorInvalidated(NotifComparator comparator) {
+ Assert.isMainThread();
+
+ Log.i(TAG, String.format(
+ "Comparator \"%s\" invalidated; pipeline state is %d",
+ comparator.getName(),
+ mPipelineState.getState()));
+
+ rebuildListIfBefore(STATE_SORTING);
+ }
+
+ /**
+ * The core algorithm of the pipeline. See the top comment in {@link NotifListBuilder} for
+ * details on our contracts with other code.
+ *
+ * Once the build starts we are very careful to protect against reentrant code. Anything that
+ * tries to invalidate itself after the pipeline has passed it by will return in an exception.
+ * In general, we should be extremely sensitive to client code doing things in the wrong order;
+ * if we detect that behavior, we should crash instantly.
+ */
+ private void buildList() {
+ Log.i(TAG, "Starting notif list build #" + mIterationCount + "...");
+
+ mPipelineState.requireIsBefore(STATE_BUILD_STARTED);
+ mPipelineState.setState(STATE_BUILD_STARTED);
+
+ // Step 1: Filtering and initial grouping
+ // Filter out any notifs that shouldn't be shown right now and cluster any that are part of
+ // a group
+ mPipelineState.incrementTo(STATE_FILTERING);
+ mNotifList.clear();
+ mNewEntries.clear();
+ filterAndGroup(mAllEntries, mNotifList, mNewEntries);
+ pruneIncompleteGroups(mNotifList, mNewEntries);
+
+ // Step 2: Group transforming
+ // Move some notifs out of their groups and up to top-level (mostly used for heads-upping)
+ dispatchOnBeforeTransformGroups(mReadOnlyNotifList, mNewEntries);
+ mPipelineState.incrementTo(STATE_TRANSFORMING);
+ promoteNotifs(mNotifList);
+ pruneIncompleteGroups(mNotifList, mNewEntries);
+
+ // Step 3: Sort
+ // Assign each top-level entry a section, then sort the list by section and then within
+ // section by our list of custom comparators
+ dispatchOnBeforeSort(mReadOnlyNotifList);
+ mPipelineState.incrementTo(STATE_SORTING);
+ sortList();
+
+ // Step 4: Lock in our group structure and log anything that's changed since the last run
+ mPipelineState.incrementTo(STATE_FINALIZING);
+ logParentingChanges();
+ freeEmptyGroups();
+
+ // Step 5: Dispatch the new list, first to any listeners and then to the view layer
+ Log.i(TAG, "List finalized, is:\n" + dumpList(mNotifList));
+ Log.i(TAG, "Dispatching final list to listeners...");
+ dispatchOnBeforeRenderList(mReadOnlyNotifList);
+ if (mOnRenderListListener != null) {
+ mOnRenderListListener.onRenderList(mReadOnlyNotifList);
+ }
+
+ // Step 6: We're done!
+ Log.i(TAG, "Notif list build #" + mIterationCount + " completed");
+ mPipelineState.setState(STATE_IDLE);
+ mIterationCount++;
+ }
+
+ private void filterAndGroup(
+ Collection<NotificationEntry> entries,
+ List<ListEntry> out,
+ List<ListEntry> newlyVisibleEntries) {
+
+ long now = mSystemClock.uptimeMillis();
+
+ for (GroupEntry group : mGroups.values()) {
+ group.setPreviousParent(group.getParent());
+ group.setParent(null);
+ group.clearChildren();
+ group.setSummary(null);
+ }
+
+ for (NotificationEntry entry : entries) {
+ entry.setPreviousParent(entry.getParent());
+ entry.setParent(null);
+
+ // See if we should filter out this notification
+ boolean shouldFilterOut = applyFilters(entry, now);
+ if (shouldFilterOut) {
+ continue;
+ }
+
+ if (entry.mFirstAddedIteration == -1) {
+ entry.mFirstAddedIteration = mIterationCount;
+ newlyVisibleEntries.add(entry);
+ }
+
+ // Otherwise, group it
+ if (entry.getSbn().isGroup()) {
+ final String topLevelKey = entry.getSbn().getGroupKey();
+
+ GroupEntry group = mGroups.get(topLevelKey);
+ if (group == null) {
+ group = new GroupEntry(topLevelKey);
+ group.mFirstAddedIteration = mIterationCount;
+ newlyVisibleEntries.add(group);
+ mGroups.put(topLevelKey, group);
+ }
+ if (group.getParent() == null) {
+ group.setParent(ROOT_ENTRY);
+ out.add(group);
+ }
+
+ entry.setParent(group);
+
+ if (entry.getSbn().getNotification().isGroupSummary()) {
+ final NotificationEntry existingSummary = group.getSummary();
+
+ if (existingSummary == null) {
+ group.setSummary(entry);
+ } else {
+ Log.w(TAG, String.format(
+ "Duplicate summary for group '%s': '%s' vs. '%s'",
+ group.getKey(),
+ existingSummary.getKey(),
+ entry.getKey()));
+
+ // Use whichever one was posted most recently
+ if (entry.getSbn().getPostTime()
+ > existingSummary.getSbn().getPostTime()) {
+ group.setSummary(entry);
+ annulAddition(existingSummary, out, newlyVisibleEntries);
+ } else {
+ annulAddition(entry, out, newlyVisibleEntries);
+ }
+ }
+ } else {
+ group.addChild(entry);
+ }
+
+ } else {
+
+ final String topLevelKey = entry.getKey();
+ if (mGroups.containsKey(topLevelKey)) {
+ Log.wtf(TAG, "Duplicate non-group top-level key: " + topLevelKey);
+ } else {
+ entry.setParent(ROOT_ENTRY);
+ out.add(entry);
+ }
+ }
+ }
+ }
+
+ private void promoteNotifs(List<ListEntry> list) {
+ for (int i = 0; i < list.size(); i++) {
+ final ListEntry tle = list.get(i);
+
+ if (tle instanceof GroupEntry) {
+ final GroupEntry group = (GroupEntry) tle;
+
+ group.getRawChildren().removeIf(child -> {
+ final boolean shouldPromote = applyTopLevelPromoters(child);
+
+ if (shouldPromote) {
+ child.setParent(ROOT_ENTRY);
+ list.add(child);
+ }
+
+ return shouldPromote;
+ });
+ }
+ }
+ }
+
+ private void pruneIncompleteGroups(
+ List<ListEntry> shadeList,
+ List<ListEntry> newlyVisibleEntries) {
+
+ for (int i = 0; i < shadeList.size(); i++) {
+ final ListEntry tle = shadeList.get(i);
+
+ if (tle instanceof GroupEntry) {
+ final GroupEntry group = (GroupEntry) tle;
+ final List<NotificationEntry> children = group.getRawChildren();
+
+ if (group.getSummary() != null && children.size() == 0) {
+ shadeList.remove(i);
+ i--;
+
+ NotificationEntry summary = group.getSummary();
+ summary.setParent(ROOT_ENTRY);
+ shadeList.add(summary);
+
+ group.setSummary(null);
+ annulAddition(group, shadeList, newlyVisibleEntries);
+
+ } else if (group.getSummary() == null
+ || children.size() < MIN_CHILDREN_FOR_GROUP) {
+ // If the group doesn't provide a summary or is too small, ignore it and add
+ // its children (if any) directly to top-level.
+
+ shadeList.remove(i);
+ i--;
+
+ if (group.getSummary() != null) {
+ final NotificationEntry summary = group.getSummary();
+ group.setSummary(null);
+ annulAddition(summary, shadeList, newlyVisibleEntries);
+ }
+
+ for (int j = 0; j < children.size(); j++) {
+ final NotificationEntry child = children.get(j);
+ child.setParent(ROOT_ENTRY);
+ shadeList.add(child);
+ }
+ children.clear();
+
+ annulAddition(group, shadeList, newlyVisibleEntries);
+ }
+ }
+ }
+ }
+
+ /**
+ * If a ListEntry was added to the shade list and then later removed (e.g. because it was a
+ * group that was broken up), this method will erase any bookkeeping traces of that addition
+ * and/or check that they were already erased.
+ *
+ * Before calling this method, the entry must already have been removed from its parent. If
+ * it's a group, its summary must be null and its children must be empty.
+ */
+ private void annulAddition(
+ ListEntry entry,
+ List<ListEntry> shadeList,
+ List<ListEntry> newlyVisibleEntries) {
+
+ // This function does very little, but if any of its assumptions are violated (and it has a
+ // lot of them), it will put the system into an inconsistent state. So we check all of them
+ // here.
+
+ if (entry.getParent() == null || entry.mFirstAddedIteration == -1) {
+ throw new IllegalStateException(
+ "Cannot nullify addition of " + entry.getKey() + ": no such addition. ("
+ + entry.getParent() + " " + entry.mFirstAddedIteration + ")");
+ }
+
+ if (entry.getParent() == ROOT_ENTRY) {
+ if (shadeList.contains(entry)) {
+ throw new IllegalStateException("Cannot nullify addition of " + entry.getKey()
+ + ": it's still in the shade list.");
+ }
+ }
+
+ if (entry instanceof GroupEntry) {
+ GroupEntry ge = (GroupEntry) entry;
+ if (ge.getSummary() != null) {
+ throw new IllegalStateException(
+ "Cannot nullify group " + ge.getKey() + ": summary is not null");
+ }
+ if (!ge.getChildren().isEmpty()) {
+ throw new IllegalStateException(
+ "Cannot nullify group " + ge.getKey() + ": still has children");
+ }
+ } else if (entry instanceof NotificationEntry) {
+ if (entry == entry.getParent().getSummary()
+ || entry.getParent().getChildren().contains(entry)) {
+ throw new IllegalStateException("Cannot nullify addition of child "
+ + entry.getKey() + ": it's still attached to its parent.");
+ }
+ }
+
+ entry.setParent(null);
+ if (entry.mFirstAddedIteration == mIterationCount) {
+ if (!newlyVisibleEntries.remove(entry)) {
+ throw new IllegalStateException("Cannot late-filter entry " + entry.getKey() + " "
+ + entry + " from " + newlyVisibleEntries + " "
+ + entry.mFirstAddedIteration);
+ }
+ entry.mFirstAddedIteration = -1;
+ }
+ }
+
+ private void sortList() {
+ // Assign sections to top-level elements and sort their children
+ for (ListEntry entry : mNotifList) {
+ entry.setSection(mSectionsProvider.getSection(entry));
+ if (entry instanceof GroupEntry) {
+ GroupEntry parent = (GroupEntry) entry;
+ for (NotificationEntry child : parent.getChildren()) {
+ child.setSection(0);
+ }
+ parent.sortChildren(sChildComparator);
+ }
+ }
+
+ // Finally, sort all top-level elements
+ mNotifList.sort(mTopLevelComparator);
+ }
+
+ private void freeEmptyGroups() {
+ mGroups.values().removeIf(ge -> ge.getSummary() == null && ge.getChildren().isEmpty());
+ }
+
+ private void logParentingChanges() {
+ for (NotificationEntry entry : mAllEntries) {
+ if (entry.getParent() != entry.getPreviousParent()) {
+ Log.i(TAG, String.format(
+ "%s: parent changed from %s to %s",
+ entry.getKey(),
+ entry.getPreviousParent() == null
+ ? "null" : entry.getPreviousParent().getKey(),
+ entry.getParent() == null
+ ? "null" : entry.getParent().getKey()));
+ }
+ }
+ for (GroupEntry group : mGroups.values()) {
+ if (group.getParent() != group.getPreviousParent()) {
+ Log.i(TAG, String.format(
+ "%s: parent changed from %s to %s",
+ group.getKey(),
+ group.getPreviousParent() == null
+ ? "null" : group.getPreviousParent().getKey(),
+ group.getParent() == null
+ ? "null" : group.getParent().getKey()));
+ }
+ }
+ }
+
+ private final Comparator<ListEntry> mTopLevelComparator = (o1, o2) -> {
+
+ int cmp = Integer.compare(o1.getSection(), o2.getSection());
+
+ if (cmp == 0) {
+ for (int i = 0; i < mNotifComparators.size(); i++) {
+ cmp = mNotifComparators.get(i).compare(o1, o2);
+ if (cmp != 0) {
+ break;
+ }
+ }
+ }
+
+ final NotificationEntry rep1 = o1.getRepresentativeEntry();
+ final NotificationEntry rep2 = o2.getRepresentativeEntry();
+
+ if (cmp == 0) {
+ cmp = rep1.getRanking().getRank() - rep2.getRanking().getRank();
+ }
+
+ if (cmp == 0) {
+ cmp = Long.compare(
+ rep2.getSbn().getNotification().when,
+ rep1.getSbn().getNotification().when);
+ }
+
+ return cmp;
+ };
+
+ private static final Comparator<NotificationEntry> sChildComparator = (o1, o2) -> {
+ int cmp = o1.getRanking().getRank() - o2.getRanking().getRank();
+
+ if (cmp == 0) {
+ cmp = Long.compare(
+ o2.getSbn().getNotification().when,
+ o1.getSbn().getNotification().when);
+ }
+
+ return cmp;
+ };
+
+ private boolean applyFilters(NotificationEntry entry, long now) {
+ NotifFilter filter = findRejectingFilter(entry, now);
+
+ if (filter != entry.mExcludingFilter) {
+ if (entry.mExcludingFilter == null) {
+ Log.i(TAG, String.format(
+ "%s: filtered out by '%s'",
+ entry.getKey(),
+ filter.getName()));
+ } else if (filter == null) {
+ Log.i(TAG, String.format(
+ "%s: no longer filtered out (previous filter was '%s')",
+ entry.getKey(),
+ entry.mExcludingFilter.getName()));
+ } else {
+ Log.i(TAG, String.format(
+ "%s: filter changed: '%s' -> '%s'",
+ entry.getKey(),
+ entry.mExcludingFilter,
+ filter));
+ }
+
+ // Note that groups and summaries can also be filtered out later if they're part of a
+ // malformed group. We currently don't have a great way to track that beyond parenting
+ // change logs. Consider adding something similar to mExcludingFilter for them.
+ entry.mExcludingFilter = filter;
+ }
+
+ return filter != null;
+ }
+
+ @Nullable private NotifFilter findRejectingFilter(NotificationEntry entry, long now) {
+ for (int i = 0; i < mNotifFilters.size(); i++) {
+ NotifFilter filter = mNotifFilters.get(i);
+ if (filter.shouldFilterOut(entry, now)) {
+ return filter;
+ }
+ }
+ return null;
+ }
+
+ private boolean applyTopLevelPromoters(NotificationEntry entry) {
+ NotifPromoter promoter = findPromoter(entry);
+
+ if (promoter != entry.mNotifPromoter) {
+ if (entry.mNotifPromoter == null) {
+ Log.i(TAG, String.format(
+ "%s: Entry promoted to top level by '%s'",
+ entry.getKey(),
+ promoter.getName()));
+ } else if (promoter == null) {
+ Log.i(TAG, String.format(
+ "%s: Entry is no longer promoted to top level (previous promoter was '%s')",
+ entry.getKey(),
+ entry.mNotifPromoter.getName()));
+ } else {
+ Log.i(TAG, String.format(
+ "%s: Top-level promoter changed: '%s' -> '%s'",
+ entry.getKey(),
+ entry.mNotifPromoter,
+ promoter));
+ }
+
+ entry.mNotifPromoter = promoter;
+ }
+
+ return promoter != null;
+ }
+
+ @Nullable private NotifPromoter findPromoter(NotificationEntry entry) {
+ for (int i = 0; i < mNotifPromoters.size(); i++) {
+ NotifPromoter promoter = mNotifPromoters.get(i);
+ if (promoter.shouldPromoteToTopLevel(entry)) {
+ return promoter;
+ }
+ }
+ return null;
+ }
+
+ private void rebuildListIfBefore(@PipelineState.StateName int state) {
+ mPipelineState.requireIsBefore(state);
+ if (mPipelineState.is(STATE_IDLE)) {
+ buildList();
+ }
+ }
+
+ private void dispatchOnBeforeTransformGroups(
+ List<ListEntry> entries,
+ List<ListEntry> newlyVisibleEntries) {
+ for (int i = 0; i < mOnBeforeTransformGroupsListeners.size(); i++) {
+ mOnBeforeTransformGroupsListeners.get(i)
+ .onBeforeTransformGroups(entries, newlyVisibleEntries);
+ }
+ }
+
+ private void dispatchOnBeforeSort(List<ListEntry> entries) {
+ for (int i = 0; i < mOnBeforeSortListeners.size(); i++) {
+ mOnBeforeSortListeners.get(i).onBeforeSort(entries);
+ }
+ }
+
+ private void dispatchOnBeforeRenderList(List<ListEntry> entries) {
+ for (int i = 0; i < mOnBeforeRenderListListeners.size(); i++) {
+ mOnBeforeRenderListListeners.get(i).onBeforeRenderList(entries);
+ }
+ }
+
+ /** See {@link #setOnRenderListListener(OnRenderListListener)} */
+ public interface OnRenderListListener {
+ /**
+ * Called with the final filtered, grouped, and sorted list.
+ *
+ * @param entries A read-only view into the current notif list. Note that this list is
+ * backed by the live list and will change in response to new pipeline runs.
+ */
+ void onRenderList(List<ListEntry> entries);
+ }
+
+ private static class DefaultSectionsProvider extends SectionsProvider {
+ DefaultSectionsProvider() {
+ super("DefaultSectionsProvider");
+ }
+
+ @Override
+ public int getSection(ListEntry entry) {
+ return 0;
+ }
+ }
+
+ private static final String TAG = "NotifListBuilderImpl";
+
+ private static final int MIN_CHILDREN_FOR_GROUP = 2;
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java
deleted file mode 100644
index a0229d1..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.notification.collection;
-
-import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_ALERTING;
-import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_PEOPLE;
-import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_SILENT;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.Person;
-import android.service.notification.NotificationListenerService.Ranking;
-import android.service.notification.NotificationListenerService.RankingMap;
-import android.service.notification.SnoozeCriterion;
-import android.service.notification.StatusBarNotification;
-import android.util.ArrayMap;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.systemui.Dependency;
-import com.android.systemui.statusbar.NotificationMediaManager;
-import com.android.systemui.statusbar.notification.NotificationFilter;
-import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager;
-import com.android.systemui.statusbar.notification.logging.NotifEvent;
-import com.android.systemui.statusbar.notification.logging.NotifLog;
-import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier;
-import com.android.systemui.statusbar.phone.NotificationGroupManager;
-import com.android.systemui.statusbar.policy.HeadsUpManager;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-/**
- * The list of currently displaying notifications.
- */
-public class NotificationData {
- private static final String TAG = "NotificationData";
-
- private final NotificationFilter mNotificationFilter = Dependency.get(NotificationFilter.class);
-
- /**
- * These dependencies are late init-ed
- */
- private KeyguardEnvironment mEnvironment;
- private NotificationMediaManager mMediaManager;
-
- private HeadsUpManager mHeadsUpManager;
-
- private final ArrayMap<String, NotificationEntry> mEntries = new ArrayMap<>();
- private final ArrayList<NotificationEntry> mSortedAndFiltered = new ArrayList<>();
-
- private final NotificationGroupManager mGroupManager =
- Dependency.get(NotificationGroupManager.class);
-
- private RankingMap mRankingMap;
- private final Ranking mTmpRanking = new Ranking();
- private final boolean mUsePeopleFiltering;
- private final NotifLog mNotifLog;
- private final PeopleNotificationIdentifier mPeopleNotificationIdentifier;
-
- @Inject
- public NotificationData(
- NotificationSectionsFeatureManager sectionsFeatureManager,
- NotifLog notifLog,
- PeopleNotificationIdentifier peopleNotificationIdentifier) {
- mUsePeopleFiltering = sectionsFeatureManager.isFilteringEnabled();
- mNotifLog = notifLog;
- mPeopleNotificationIdentifier = peopleNotificationIdentifier;
- }
-
- public void setHeadsUpManager(HeadsUpManager headsUpManager) {
- mHeadsUpManager = headsUpManager;
- }
-
- @VisibleForTesting
- protected final Comparator<NotificationEntry> mRankingComparator =
- new Comparator<NotificationEntry>() {
- @Override
- public int compare(NotificationEntry a, NotificationEntry b) {
- final StatusBarNotification na = a.getSbn();
- final StatusBarNotification nb = b.getSbn();
- int aRank = getRank(a.getKey());
- int bRank = getRank(b.getKey());
-
- boolean aPeople = isPeopleNotification(a);
- boolean bPeople = isPeopleNotification(b);
-
- boolean aMedia = isImportantMedia(a);
- boolean bMedia = isImportantMedia(b);
-
- boolean aSystemMax = isSystemMax(a);
- boolean bSystemMax = isSystemMax(b);
-
- boolean aHeadsUp = a.isRowHeadsUp();
- boolean bHeadsUp = b.isRowHeadsUp();
-
- if (mUsePeopleFiltering && aPeople != bPeople) {
- return aPeople ? -1 : 1;
- } else if (aHeadsUp != bHeadsUp) {
- return aHeadsUp ? -1 : 1;
- } else if (aHeadsUp) {
- // Provide consistent ranking with headsUpManager
- return mHeadsUpManager.compare(a, b);
- } else if (aMedia != bMedia) {
- // Upsort current media notification.
- return aMedia ? -1 : 1;
- } else if (aSystemMax != bSystemMax) {
- // Upsort PRIORITY_MAX system notifications
- return aSystemMax ? -1 : 1;
- } else if (a.isHighPriority() != b.isHighPriority()) {
- return -1 * Boolean.compare(a.isHighPriority(), b.isHighPriority());
- } else if (aRank != bRank) {
- return aRank - bRank;
- } else {
- return Long.compare(nb.getNotification().when, na.getNotification().when);
- }
- }
- };
-
- private KeyguardEnvironment getEnvironment() {
- if (mEnvironment == null) {
- mEnvironment = Dependency.get(KeyguardEnvironment.class);
- }
- return mEnvironment;
- }
-
- private NotificationMediaManager getMediaManager() {
- if (mMediaManager == null) {
- mMediaManager = Dependency.get(NotificationMediaManager.class);
- }
- return mMediaManager;
- }
-
- /**
- * Returns the sorted list of active notifications (depending on {@link KeyguardEnvironment}
- *
- * <p>
- * This call doesn't update the list of active notifications. Call {@link #filterAndSort()}
- * when the environment changes.
- * <p>
- * Don't hold on to or modify the returned list.
- */
- public ArrayList<NotificationEntry> getActiveNotifications() {
- return mSortedAndFiltered;
- }
-
- public ArrayList<NotificationEntry> getNotificationsForCurrentUser() {
- synchronized (mEntries) {
- final int len = mEntries.size();
- ArrayList<NotificationEntry> filteredForUser = new ArrayList<>(len);
-
- for (int i = 0; i < len; i++) {
- NotificationEntry entry = mEntries.valueAt(i);
- final StatusBarNotification sbn = entry.getSbn();
- if (!getEnvironment().isNotificationForCurrentProfiles(sbn)) {
- continue;
- }
- filteredForUser.add(entry);
- }
- return filteredForUser;
- }
- }
-
- public NotificationEntry get(String key) {
- return mEntries.get(key);
- }
-
- public void add(NotificationEntry entry) {
- synchronized (mEntries) {
- mEntries.put(entry.getSbn().getKey(), entry);
- }
- mGroupManager.onEntryAdded(entry);
-
- updateRankingAndSort(mRankingMap, "addEntry=" + entry.getSbn());
- }
-
- public NotificationEntry remove(String key, RankingMap ranking) {
- NotificationEntry removed;
- synchronized (mEntries) {
- removed = mEntries.remove(key);
- }
- if (removed == null) return null;
- mGroupManager.onEntryRemoved(removed);
- updateRankingAndSort(ranking, "removeEntry=" + removed.getSbn());
- return removed;
- }
-
- /** Updates the given notification entry with the provided ranking. */
- public void update(
- NotificationEntry entry,
- RankingMap ranking,
- StatusBarNotification notification,
- String reason) {
- updateRanking(ranking, reason);
- final StatusBarNotification oldNotification = entry.getSbn();
- entry.setSbn(notification);
- mGroupManager.onEntryUpdated(entry, oldNotification);
- }
-
- /**
- * Update ranking and trigger a re-sort
- */
- public void updateRanking(RankingMap ranking, String reason) {
- updateRankingAndSort(ranking, reason);
- }
-
- /**
- * Returns true if this notification should be displayed in the high-priority notifications
- * section
- */
- public boolean isHighPriority(StatusBarNotification statusBarNotification) {
- if (mRankingMap != null) {
- getRanking(statusBarNotification.getKey(), mTmpRanking);
- if (mTmpRanking.getImportance() >= NotificationManager.IMPORTANCE_DEFAULT
- || hasHighPriorityCharacteristics(
- mTmpRanking.getChannel(), statusBarNotification)) {
- return true;
- }
- if (mGroupManager.isSummaryOfGroup(statusBarNotification)) {
- final ArrayList<NotificationEntry> logicalChildren =
- mGroupManager.getLogicalChildren(statusBarNotification);
- for (NotificationEntry child : logicalChildren) {
- if (isHighPriority(child.getSbn())) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- private boolean hasHighPriorityCharacteristics(NotificationChannel channel,
- StatusBarNotification statusBarNotification) {
-
- if (isImportantOngoing(statusBarNotification.getNotification())
- || statusBarNotification.getNotification().hasMediaSession()
- || hasPerson(statusBarNotification.getNotification())
- || hasStyle(statusBarNotification.getNotification(),
- Notification.MessagingStyle.class)) {
- // Users who have long pressed and demoted to silent should not see the notification
- // in the top section
- if (channel != null && channel.hasUserSetImportance()) {
- return false;
- }
- return true;
- }
-
- return false;
- }
-
- private boolean isImportantOngoing(Notification notification) {
- return notification.isForegroundService()
- && mTmpRanking.getImportance() >= NotificationManager.IMPORTANCE_LOW;
- }
-
- private boolean hasStyle(Notification notification, Class targetStyle) {
- Class<? extends Notification.Style> style = notification.getNotificationStyle();
- return targetStyle.equals(style);
- }
-
- private boolean hasPerson(Notification notification) {
- // TODO: cache favorite and recent contacts to check contact affinity
- ArrayList<Person> people = notification.extras != null
- ? notification.extras.getParcelableArrayList(Notification.EXTRA_PEOPLE_LIST)
- : new ArrayList<>();
- return people != null && !people.isEmpty();
- }
-
- public boolean isAmbient(String key) {
- if (mRankingMap != null) {
- getRanking(key, mTmpRanking);
- return mTmpRanking.isAmbient();
- }
- return false;
- }
-
- public int getVisibilityOverride(String key) {
- if (mRankingMap != null) {
- getRanking(key, mTmpRanking);
- return mTmpRanking.getVisibilityOverride();
- }
- return Ranking.VISIBILITY_NO_OVERRIDE;
- }
-
- public List<SnoozeCriterion> getSnoozeCriteria(String key) {
- if (mRankingMap != null) {
- getRanking(key, mTmpRanking);
- return mTmpRanking.getSnoozeCriteria();
- }
- return null;
- }
-
- public NotificationChannel getChannel(String key) {
- if (mRankingMap != null) {
- getRanking(key, mTmpRanking);
- return mTmpRanking.getChannel();
- }
- return null;
- }
-
- public int getRank(String key) {
- if (mRankingMap != null) {
- getRanking(key, mTmpRanking);
- return mTmpRanking.getRank();
- }
- return 0;
- }
-
- private boolean isImportantMedia(NotificationEntry e) {
- int importance = e.getRanking().getImportance();
- boolean media = e.getKey().equals(getMediaManager().getMediaNotificationKey())
- && importance > NotificationManager.IMPORTANCE_MIN;
-
- return media;
- }
-
- private boolean isSystemMax(NotificationEntry e) {
- int importance = e.getRanking().getImportance();
- boolean sys = importance >= NotificationManager.IMPORTANCE_HIGH
- && isSystemNotification(e.getSbn());
-
- return sys;
- }
-
- public boolean shouldHide(String key) {
- if (mRankingMap != null) {
- getRanking(key, mTmpRanking);
- return mTmpRanking.isSuspended();
- }
- return false;
- }
-
- private void updateRankingAndSort(RankingMap rankingMap, String reason) {
- if (rankingMap != null) {
- mRankingMap = rankingMap;
- synchronized (mEntries) {
- final int len = mEntries.size();
- for (int i = 0; i < len; i++) {
- NotificationEntry entry = mEntries.valueAt(i);
- Ranking newRanking = new Ranking();
- if (!getRanking(entry.getKey(), newRanking)) {
- continue;
- }
- entry.setRanking(newRanking);
-
- final StatusBarNotification oldSbn = entry.getSbn().cloneLight();
- final String overrideGroupKey = newRanking.getOverrideGroupKey();
- if (!Objects.equals(oldSbn.getOverrideGroupKey(), overrideGroupKey)) {
- entry.getSbn().setOverrideGroupKey(overrideGroupKey);
- mGroupManager.onEntryUpdated(entry, oldSbn);
- }
- entry.setIsHighPriority(isHighPriority(entry.getSbn()));
- }
- }
- }
- filterAndSort(reason);
- }
-
- /**
- * 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.
- /**
- * Filters and sorts the list of notification entries
- */
- public void filterAndSort(String reason) {
- mNotifLog.log(NotifEvent.FILTER_AND_SORT, reason);
- mSortedAndFiltered.clear();
-
- synchronized (mEntries) {
- final int len = mEntries.size();
- for (int i = 0; i < len; i++) {
- NotificationEntry entry = mEntries.valueAt(i);
-
- if (mNotificationFilter.shouldFilterOut(entry)) {
- continue;
- }
-
- mSortedAndFiltered.add(entry);
- }
- }
-
- Collections.sort(mSortedAndFiltered, mRankingComparator);
-
- int bucket = BUCKET_PEOPLE;
- for (NotificationEntry e : mSortedAndFiltered) {
- assignBucketForEntry(e);
- if (e.getBucket() < bucket) {
- android.util.Log.wtf(TAG, "Detected non-contiguous bucket!");
- }
- bucket = e.getBucket();
- }
- }
-
- private void assignBucketForEntry(NotificationEntry e) {
- boolean isHeadsUp = e.isRowHeadsUp();
- boolean isMedia = isImportantMedia(e);
- boolean isSystemMax = isSystemMax(e);
-
- setBucket(e, isHeadsUp, isMedia, isSystemMax);
- }
-
- private void setBucket(
- NotificationEntry e,
- boolean isHeadsUp,
- boolean isMedia,
- boolean isSystemMax) {
- if (mUsePeopleFiltering && isPeopleNotification(e)) {
- e.setBucket(BUCKET_PEOPLE);
- } else if (isHeadsUp || isMedia || isSystemMax || e.isHighPriority()) {
- e.setBucket(BUCKET_ALERTING);
- } else {
- e.setBucket(BUCKET_SILENT);
- }
- }
-
- private boolean isPeopleNotification(NotificationEntry e) {
- return mPeopleNotificationIdentifier.isPeopleNotification(e.getSbn());
- }
-
- public void dump(PrintWriter pw, String indent) {
- int filteredLen = mSortedAndFiltered.size();
- pw.print(indent);
- pw.println("active notifications: " + filteredLen);
- int active;
- for (active = 0; active < filteredLen; active++) {
- NotificationEntry e = mSortedAndFiltered.get(active);
- dumpEntry(pw, indent, active, e);
- }
- synchronized (mEntries) {
- int totalLen = mEntries.size();
- pw.print(indent);
- pw.println("inactive notifications: " + (totalLen - active));
- int inactiveCount = 0;
- for (int i = 0; i < totalLen; i++) {
- NotificationEntry entry = mEntries.valueAt(i);
- if (!mSortedAndFiltered.contains(entry)) {
- dumpEntry(pw, indent, inactiveCount, entry);
- inactiveCount++;
- }
- }
- }
- }
-
- private void dumpEntry(PrintWriter pw, String indent, int i, NotificationEntry e) {
- getRanking(e.getKey(), mTmpRanking);
- pw.print(indent);
- pw.println(" [" + i + "] key=" + e.getKey() + " icon=" + e.icon);
- StatusBarNotification n = e.getSbn();
- pw.print(indent);
- pw.println(" pkg=" + n.getPackageName() + " id=" + n.getId() + " importance="
- + mTmpRanking.getImportance());
- pw.print(indent);
- pw.println(" notification=" + n.getNotification());
- }
-
- private static boolean isSystemNotification(StatusBarNotification sbn) {
- String sbnPackage = sbn.getPackageName();
- return "android".equals(sbnPackage) || "com.android.systemui".equals(sbnPackage);
- }
-
- /**
- * Provides access to keyguard state and user settings dependent data.
- */
- public interface KeyguardEnvironment {
- boolean isDeviceProvisioned();
- boolean isNotificationForCurrentProfiles(StatusBarNotification sbn);
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
index 28ccaf5..3eb55ef 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
@@ -60,6 +60,8 @@
import com.android.systemui.statusbar.InflationTask;
import com.android.systemui.statusbar.StatusBarIconView;
import com.android.systemui.statusbar.notification.InflationException;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;
import com.android.systemui.statusbar.notification.row.NotificationGuts;
@@ -84,7 +86,7 @@
* At the moment, there are many things here that shouldn't be and vice-versa. Hopefully we can
* clean this up in the future.
*/
-public final class NotificationEntry {
+public final class NotificationEntry extends ListEntry {
private final String mKey;
private StatusBarNotification mSbn;
@@ -98,6 +100,12 @@
/** List of lifetime extenders that are extending the lifetime of this notification. */
final List<NotifLifetimeExtender> mLifetimeExtenders = new ArrayList<>();
+ /** If this notification was filtered out, then the filter that did the filtering. */
+ @Nullable NotifFilter mExcludingFilter;
+
+ /** If this was a group child that was promoted to the top level, then who did the promoting. */
+ @Nullable NotifPromoter mNotifPromoter;
+
/*
* Old members
@@ -164,8 +172,8 @@
public NotificationEntry(
@NonNull StatusBarNotification sbn,
@NonNull Ranking ranking) {
- checkNotNull(sbn);
- checkNotNull(sbn.getKey());
+ super(checkNotNull(checkNotNull(sbn).getKey()));
+
checkNotNull(ranking);
mKey = sbn.getKey();
@@ -173,6 +181,11 @@
setRanking(ranking);
}
+ @Override
+ public NotificationEntry getRepresentativeEntry() {
+ return this;
+ }
+
/** The key for this notification. Guaranteed to be immutable and unique */
public String getKey() {
return mKey;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManager.kt
new file mode 100644
index 0000000..8bce528
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManager.kt
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection
+
+import android.app.Notification
+import android.app.NotificationManager.IMPORTANCE_DEFAULT
+import android.app.NotificationManager.IMPORTANCE_HIGH
+import android.app.NotificationManager.IMPORTANCE_LOW
+import android.app.NotificationManager.IMPORTANCE_MIN
+import android.app.Person
+import android.service.notification.NotificationListenerService.Ranking
+import android.service.notification.NotificationListenerService.RankingMap
+import android.service.notification.StatusBarNotification
+import com.android.internal.annotations.VisibleForTesting
+
+import com.android.systemui.statusbar.NotificationMediaManager
+import com.android.systemui.statusbar.notification.NotificationFilter
+import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager
+import com.android.systemui.statusbar.notification.logging.NotifEvent
+import com.android.systemui.statusbar.notification.logging.NotifLog
+import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_ALERTING
+import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_PEOPLE
+import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_SILENT
+import com.android.systemui.statusbar.phone.NotificationGroupManager
+import com.android.systemui.statusbar.policy.HeadsUpManager
+
+import java.util.Objects
+import java.util.ArrayList
+
+import javax.inject.Inject
+
+import kotlin.Comparator
+
+import dagger.Lazy
+
+private const val TAG = "NotifRankingManager"
+
+/**
+ * NotificationRankingManager is responsible for holding on to the most recent [RankingMap], and
+ * updating SystemUI's set of [NotificationEntry]s with their own ranking. It also sorts and filters
+ * a set of entries (but retains none of them). We also set buckets on the entries here since
+ * bucketing is tied closely to sorting.
+ *
+ * For the curious: this class is one iteration closer to null of what used to be called
+ * NotificationData.java.
+ */
+open class NotificationRankingManager @Inject constructor(
+ private val mediaManagerLazy: Lazy<NotificationMediaManager>,
+ private val groupManager: NotificationGroupManager,
+ private val headsUpManager: HeadsUpManager,
+ private val notifFilter: NotificationFilter,
+ private val notifLog: NotifLog,
+ sectionsFeatureManager: NotificationSectionsFeatureManager
+) {
+
+ var rankingMap: RankingMap? = null
+ protected set
+ private val mediaManager by lazy {
+ mediaManagerLazy.get()
+ }
+ private val usePeopleFiltering: Boolean = sectionsFeatureManager.isFilteringEnabled()
+ private val rankingComparator: Comparator<NotificationEntry> = Comparator { a, b ->
+ val na = a.sbn
+ val nb = b.sbn
+ val aRank = a.ranking.rank
+ val bRank = b.ranking.rank
+
+ val aMedia = isImportantMedia(a)
+ val bMedia = isImportantMedia(b)
+
+ val aSystemMax = a.isSystemMax()
+ val bSystemMax = b.isSystemMax()
+
+ val aHeadsUp = a.isRowHeadsUp
+ val bHeadsUp = b.isRowHeadsUp
+
+ if (usePeopleFiltering && a.isPeopleNotification() != b.isPeopleNotification()) {
+ if (a.isPeopleNotification()) -1 else 1
+ } else if (aHeadsUp != bHeadsUp) {
+ if (aHeadsUp) -1 else 1
+ } else if (aHeadsUp) {
+ // Provide consistent ranking with headsUpManager
+ headsUpManager.compare(a, b)
+ } else if (aMedia != bMedia) {
+ // Upsort current media notification.
+ if (aMedia) -1 else 1
+ } else if (aSystemMax != bSystemMax) {
+ // Upsort PRIORITY_MAX system notifications
+ if (aSystemMax) -1 else 1
+ } else if (a.isHighPriority != b.isHighPriority) {
+ -1 * java.lang.Boolean.compare(a.isHighPriority, b.isHighPriority)
+ } else if (aRank != bRank) {
+ aRank - bRank
+ } else {
+ nb.notification.`when`.compareTo(na.notification.`when`)
+ }
+ }
+
+ private fun isImportantMedia(entry: NotificationEntry): Boolean {
+ val importance = entry.ranking.importance
+ return entry.key == mediaManager.mediaNotificationKey && importance > IMPORTANCE_MIN
+ }
+
+ @VisibleForTesting
+ protected fun isHighPriority(entry: NotificationEntry): Boolean {
+ if (entry.importance >= IMPORTANCE_DEFAULT ||
+ hasHighPriorityCharacteristics(entry)) {
+ return true
+ }
+
+ if (groupManager.isSummaryOfGroup(entry.sbn)) {
+ val logicalChildren = groupManager.getLogicalChildren(entry.sbn)
+ for (child in logicalChildren) {
+ if (isHighPriority(child)) {
+ return true
+ }
+ }
+ }
+
+ return false
+ }
+
+ private fun hasHighPriorityCharacteristics(entry: NotificationEntry): Boolean {
+ val c = entry.channel
+ val n = entry.sbn.notification
+
+ if (((n.isForegroundService && entry.ranking.importance >= IMPORTANCE_LOW) ||
+ n.hasMediaSession() ||
+ n.hasPerson() ||
+ n.hasStyle(Notification.MessagingStyle::class.java))) {
+ // Users who have long pressed and demoted to silent should not see the notification
+ // in the top section
+ if (c != null && c.hasUserSetImportance()) {
+ return false
+ }
+
+ return true
+ }
+
+ return false
+ }
+
+ fun updateRanking(
+ newRankingMap: RankingMap?,
+ entries: Collection<NotificationEntry>,
+ reason: String
+ ): List<NotificationEntry> {
+ val eSeq = entries.asSequence()
+
+ // TODO: may not be ideal to guard on null here, but this code is implementing exactly what
+ // NotificationData used to do
+ if (newRankingMap != null) {
+ rankingMap = newRankingMap
+ updateRankingForEntries(eSeq)
+ }
+
+ val filtered: Sequence<NotificationEntry>
+ synchronized(this) {
+ filtered = filterAndSortLocked(eSeq, reason)
+ }
+
+ return filtered.toList()
+ }
+
+ /** Uses the [rankingComparator] to sort notifications which aren't filtered */
+ private fun filterAndSortLocked(
+ entries: Sequence<NotificationEntry>,
+ reason: String
+ ): Sequence<NotificationEntry> {
+ notifLog.log(NotifEvent.FILTER_AND_SORT, reason)
+
+ return entries.filter { !notifFilter.shouldFilterOut(it) }
+ .sortedWith(rankingComparator)
+ .map {
+ assignBucketForEntry(it)
+ it
+ }
+ }
+
+ private fun assignBucketForEntry(entry: NotificationEntry) {
+ val isHeadsUp = entry.isRowHeadsUp
+ val isMedia = isImportantMedia(entry)
+ val isSystemMax = entry.isSystemMax()
+ setBucket(entry, isHeadsUp, isMedia, isSystemMax)
+ }
+
+ private fun setBucket(
+ entry: NotificationEntry,
+ isHeadsUp: Boolean,
+ isMedia: Boolean,
+ isSystemMax: Boolean
+ ) {
+ if (usePeopleFiltering && entry.hasAssociatedPeople()) {
+ entry.bucket = BUCKET_PEOPLE
+ } else if (isHeadsUp || isMedia || isSystemMax || entry.isHighPriority) {
+ entry.bucket = BUCKET_ALERTING
+ } else {
+ entry.bucket = BUCKET_SILENT
+ }
+ }
+
+ private fun updateRankingForEntries(entries: Sequence<NotificationEntry>) {
+ rankingMap?.let { rankingMap ->
+ synchronized(entries) {
+ entries.forEach { entry ->
+ val newRanking = Ranking()
+ if (!rankingMap.getRanking(entry.key, newRanking)) {
+ return@forEach
+ }
+ entry.ranking = newRanking
+
+ val oldSbn = entry.sbn.cloneLight()
+ val newOverrideGroupKey = newRanking.overrideGroupKey
+ if (!Objects.equals(oldSbn.overrideGroupKey, newOverrideGroupKey)) {
+ entry.sbn.overrideGroupKey = newOverrideGroupKey
+ // TODO: notify group manager here?
+ groupManager.onEntryUpdated(entry, oldSbn)
+ }
+ entry.setIsHighPriority(isHighPriority(entry))
+ }
+ }
+ }
+ }
+}
+
+// Convenience functions
+private fun NotificationEntry.isSystemMax(): Boolean {
+ return importance >= IMPORTANCE_HIGH && sbn.isSystemNotification()
+}
+
+private fun StatusBarNotification.isSystemNotification(): Boolean {
+ return "android" == packageName || "com.android.systemui" == packageName
+}
+
+private fun Notification.hasPerson(): Boolean {
+ val people: ArrayList<Person> =
+ (extras?.getParcelableArrayList(Notification.EXTRA_PEOPLE_LIST)) ?: ArrayList()
+ return people.isNotEmpty()
+}
+
+private fun Notification.hasStyle(targetStyleClass: Class<*>): Boolean {
+ return targetStyleClass == notificationStyle
+}
+
+private fun NotificationEntry.isPeopleNotification(): Boolean =
+ sbn.notification.hasStyle(Notification.MessagingStyle::class.java)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java
index 52fd079..1c0a9d4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java
@@ -32,7 +32,6 @@
import com.android.internal.util.NotificationMessagingUtil;
import com.android.systemui.Dependency;
import com.android.systemui.R;
-import com.android.systemui.UiOffloadThread;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
import com.android.systemui.statusbar.NotificationPresenter;
@@ -61,7 +60,6 @@
Dependency.get(NotificationGroupManager.class);
private final NotificationGutsManager mGutsManager =
Dependency.get(NotificationGutsManager.class);
- private final UiOffloadThread mUiOffloadThread = Dependency.get(UiOffloadThread.class);
private final NotificationInterruptionStateProvider mNotificationInterruptionStateProvider =
Dependency.get(NotificationInterruptionStateProvider.class);
@@ -81,16 +79,20 @@
private ExpandableNotificationRow.OnAppOpsClickListener mOnAppOpsClickListener;
private BindRowCallback mBindRowCallback;
private NotificationClicker mNotificationClicker;
- private final NotificationLogger mNotificationLogger = Dependency.get(NotificationLogger.class);
+ private final NotificationLogger mNotificationLogger;
- public NotificationRowBinderImpl(Context context, boolean allowLongPress,
+ public NotificationRowBinderImpl(
+ Context context,
+ boolean allowLongPress,
KeyguardBypassController keyguardBypassController,
- StatusBarStateController statusBarStateController) {
+ StatusBarStateController statusBarStateController,
+ NotificationLogger logger) {
mContext = context;
mMessagingUtil = new NotificationMessagingUtil(context);
mAllowLongPress = allowLongPress;
mKeyguardBypassController = keyguardBypassController;
mStatusBarStateController = statusBarStateController;
+ mNotificationLogger = logger;
}
private NotificationRemoteInputManager getRemoteInputManager() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/FakePipelineConsumer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/FakePipelineConsumer.java
new file mode 100644
index 0000000..986ee17
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/FakePipelineConsumer.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.init;
+
+import com.android.systemui.Dumpable;
+import com.android.systemui.statusbar.notification.collection.GroupEntry;
+import com.android.systemui.statusbar.notification.collection.ListEntry;
+import com.android.systemui.statusbar.notification.collection.NotifListBuilderImpl;
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Temporary class that tracks the result of the list builder and dumps it to text when requested.
+ *
+ * Eventually, this will be something that hands off the result of the pipeline to the View layer.
+ */
+public class FakePipelineConsumer implements Dumpable {
+ private List<ListEntry> mEntries = Collections.emptyList();
+
+ /** Attach the consumer to the pipeline. */
+ public void attach(NotifListBuilderImpl listBuilder) {
+ listBuilder.setOnRenderListListener(this::onBuildComplete);
+ }
+
+ private void onBuildComplete(List<ListEntry> entries) {
+ mEntries = entries;
+ }
+
+ @Override
+ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+ pw.println();
+ pw.println("Active notif tree:");
+ for (int i = 0; i < mEntries.size(); i++) {
+ ListEntry entry = mEntries.get(i);
+ if (entry instanceof GroupEntry) {
+ GroupEntry ge = (GroupEntry) entry;
+ pw.println(dumpGroup(ge, "", i));
+
+ pw.println(dumpEntry(ge.getSummary(), INDENT, -1));
+ for (int j = 0; j < ge.getChildren().size(); j++) {
+ pw.println(dumpEntry(ge.getChildren().get(j), INDENT, j));
+ }
+ } else {
+ pw.println(dumpEntry(entry.getRepresentativeEntry(), "", i));
+ }
+ }
+ }
+
+ private String dumpGroup(GroupEntry entry, String indent, int index) {
+ return String.format(
+ "%s[%d] %s (group)",
+ indent,
+ index,
+ entry.getKey());
+ }
+
+ private String dumpEntry(NotificationEntry entry, String indent, int index) {
+ return String.format(
+ "%s[%s] %s (channel=%s)",
+ indent,
+ index == -1 ? "*" : Integer.toString(index),
+ entry.getKey(),
+ entry.getChannel() != null ? entry.getChannel().getId() : "");
+ }
+
+ private static final String INDENT = " ";
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NewNotifPipeline.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NewNotifPipeline.java
new file mode 100644
index 0000000..3b3e7e2
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NewNotifPipeline.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.init;
+
+import android.util.Log;
+
+import com.android.systemui.DumpController;
+import com.android.systemui.Dumpable;
+import com.android.systemui.statusbar.NotificationListener;
+import com.android.systemui.statusbar.notification.collection.NotifCollection;
+import com.android.systemui.statusbar.notification.collection.NotifListBuilderImpl;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Initialization code for the new notification pipeline.
+ */
+@Singleton
+public class NewNotifPipeline implements Dumpable {
+ private final NotifCollection mNotifCollection;
+ private final NotifListBuilderImpl mNotifPipeline;
+ private final DumpController mDumpController;
+
+ private final FakePipelineConsumer mFakePipelineConsumer = new FakePipelineConsumer();
+
+ @Inject
+ public NewNotifPipeline(
+ NotifCollection notifCollection,
+ NotifListBuilderImpl notifPipeline,
+ DumpController dumpController) {
+ mNotifCollection = notifCollection;
+ mNotifPipeline = notifPipeline;
+ mDumpController = dumpController;
+ }
+
+ /** Hooks the new pipeline up to NotificationManager */
+ public void initialize(
+ NotificationListener notificationService) {
+ mFakePipelineConsumer.attach(mNotifPipeline);
+ mNotifPipeline.attach(mNotifCollection);
+ mNotifCollection.attach(notificationService);
+
+ Log.d(TAG, "Notif pipeline initialized");
+
+ mDumpController.registerDumpable("NotifPipeline", this);
+ }
+
+ @Override
+ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+ mFakePipelineConsumer.dump(fd, pw, args);
+ }
+
+ private static final String TAG = "NewNotifPipeline";
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/NotifListBuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/NotifListBuilder.java
new file mode 100644
index 0000000..15d3b92
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/NotifListBuilder.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder;
+
+import com.android.systemui.statusbar.notification.collection.ListEntry;
+import com.android.systemui.statusbar.notification.collection.NotifCollection;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.SectionsProvider;
+
+import java.util.List;
+
+/**
+ * The system that constructs the current "notification list", the list of notifications that are
+ * currently being displayed to the user.
+ *
+ * The pipeline proceeds through a series of stages in order to produce the final list (see below).
+ * Each stage exposes hooks and listeners for other code to participate.
+ *
+ * This list differs from the canonical one we receive from system server in a few ways:
+ * - Filtered: Some notifications are filtered out. For example, we filter out notifications whose
+ * views haven't been inflated yet. We also filter out some notifications if we're on the lock
+ * screen. To participate, see {@link #addFilter(NotifFilter)}.
+ * - Grouped: Notifications that are part of the same group are clustered together into a single
+ * GroupEntry. These groups are then transformed in order to remove children or completely split
+ * them apart. To participate, see {@link #addPromoter(NotifPromoter)}.
+ * - Sorted: All top-level notifications are sorted. To participate, see
+ * {@link #setSectionsProvider(SectionsProvider)} and {@link #setComparators(List)}
+ *
+ * The exact order of all hooks is as follows:
+ * 0. Collection listeners are fired (see {@link NotifCollection}).
+ * 1. NotifFilters are called on each notification currently in NotifCollection.
+ * 2. Initial grouping is performed (NotificationEntries will have their parents set
+ * appropriately).
+ * 3. OnBeforeTransformGroupListeners are fired
+ * 4. NotifPromoters are called on each notification with a parent
+ * 5. OnBeforeSortListeners are fired
+ * 6. SectionsProvider is called on each top-level entry in the list
+ * 7. The top-level entries are sorted using the provided NotifComparators (plus some additional
+ * built-in logic).
+ * 8. OnBeforeRenderListListeners are fired
+ * 9. The list is handed off to the view layer to be rendered.
+ */
+public interface NotifListBuilder {
+
+ /**
+ * Registers a filter with the pipeline. Filters are called on each notification in the order
+ * that they were registered. If any filter returns true, the notification is removed from the
+ * pipeline (and no other filters are called on that notif).
+ */
+ void addFilter(NotifFilter filter);
+
+ /**
+ * Registers a promoter with the pipeline. Promoters are able to promote child notifications to
+ * top-level, i.e. move a notification that would be a child of a group and make it appear
+ * ungrouped. Promoters are called on each child notification in the order that they are
+ * registered. If any promoter returns true, the notification is removed from the group (and no
+ * other promoters are called on it).
+ */
+ void addPromoter(NotifPromoter promoter);
+
+ /**
+ * Assigns sections to each top-level entry, where a section is simply an integer. Sections are
+ * the primary metric by which top-level entries are sorted; NotifComparators are only consulted
+ * when two entries are in the same section. The pipeline doesn't assign any particular meaning
+ * to section IDs -- from it's perspective they're just numbers and it sorts them by a simple
+ * numerical comparison.
+ */
+ void setSectionsProvider(SectionsProvider provider);
+
+ /**
+ * Comparators that are used to sort top-level entries that share the same section. The
+ * comparators are executed in order until one of them returns a non-zero result. If all return
+ * zero, the pipeline falls back to sorting by rank (and, failing that, Notification.when).
+ */
+ void setComparators(List<NotifComparator> comparators);
+
+ /**
+ * Called after notifications have been filtered and after the initial grouping has been
+ * performed but before NotifPromoters have had a chance to promote children out of groups.
+ */
+ void addOnBeforeTransformGroupsListener(OnBeforeTransformGroupsListener listener);
+
+ /**
+ * Called after notifs have been filtered and groups have been determined but before sections
+ * have been determined or the notifs have been sorted.
+ */
+ void addOnBeforeSortListener(OnBeforeSortListener listener);
+
+ /**
+ * Called at the end of the pipeline after the notif list has been finalized but before it has
+ * been handed off to the view layer.
+ */
+ void addOnBeforeRenderListListener(OnBeforeRenderListListener listener);
+
+ /**
+ * Returns a read-only view in to the current notification list. If this method is called
+ * during pipeline execution it will return the current state of the list, which will likely
+ * be only partially-generated.
+ */
+ List<ListEntry> getActiveNotifs();
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeRenderListListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeRenderListListener.java
new file mode 100644
index 0000000..f6ca12d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeRenderListListener.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder;
+
+import com.android.systemui.statusbar.notification.collection.ListEntry;
+
+import java.util.List;
+
+/** See {@link NotifListBuilder#addOnBeforeRenderListListener(OnBeforeRenderListListener)} */
+public interface OnBeforeRenderListListener {
+ /**
+ * Called at the end of the pipeline after the notif list has been finalized but before it has
+ * been handed off to the view layer.
+ *
+ * @param entries The current list of top-level entries. Note that this is a live view into the
+ * current list and will change whenever the pipeline is rerun.
+ */
+ void onBeforeRenderList(List<ListEntry> entries);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeSortListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeSortListener.java
new file mode 100644
index 0000000..7be7ac0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeSortListener.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder;
+
+import com.android.systemui.statusbar.notification.collection.ListEntry;
+
+import java.util.List;
+
+/** See {@link NotifListBuilder#addOnBeforeSortListener(OnBeforeSortListener)} */
+public interface OnBeforeSortListener {
+ /**
+ * Called after the notif list has been filtered and grouped but before sections have been
+ * determined or sorting has taken place.
+ *
+ * @param entries The current list of top-level entries. Note that this is a live view into the
+ * current list and will change whenever the pipeline is rerun.
+ */
+ void onBeforeSort(List<ListEntry> entries);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeTransformGroupsListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeTransformGroupsListener.java
new file mode 100644
index 0000000..170ff48
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/OnBeforeTransformGroupsListener.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder;
+
+import com.android.systemui.statusbar.notification.collection.ListEntry;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;
+
+import java.util.List;
+
+/**
+ * See
+ * {@link NotifListBuilder#addOnBeforeTransformGroupsListener(OnBeforeTransformGroupsListener)}
+ */
+public interface OnBeforeTransformGroupsListener {
+ /**
+ * Called after notifs have been filtered and grouped but before {@link NotifPromoter}s have
+ * been called.
+ *
+ * @param list The current filtered and grouped list of (top-level) entries. Note that this is
+ * a live view into the current notif list and will change as the list moves through
+ * the pipeline.
+ * @param newlyVisibleEntries The list of all entries (both top-level and children) who have
+ * been added to the list for the first time.
+ */
+ void onBeforeTransformGroups(List<ListEntry> list, List<ListEntry> newlyVisibleEntries);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/PipelineState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/PipelineState.java
new file mode 100644
index 0000000..ad4bbd9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/PipelineState.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder;
+
+import android.annotation.IntDef;
+
+import com.android.systemui.statusbar.notification.collection.NotifListBuilderImpl;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Used by {@link NotifListBuilderImpl} to track its internal state machine.
+ */
+public class PipelineState {
+
+ private @StateName int mState = STATE_IDLE;
+
+ /** Returns true if the current state matches <code>state</code> */
+ public boolean is(@StateName int state) {
+ return state == mState;
+ }
+
+ public @StateName int getState() {
+ return mState;
+ }
+
+ public void setState(@StateName int state) {
+ mState = state;
+ }
+
+ /**
+ * Increments the state from <code>(to - 1)</code> to <code>to</code>. If the current state
+ * isn't <code>(to - 1)</code>, throws an exception.
+ */
+ public void incrementTo(@StateName int to) {
+ if (mState != to - 1) {
+ throw new IllegalStateException(
+ "Cannot increment from state " + mState + " to state " + to);
+ }
+ mState = to;
+ }
+
+ /**
+ * Throws an exception if the current state is not <code>state</code>.
+ */
+ public void requireState(@StateName int state) {
+ if (state != mState) {
+ throw new IllegalStateException(
+ "Required state is <" + state + " but actual state is " + mState);
+ }
+ }
+
+ /**
+ * Throws an exception if the current state is >= <code>state</code>.
+ */
+ public void requireIsBefore(@StateName int state) {
+ if (mState >= state) {
+ throw new IllegalStateException(
+ "Required state is <" + state + " but actual state is " + mState);
+ }
+ }
+
+ public static final int STATE_IDLE = 0;
+ public static final int STATE_BUILD_PENDING = 1;
+ public static final int STATE_BUILD_STARTED = 2;
+ public static final int STATE_FILTERING = 3;
+ public static final int STATE_TRANSFORMING = 4;
+ public static final int STATE_SORTING = 5;
+ public static final int STATE_FINALIZING = 6;
+
+ @IntDef(prefix = { "STATE_" }, value = {
+ STATE_IDLE,
+ STATE_BUILD_PENDING,
+ STATE_BUILD_STARTED,
+ STATE_FILTERING,
+ STATE_TRANSFORMING,
+ STATE_SORTING,
+ STATE_FINALIZING,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface StateName {}
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifComparator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifComparator.java
new file mode 100644
index 0000000..a191c83
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifComparator.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder.pluggable;
+
+import com.android.systemui.statusbar.notification.collection.ListEntry;
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;
+
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Pluggable for participating in notif sorting. See {@link NotifListBuilder#setComparators(List)}.
+ */
+public abstract class NotifComparator
+ extends Pluggable<NotifComparator>
+ implements Comparator<ListEntry> {
+
+ protected NotifComparator(String name) {
+ super(name);
+ }
+
+ /**
+ * Compare two ListEntries. Note that these might be either NotificationEntries or GroupEntries.
+ *
+ * @return a negative integer, zero, or a positive integer as the first argument is less than
+ * equal to, or greater than the second (same as standard Comparator<> interface).
+ */
+ public abstract int compare(ListEntry o1, ListEntry o2);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifFilter.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifFilter.java
new file mode 100644
index 0000000..685eac8
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifFilter.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder.pluggable;
+
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;
+
+/**
+ * Pluggable for participating in notif filtering. See
+ * {@link NotifListBuilder#addFilter(NotifFilter)}.
+ */
+public abstract class NotifFilter extends Pluggable<NotifFilter> {
+ protected NotifFilter(String name) {
+ super(name);
+ }
+
+ /**
+ * If returns true, this notification will not be included in the final list displayed to the
+ * user. Filtering is performed on each active notification every time the pipeline is run.
+ * This doesn't necessarily mean that your filter will get called on every notification,
+ * however. If another filter returns true before yours, we'll skip straight to the next notif.
+ *
+ * @param entry The entry in question
+ * @param now A timestamp in SystemClock.uptimeMillis that represents "now" for the purposes of
+ * pipeline execution. This value will be the same for all pluggable calls made
+ * during this pipeline run, giving pluggables a stable concept of "now" to compare
+ * various entries against.
+ * @return True if the notif should be removed from the list
+ */
+ public abstract boolean shouldFilterOut(NotificationEntry entry, long now);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifPromoter.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifPromoter.java
new file mode 100644
index 0000000..84e16f4
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifPromoter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder.pluggable;
+
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;
+
+/**
+ * Pluggable for participating in notif promotion. Notif promoters can upgrade notifications
+ * from being children of a group to top-level notifications. See
+ * {@link NotifListBuilder#addPromoter(NotifPromoter)}.
+ */
+public abstract class NotifPromoter extends Pluggable<NotifPromoter> {
+ protected NotifPromoter(String name) {
+ super(name);
+ }
+
+ /**
+ * If true, the child will be removed from its parent and placed at the top level of the notif
+ * list. By the time this method is called, child.getParent() has been set, so you can
+ * examine it (or any other entries in the notif list) for extra information.
+ *
+ * This method is only called on notifs that are currently children of groups. This doesn't
+ * necessarily mean that your promoter will get called on every child notification, however. If
+ * another promoter returns true before yours, we'll skip straight to the next notif.
+ */
+ public abstract boolean shouldPromoteToTopLevel(NotificationEntry child);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/Pluggable.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/Pluggable.java
new file mode 100644
index 0000000..f9ce197
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/Pluggable.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder.pluggable;
+
+import android.annotation.Nullable;
+
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;
+
+/**
+ * Generic superclass for chunks of code that can plug into the {@link NotifListBuilder}.
+ *
+ * A pluggable is fundamentally three things:
+ * 1. A name (for debugging purposes)
+ * 2. The functionality that the pluggable provides to the pipeline (this is determined by the
+ * subclass).
+ * 3. A way for the pluggable to inform the pipeline that its state has changed and the pipeline
+ * should be rerun (in this case, the invalidate() method).
+ *
+ * @param <This> The type of the subclass. Subclasses should bind their own type here.
+ */
+public abstract class Pluggable<This> {
+ private final String mName;
+ @Nullable private PluggableListener<This> mListener;
+
+ Pluggable(String name) {
+ mName = name;
+ }
+
+ public final String getName() {
+ return mName;
+ }
+
+ /**
+ * Call this method when something has caused this pluggable's behavior to change. The pipeline
+ * will be re-run.
+ */
+ public final void invalidateList() {
+ if (mListener != null) {
+ mListener.onPluggableInvalidated((This) this);
+ }
+ }
+
+ /** Set a listener to be notified when a pluggable is invalidated. */
+ public void setInvalidationListener(PluggableListener<This> listener) {
+ mListener = listener;
+ }
+
+ /**
+ * Listener interface for when pluggables are invalidated.
+ *
+ * @param <T> The type of pluggable that is being listened to.
+ */
+ public interface PluggableListener<T> {
+ /** Called whenever {@link #invalidateList()} is called on this pluggable. */
+ void onPluggableInvalidated(T pluggable);
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/SectionsProvider.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/SectionsProvider.java
new file mode 100644
index 0000000..11ea850
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/SectionsProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection.listbuilder.pluggable;
+
+import com.android.systemui.statusbar.notification.collection.ListEntry;
+
+/**
+ * Interface for sorting notifications into "sections", such as a heads-upping section, people
+ * section, alerting section, silent section, etc.
+ */
+public abstract class SectionsProvider extends Pluggable<SectionsProvider> {
+
+ protected SectionsProvider(String name) {
+ super(name);
+ }
+
+ /**
+ * Returns the section that this entry belongs to. A section can be any non-negative integer.
+ * When entries are sorted, they are first sorted by section and then by any remainining
+ * comparators.
+ */
+ public abstract int getSection(ListEntry entry);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java
index 90c5502..77ccf19 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java
@@ -43,9 +43,9 @@
import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
import com.android.systemui.statusbar.policy.HeadsUpManager;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import javax.inject.Inject;
@@ -113,7 +113,7 @@
public void run() {
mLastVisibilityReportUptimeMs = SystemClock.uptimeMillis();
- // 1. Loop over mNotificationData entries:
+ // 1. Loop over active entries:
// A. Keep list of visible notifications.
// B. Keep list of previously hidden, now visible notifications.
// 2. Compute no-longer visible notifications by removing currently
@@ -121,8 +121,7 @@
// notifications.
// 3. Report newly visible and no-longer visible notifications.
// 4. Keep currently visible notifications for next report.
- ArrayList<NotificationEntry> activeNotifications = mEntryManager
- .getNotificationData().getActiveNotifications();
+ List<NotificationEntry> activeNotifications = mEntryManager.getVisibleNotifications();
int N = activeNotifications.size();
for (int i = 0; i < N; i++) {
NotificationEntry entry = activeNotifications.get(i);
@@ -403,7 +402,7 @@
*/
public void onExpansionChanged(String key, boolean isUserAction, boolean isExpanded) {
NotificationVisibility.NotificationLocation location =
- getNotificationLocation(mEntryManager.getNotificationData().get(key));
+ getNotificationLocation(mEntryManager.getActiveNotificationUnfiltered(key));
mExpansionStateLogger.onExpansionChanged(key, isUserAction, isExpanded, location);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index f0d07a7..9ac5b44 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -198,7 +198,6 @@
private String mLoggingKey;
private NotificationGuts mGuts;
private NotificationEntry mEntry;
- private StatusBarNotification mStatusBarNotification;
private String mAppName;
/**
@@ -261,10 +260,10 @@
@Override
public void onClick(View v) {
if (!shouldShowPublic() && (!mIsLowPriority || isExpanded())
- && mGroupManager.isSummaryOfGroup(mStatusBarNotification)) {
+ && mGroupManager.isSummaryOfGroup(mEntry.getSbn())) {
mGroupExpansionChanging = true;
- final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification);
- boolean nowExpanded = mGroupManager.toggleGroupExpansion(mStatusBarNotification);
+ final boolean wasExpanded = mGroupManager.isGroupExpanded(mEntry.getSbn());
+ boolean nowExpanded = mGroupManager.toggleGroupExpansion(mEntry.getSbn());
mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded);
MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER,
nowExpanded);
@@ -441,7 +440,6 @@
*/
public void setEntry(@NonNull NotificationEntry entry) {
mEntry = entry;
- mStatusBarNotification = entry.getSbn();
cacheIsSystemNotification();
}
@@ -516,7 +514,7 @@
*/
public boolean getIsNonblockable() {
boolean isNonblockable = Dependency.get(NotificationBlockingHelperManager.class)
- .isNonblockable(mStatusBarNotification.getPackageName(),
+ .isNonblockable(mEntry.getSbn().getPackageName(),
mEntry.getChannel().getId());
// If the SystemNotifAsyncTask hasn't finished running or retrieved a value, we'll try once
@@ -526,7 +524,7 @@
Log.d(TAG, "Retrieving isSystemNotification on main thread");
}
mSystemNotificationAsyncTask.cancel(true /* mayInterruptIfRunning */);
- mEntry.mIsSystemNotification = isSystemNotification(mContext, mStatusBarNotification);
+ mEntry.mIsSystemNotification = isSystemNotification(mContext, mEntry.getSbn());
}
isNonblockable |= mEntry.getChannel().isImportanceLockedByOEM();
@@ -547,11 +545,11 @@
for (NotificationContentView l : mLayouts) {
l.onNotificationUpdated(mEntry);
}
- mIsColorized = mStatusBarNotification.getNotification().isColorized();
+ mIsColorized = mEntry.getSbn().getNotification().isColorized();
mShowingPublicInitialized = false;
updateNotificationColor();
if (mMenuRow != null) {
- mMenuRow.onNotificationUpdated(mStatusBarNotification);
+ mMenuRow.onNotificationUpdated(mEntry.getSbn());
mMenuRow.setAppName(mAppName);
}
if (mIsSummaryWithChildren) {
@@ -583,7 +581,7 @@
/** Called when the notification's ranking was changed (but nothing else changed). */
public void onNotificationRankingUpdated() {
if (mMenuRow != null) {
- mMenuRow.onNotificationUpdated(mStatusBarNotification);
+ mMenuRow.onNotificationUpdated(mEntry.getSbn());
}
}
@@ -676,10 +674,6 @@
layout.setHeights(minHeight, headsUpHeight, mNotificationMaxHeight);
}
- public StatusBarNotification getStatusBarNotification() {
- return mStatusBarNotification;
- }
-
public NotificationEntry getEntry() {
return mEntry;
}
@@ -807,7 +801,7 @@
* @return whether this notification is the only child in the group summary
*/
public boolean isOnlyChildInGroup() {
- return mGroupManager.isOnlyChildInGroup(getStatusBarNotification());
+ return mGroupManager.isOnlyChildInGroup(mEntry.getSbn());
}
public ExpandableNotificationRow getNotificationParent() {
@@ -1181,7 +1175,7 @@
}
if (mMenuRow.getMenuView() == null) {
- mMenuRow.createMenu(this, mStatusBarNotification);
+ mMenuRow.createMenu(this, mEntry.getSbn());
mMenuRow.setAppName(mAppName);
FrameLayout.LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT);
@@ -1222,7 +1216,7 @@
if (oldMenu != null) {
int menuIndex = indexOfChild(oldMenu);
removeView(oldMenu);
- mMenuRow.createMenu(ExpandableNotificationRow.this, mStatusBarNotification);
+ mMenuRow.createMenu(ExpandableNotificationRow.this, mEntry.getSbn());
mMenuRow.setAppName(mAppName);
addView(mMenuRow.getMenuView(), menuIndex);
}
@@ -1230,7 +1224,7 @@
l.initView();
l.reInflateViews();
}
- mStatusBarNotification.clearPackageContext();
+ mEntry.getSbn().clearPackageContext();
mNotificationInflater.clearCachesAndReInflate();
}
@@ -1290,7 +1284,7 @@
== Configuration.UI_MODE_NIGHT_YES;
mNotificationColor = ContrastColorUtil.resolveContrastColor(mContext,
- getStatusBarNotification().getNotification().color,
+ mEntry.getSbn().getNotification().color,
getBackgroundColorWithoutTint(), nightMode);
}
@@ -1438,7 +1432,7 @@
public void performDismiss(boolean fromAccessibility) {
if (isOnlyChildInGroup()) {
NotificationEntry groupSummary =
- mGroupManager.getLogicalGroupSummary(getStatusBarNotification());
+ mGroupManager.getLogicalGroupSummary(mEntry.getSbn());
if (groupSummary.isClearable()) {
// If this is the only child in the group, dismiss the group, but don't try to show
// the blocking helper affordance!
@@ -2209,8 +2203,8 @@
getFalsingManager().setNotificationExpanded();
if (mIsSummaryWithChildren && !shouldShowPublic() && allowChildExpansion
&& !mChildrenContainer.showingAsLowPriority()) {
- final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification);
- mGroupManager.setGroupExpanded(mStatusBarNotification, userExpanded);
+ final boolean wasExpanded = mGroupManager.isGroupExpanded(mEntry.getSbn());
+ mGroupManager.setGroupExpanded(mEntry.getSbn(), userExpanded);
onExpansionChanged(true /* userAction */, wasExpanded);
return;
}
@@ -2356,7 +2350,7 @@
@Override
public boolean isGroupExpanded() {
- return mGroupManager.isGroupExpanded(mStatusBarNotification);
+ return mGroupManager.isGroupExpanded(mEntry.getSbn());
}
private void onChildrenCountChanged() {
@@ -2397,9 +2391,9 @@
for (int i = 0; i < numChildren; i++) {
final ExpandableNotificationRow childRow = childrenRows.get(i);
final NotificationChannel childChannel = childRow.getEntry().getChannel();
- final StatusBarNotification childSbn = childRow.getStatusBarNotification();
- if (childSbn.getUser().equals(mStatusBarNotification.getUser()) &&
- childSbn.getPackageName().equals(mStatusBarNotification.getPackageName())) {
+ final StatusBarNotification childSbn = childRow.getEntry().getSbn();
+ if (childSbn.getUser().equals(mEntry.getSbn().getUser())
+ && childSbn.getPackageName().equals(mEntry.getSbn().getPackageName())) {
channels.add(childChannel);
}
}
@@ -2593,7 +2587,7 @@
public void makeActionsVisibile() {
setUserExpanded(true, true);
if (isChildInGroup()) {
- mGroupManager.setGroupExpanded(mStatusBarNotification, true);
+ mGroupManager.setGroupExpanded(mEntry.getSbn(), true);
}
notifyHeightChanged(false /* needsAnimation */);
}
@@ -2890,7 +2884,7 @@
public void onExpandedByGesture(boolean userExpanded) {
int event = MetricsEvent.ACTION_NOTIFICATION_GESTURE_EXPANDER;
- if (mGroupManager.isSummaryOfGroup(getStatusBarNotification())) {
+ if (mGroupManager.isSummaryOfGroup(mEntry.getSbn())) {
event = MetricsEvent.ACTION_NOTIFICATION_GROUP_GESTURE_EXPANDER;
}
MetricsLogger.action(mContext, event, userExpanded);
@@ -2935,7 +2929,7 @@
private void onExpansionChanged(boolean userAction, boolean wasExpanded) {
boolean nowExpanded = isExpanded();
if (mIsSummaryWithChildren && (!mIsLowPriority || wasExpanded)) {
- nowExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification);
+ nowExpanded = mGroupManager.isGroupExpanded(mEntry.getSbn());
}
if (nowExpanded != wasExpanded) {
updateShelfIconColor();
@@ -3224,7 +3218,7 @@
@Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
super.dump(fd, pw, args);
- pw.println(" Notification: " + getStatusBarNotification().getKey());
+ pw.println(" Notification: " + mEntry.getKey());
pw.print(" visibility: " + getVisibility());
pw.print(", alpha: " + getAlpha());
pw.print(", translation: " + getTranslation());
@@ -3267,7 +3261,7 @@
@Override
protected Boolean doInBackground(Void... voids) {
- return isSystemNotification(mContext, mStatusBarNotification);
+ return isSystemNotification(mContext, mEntry.getSbn());
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java
index 37f63c9..7b758aa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java
@@ -166,7 +166,7 @@
}
private LogMaker getLogMaker() {
- return mBlockingHelperRow.getStatusBarNotification()
+ return mBlockingHelperRow.getEntry().getSbn()
.getLogMaker()
.setCategory(MetricsEvent.NOTIFICATION_BLOCKING_HELPER);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java
index a91a119..54dee8c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java
@@ -512,7 +512,7 @@
existingWrapper.onReinflated();
}
} catch (Exception e) {
- handleInflationError(runningInflations, e, row.getStatusBarNotification(), callback);
+ handleInflationError(runningInflations, e, row.getEntry().getSbn(), callback);
// Add a running inflation to make sure we don't trigger callbacks.
// Safe to do because only happens in tests.
runningInflations.put(inflationId, new CancellationSignal());
@@ -563,7 +563,7 @@
onViewApplied(newView);
} catch (Exception anotherException) {
runningInflations.remove(inflationId);
- handleInflationError(runningInflations, e, row.getStatusBarNotification(),
+ handleInflationError(runningInflations, e, row.getEntry().getSbn(),
callback);
}
}
@@ -838,7 +838,7 @@
private void handleError(Exception e) {
mRow.getEntry().onInflationTaskFinished();
- StatusBarNotification sbn = mRow.getStatusBarNotification();
+ StatusBarNotification sbn = mRow.getEntry().getSbn();
final String ident = sbn.getPackageName() + "/0x"
+ Integer.toHexString(sbn.getId());
Log.e(StatusBar.TAG, "couldn't inflate view for notification " + ident, e);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
index b12c76c..d1b9a87 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
@@ -1546,9 +1546,11 @@
}
if (mExpandedWrapper != null) {
mExpandedWrapper.setRemoved();
+ mMediaTransferManager.setRemoved(mExpandedChild);
}
if (mContractedWrapper != null) {
mContractedWrapper.setRemoved();
+ mMediaTransferManager.setRemoved(mContractedChild);
}
if (mHeadsUpWrapper != null) {
mHeadsUpWrapper.setRemoved();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
index f90e561..77c0a46 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
@@ -189,7 +189,7 @@
@VisibleForTesting
protected boolean bindGuts(final ExpandableNotificationRow row,
NotificationMenuRowPlugin.MenuItem item) {
- StatusBarNotification sbn = row.getStatusBarNotification();
+ StatusBarNotification sbn = row.getEntry().getSbn();
row.setGutsView(item);
row.setTag(sbn.getPackageName());
@@ -238,7 +238,7 @@
final ExpandableNotificationRow row,
NotificationSnooze notificationSnoozeView) {
NotificationGuts guts = row.getGuts();
- StatusBarNotification sbn = row.getStatusBarNotification();
+ StatusBarNotification sbn = row.getEntry().getSbn();
notificationSnoozeView.setSnoozeListener(mListContainer.getSwipeActionHelper());
notificationSnoozeView.setStatusBarNotification(sbn);
@@ -258,7 +258,7 @@
final ExpandableNotificationRow row,
AppOpsInfo appOpsInfoView) {
NotificationGuts guts = row.getGuts();
- StatusBarNotification sbn = row.getStatusBarNotification();
+ StatusBarNotification sbn = row.getEntry().getSbn();
UserHandle userHandle = sbn.getUser();
PackageManager pmUser = StatusBar.getPackageManagerForUser(mContext,
userHandle.getIdentifier());
@@ -284,7 +284,7 @@
final ExpandableNotificationRow row,
NotificationInfo notificationInfoView) throws Exception {
NotificationGuts guts = row.getGuts();
- StatusBarNotification sbn = row.getStatusBarNotification();
+ StatusBarNotification sbn = row.getEntry().getSbn();
String packageName = sbn.getPackageName();
// Settings link is only valid for notifications that specify a non-system user
NotificationInfo.OnSettingsClickListener onSettingsClick = null;
@@ -319,7 +319,7 @@
packageName,
row.getEntry().getChannel(),
row.getUniqueChannels(),
- sbn,
+ row.getEntry(),
mCheckSaveListener,
onSettingsClick,
onAppSettingsClick,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
index 148d83b..a9a4804 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
@@ -65,7 +65,10 @@
import com.android.systemui.Dependency;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
+import com.android.systemui.bubbles.BubbleController;
+import com.android.systemui.bubbles.BubbleExperimentConfig;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.logging.NotificationCounters;
import java.lang.annotation.Retention;
@@ -99,6 +102,7 @@
// standard controls
private static final int ACTION_ALERT = 5;
+ private TextView mBubbleDescriptionView;
private TextView mPriorityDescriptionView;
private TextView mSilentDescriptionView;
@@ -116,6 +120,7 @@
private Set<NotificationChannel> mUniqueChannelsInRow;
private NotificationChannel mSingleNotificationChannel;
private int mStartingChannelImportance;
+ private boolean mStartedAsBubble;
private boolean mWasShownHighPriority;
private boolean mPressedApply;
private boolean mPresentingChannelEditorDialog = false;
@@ -125,8 +130,15 @@
* level; non-null once the user takes an action which indicates an explicit preference.
*/
@Nullable private Integer mChosenImportance;
+ /**
+ * The last bubble setting chosen by the user. Null if the user has not chosen a bubble level;
+ * non-null once the user takes an action which indicates an explicit preference.
+ */
+ @Nullable private Boolean mChosenBubbleEnabled;
private boolean mIsSingleDefaultChannel;
private boolean mIsNonblockable;
+ private boolean mIsBubbleable;
+ private NotificationEntry mEntry;
private StatusBarNotification mSbn;
private AnimatorSet mExpandAnimation;
private boolean mIsDeviceProvisioned;
@@ -137,18 +149,27 @@
private NotificationGuts mGutsContainer;
private Drawable mPkgIcon;
+ private BubbleController mBubbleController;
+
/** Whether this view is being shown as part of the blocking helper. */
private boolean mIsForBlockingHelper;
+ @VisibleForTesting
+ boolean mSkipPost = false;
+
/**
* String that describes how the user exit or quit out of this view, also used as a counter tag.
*/
private String mExitReason = NotificationCounters.BLOCKING_HELPER_DISMISSED;
+
// used by standard ui
private OnClickListener mOnAlert = v -> {
mExitReason = NotificationCounters.BLOCKING_HELPER_KEEP_SHOWING;
mChosenImportance = IMPORTANCE_DEFAULT;
+ if (mStartedAsBubble) {
+ mChosenBubbleEnabled = false;
+ }
applyAlertingBehavior(BEHAVIOR_ALERTING, true /* userTriggered */);
};
@@ -156,9 +177,19 @@
private OnClickListener mOnSilent = v -> {
mExitReason = NotificationCounters.BLOCKING_HELPER_DELIVER_SILENTLY;
mChosenImportance = IMPORTANCE_LOW;
+ if (mStartedAsBubble) {
+ mChosenBubbleEnabled = false;
+ }
applyAlertingBehavior(BEHAVIOR_SILENT, true /* userTriggered */);
};
+ /** Used by standard ui (in an experiment) {@see BubbleExperimentConfig#allowNotifBubbleMenu} */
+ private OnClickListener mOnBubble = v -> {
+ mExitReason = NotificationCounters.BLOCKING_HELPER_KEEP_SHOWING;
+ mChosenBubbleEnabled = true;
+ applyAlertingBehavior(BEHAVIOR_BUBBLE, true /* userTriggered */);
+ };
+
// used by standard ui
private OnClickListener mOnDismissSettings = v -> {
mPressedApply = true;
@@ -224,6 +255,7 @@
protected void onFinishInflate() {
super.onFinishInflate();
+ mBubbleDescriptionView = findViewById(R.id.bubble_summary);
mPriorityDescriptionView = findViewById(R.id.alert_summary);
mSilentDescriptionView = findViewById(R.id.silence_summary);
}
@@ -251,7 +283,7 @@
final String pkg,
final NotificationChannel notificationChannel,
final Set<NotificationChannel> uniqueChannelsInRow,
- final StatusBarNotification sbn,
+ final NotificationEntry entry,
final CheckSaveListener checkSaveListener,
final OnSettingsClickListener onSettingsClick,
final OnAppSettingsClickListener onAppSettingsClick,
@@ -261,7 +293,7 @@
boolean wasShownHighPriority)
throws RemoteException {
bindNotification(pm, iNotificationManager, visualStabilityManager, pkg, notificationChannel,
- uniqueChannelsInRow, sbn, checkSaveListener, onSettingsClick,
+ uniqueChannelsInRow, entry, checkSaveListener, onSettingsClick,
onAppSettingsClick, isDeviceProvisioned, isNonblockable,
false /* isBlockingHelper */,
importance, wasShownHighPriority);
@@ -274,7 +306,7 @@
String pkg,
NotificationChannel notificationChannel,
Set<NotificationChannel> uniqueChannelsInRow,
- StatusBarNotification sbn,
+ NotificationEntry entry,
CheckSaveListener checkSaveListener,
OnSettingsClickListener onSettingsClick,
OnAppSettingsClickListener onAppSettingsClick,
@@ -288,10 +320,12 @@
mMetricsLogger = Dependency.get(MetricsLogger.class);
mVisualStabilityManager = visualStabilityManager;
mChannelEditorDialogController = Dependency.get(ChannelEditorDialogController.class);
+ mBubbleController = Dependency.get(BubbleController.class);
mPackageName = pkg;
mUniqueChannelsInRow = uniqueChannelsInRow;
mNumUniqueChannelsInRow = uniqueChannelsInRow.size();
- mSbn = sbn;
+ mEntry = entry;
+ mSbn = entry.getSbn();
mPm = pm;
mAppSettingsClickListener = onAppSettingsClick;
mAppName = mPackageName;
@@ -318,6 +352,9 @@
&& numTotalChannels == 1;
}
+ mIsBubbleable = mEntry.getBubbleMetadata() != null;
+ mStartedAsBubble = mEntry.isBubble();
+
bindHeader();
bindChannelDetails();
@@ -365,6 +402,7 @@
findViewById(R.id.non_configurable_text).setVisibility(GONE);
findViewById(R.id.non_configurable_multichannel_text).setVisibility(GONE);
findViewById(R.id.interruptiveness_settings).setVisibility(VISIBLE);
+ findViewById(R.id.bubble).setVisibility(mIsBubbleable ? VISIBLE : GONE);
}
View turnOffButton = findViewById(R.id.turn_off_notifications);
@@ -378,12 +416,17 @@
View silent = findViewById(R.id.silence);
View alert = findViewById(R.id.alert);
+ View bubble = findViewById(R.id.bubble);
silent.setOnClickListener(mOnSilent);
alert.setOnClickListener(mOnAlert);
+ bubble.setOnClickListener(mOnBubble);
- applyAlertingBehavior(
- mWasShownHighPriority ? BEHAVIOR_ALERTING : BEHAVIOR_SILENT,
- false /* userTriggered */);
+ int behavior = mStartedAsBubble
+ ? BEHAVIOR_BUBBLE
+ : mWasShownHighPriority
+ ? BEHAVIOR_ALERTING
+ : BEHAVIOR_SILENT;
+ applyAlertingBehavior(behavior, false /* userTriggered */);
}
private void bindHeader() {
@@ -544,6 +587,14 @@
}
}
+ if (mChosenBubbleEnabled != null && mStartedAsBubble != mChosenBubbleEnabled) {
+ if (mChosenBubbleEnabled) {
+ mBubbleController.onUserCreatedBubbleFromNotification(mEntry);
+ } else {
+ mBubbleController.onUserDemotedBubbleFromNotification(mEntry);
+ }
+ }
+
Handler bgHandler = new Handler(Dependency.get(Dependency.BG_LOOPER));
bgHandler.post(
new UpdateImportanceRunnable(mINotificationManager, mPackageName, mAppUid,
@@ -553,6 +604,16 @@
}
}
+ @Override
+ public boolean post(Runnable action) {
+ if (mSkipPost) {
+ action.run();
+ return true;
+ } else {
+ return super.post(action);
+ }
+ }
+
private void applyAlertingBehavior(@AlertingBehavior int behavior, boolean userTriggered) {
if (userTriggered) {
TransitionSet transition = new TransitionSet();
@@ -569,6 +630,7 @@
TransitionManager.beginDelayedTransition(this, transition);
}
+ View bubble = findViewById(R.id.bubble);
View alert = findViewById(R.id.alert);
View silence = findViewById(R.id.silence);
@@ -576,33 +638,53 @@
case BEHAVIOR_ALERTING:
mPriorityDescriptionView.setVisibility(VISIBLE);
mSilentDescriptionView.setVisibility(GONE);
+ mBubbleDescriptionView.setVisibility(GONE);
post(() -> {
alert.setSelected(true);
silence.setSelected(false);
+ bubble.setSelected(false);
});
break;
- case BEHAVIOR_SILENT:
+ case BEHAVIOR_SILENT:
mSilentDescriptionView.setVisibility(VISIBLE);
mPriorityDescriptionView.setVisibility(GONE);
+ mBubbleDescriptionView.setVisibility(GONE);
post(() -> {
alert.setSelected(false);
silence.setSelected(true);
+ bubble.setSelected(false);
});
break;
+
+ case BEHAVIOR_BUBBLE:
+ mBubbleDescriptionView.setVisibility(VISIBLE);
+ mSilentDescriptionView.setVisibility(GONE);
+ mPriorityDescriptionView.setVisibility(GONE);
+ post(() -> {
+ alert.setSelected(false);
+ silence.setSelected(false);
+ bubble.setSelected(true);
+ });
+ break;
+
default:
throw new IllegalArgumentException("Unrecognized alerting behavior: " + behavior);
}
boolean isAChange = mWasShownHighPriority != (behavior == BEHAVIOR_ALERTING);
+ boolean isABubbleChange = mStartedAsBubble != (behavior == BEHAVIOR_BUBBLE);
TextView done = findViewById(R.id.done);
- done.setText(isAChange ? R.string.inline_ok_button : R.string.inline_done_button);
+ done.setText((isAChange || isABubbleChange)
+ ? R.string.inline_ok_button
+ : R.string.inline_done_button);
}
private void saveImportanceAndExitReason(@NotificationInfoAction int action) {
switch (action) {
case ACTION_UNDO:
mChosenImportance = mStartingChannelImportance;
+ mChosenBubbleEnabled = mStartedAsBubble;
break;
case ACTION_DELIVER_SILENTLY:
mExitReason = NotificationCounters.BLOCKING_HELPER_DELIVER_SILENTLY;
@@ -685,6 +767,9 @@
if (mChosenImportance != null) {
mStartingChannelImportance = mChosenImportance;
}
+ if (mChosenBubbleEnabled != null) {
+ mStartedAsBubble = mChosenBubbleEnabled;
+ }
mExitReason = NotificationCounters.BLOCKING_HELPER_DISMISSED;
if (mIsForBlockingHelper) {
@@ -884,8 +969,9 @@
}
@Retention(SOURCE)
- @IntDef({BEHAVIOR_ALERTING, BEHAVIOR_SILENT})
+ @IntDef({BEHAVIOR_ALERTING, BEHAVIOR_SILENT, BEHAVIOR_BUBBLE})
private @interface AlertingBehavior {}
private static final int BEHAVIOR_ALERTING = 0;
private static final int BEHAVIOR_SILENT = 1;
+ private static final int BEHAVIOR_BUBBLE = 2;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigPictureTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigPictureTemplateViewWrapper.java
index 2da4d2c..7248bce 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigPictureTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigPictureTemplateViewWrapper.java
@@ -39,7 +39,7 @@
@Override
public void onContentUpdated(ExpandableNotificationRow row) {
super.onContentUpdated(row);
- updateImageTag(row.getStatusBarNotification());
+ updateImageTag(row.getEntry().getSbn());
}
private void updateImageTag(StatusBarNotification notification) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java
index 4261df3..41f93cc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationBigTextTemplateViewWrapper.java
@@ -44,7 +44,7 @@
public void onContentUpdated(ExpandableNotificationRow row) {
// Reinspect the notification. Before the super call, because the super call also updates
// the transformation types and we need to have our values set by then.
- resolveViews(row.getStatusBarNotification());
+ resolveViews(row.getEntry().getSbn());
super.onContentUpdated(row);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java
index 0b3871d..5e52c0a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java
@@ -125,7 +125,7 @@
updateTransformedTypes();
addRemainingTransformTypes();
updateCropToPaddingForImageViews();
- Notification notification = row.getStatusBarNotification().getNotification();
+ Notification notification = row.getEntry().getSbn().getNotification();
mIcon.setTag(ImageTransformState.ICON_TAG, notification.getSmallIcon());
// The work profile image is always the same lets just set the icon tag for it not to
// animate
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java
index d0122c2..2a4b315 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java
@@ -167,12 +167,6 @@
mContext = ctx;
mMediaManager = Dependency.get(NotificationMediaManager.class);
mMetricsLogger = Dependency.get(MetricsLogger.class);
-
- if (mView instanceof MediaNotificationView) {
- MediaNotificationView mediaView = (MediaNotificationView) mView;
- mediaView.addVisibilityListener(mVisibilityListener);
- mView.addOnAttachStateChangeListener(mAttachStateListener);
- }
}
private void resolveViews() {
@@ -183,22 +177,25 @@
.getParcelable(Notification.EXTRA_MEDIA_SESSION);
if (Utils.useQsMediaPlayer(mContext)) {
+ final int[] compactActions = mRow.getEntry().getSbn().getNotification().extras
+ .getIntArray(Notification.EXTRA_COMPACT_ACTIONS);
StatusBarWindowController ctrl = Dependency.get(StatusBarWindowController.class);
QuickQSPanel panel = ctrl.getStatusBarView().findViewById(
com.android.systemui.R.id.quick_qs_panel);
panel.getMediaPlayer().setMediaSession(token,
- mRow.getStatusBarNotification().getNotification().getSmallIcon(),
- getNotificationHeader().getOriginalIconColor(),
- mRow.getCurrentBackgroundTint(),
- mActions);
- QSPanel bigPanel = ctrl.getStatusBarView().findViewById(
- com.android.systemui.R.id.quick_settings_panel);
- bigPanel.addMediaSession(token,
- mRow.getStatusBarNotification().getNotification().getSmallIcon(),
+ mRow.getEntry().getSbn().getNotification().getSmallIcon(),
getNotificationHeader().getOriginalIconColor(),
mRow.getCurrentBackgroundTint(),
mActions,
- mRow.getStatusBarNotification());
+ compactActions);
+ QSPanel bigPanel = ctrl.getStatusBarView().findViewById(
+ com.android.systemui.R.id.quick_settings_panel);
+ bigPanel.addMediaSession(token,
+ mRow.getEntry().getSbn().getNotification().getSmallIcon(),
+ getNotificationHeader().getOriginalIconColor(),
+ mRow.getCurrentBackgroundTint(),
+ mActions,
+ mRow.getEntry().getSbn());
}
boolean showCompactSeekbar = mMediaManager.getShowCompactMediaSeekbar();
@@ -210,13 +207,13 @@
}
// Check for existing media controller and clean up / create as necessary
- boolean controllerUpdated = false;
+ boolean shouldUpdateListeners = false;
if (mMediaController == null || !mMediaController.getSessionToken().equals(token)) {
if (mMediaController != null) {
mMediaController.unregisterCallback(mMediaCallback);
}
mMediaController = new MediaController(mContext, token);
- controllerUpdated = true;
+ shouldUpdateListeners = true;
}
mMediaMetadata = mMediaController.getMetadata();
@@ -228,7 +225,7 @@
mSeekBarView.setVisibility(View.GONE);
mMetricsLogger.write(newLog(MetricsEvent.TYPE_CLOSE));
clearTimer();
- } else if (mSeekBarView == null && controllerUpdated) {
+ } else if (mSeekBarView == null && shouldUpdateListeners) {
// Only log if the controller changed, otherwise we would log multiple times for
// the same notification when user pauses/resumes
mMetricsLogger.write(newLog(MetricsEvent.TYPE_CLOSE));
@@ -258,6 +255,16 @@
mSeekBarElapsedTime = mSeekBarView.findViewById(R.id.notification_media_elapsed_time);
mSeekBarTotalTime = mSeekBarView.findViewById(R.id.notification_media_total_time);
+ shouldUpdateListeners = true;
+ }
+
+ if (shouldUpdateListeners) {
+ if (mView instanceof MediaNotificationView) {
+ MediaNotificationView mediaView = (MediaNotificationView) mView;
+ mediaView.addVisibilityListener(mVisibilityListener);
+ mView.addOnAttachStateChangeListener(mAttachStateListener);
+ }
+
if (mSeekBarTimer == null) {
if (mMediaController != null && canSeekMedia(mMediaController.getPlaybackState())) {
// Log initial state, since it will not be updated
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java
index 97d8443..90ea6e3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java
@@ -286,7 +286,7 @@
public void onContentUpdated(ExpandableNotificationRow row) {
// Reinspect the notification. Before the super call, because the super call also updates
// the transformation types and we need to have our values set by then.
- resolveTemplateViews(row.getStatusBarNotification());
+ resolveTemplateViews(row.getEntry().getSbn());
super.onContentUpdated(row);
if (row.getHeaderVisibleAmount() != DEFAULT_HEADER_VISIBLE_AMOUNT) {
setHeaderVisibleAmount(row.getHeaderVisibleAmount());
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
index 45f7b3a..75ceb0f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
@@ -299,7 +299,7 @@
public void recreateNotificationHeader(OnClickListener listener) {
mHeaderClickListener = listener;
- StatusBarNotification notification = mContainingNotification.getStatusBarNotification();
+ StatusBarNotification notification = mContainingNotification.getEntry().getSbn();
final Notification.Builder builder = Notification.Builder.recoverBuilder(getContext(),
notification.getNotification());
RemoteViews header = builder.makeNotificationHeader();
@@ -329,7 +329,7 @@
*/
private void recreateLowPriorityHeader(Notification.Builder builder) {
RemoteViews header;
- StatusBarNotification notification = mContainingNotification.getStatusBarNotification();
+ StatusBarNotification notification = mContainingNotification.getEntry().getSbn();
if (mIsLowPriority) {
if (builder == null) {
builder = Notification.Builder.recoverBuilder(getContext(),
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 0d8e30e..43af3aa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -696,8 +696,7 @@
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
public void updateFooter() {
boolean showDismissView = mClearAllEnabled && hasActiveClearableNotifications(ROWS_ALL);
- boolean showFooterView = (showDismissView ||
- mEntryManager.getNotificationData().getActiveNotifications().size() != 0)
+ boolean showFooterView = (showDismissView || mEntryManager.hasActiveNotifications())
&& mStatusBarState != StatusBarState.KEYGUARD
&& !mRemoteInputManager.getController().isRemoteInputActive();
@@ -1455,8 +1454,8 @@
}
ExpandableNotificationRow row = topEntry.getRow();
if (row.isChildInGroup()) {
- final NotificationEntry groupSummary
- = mGroupManager.getGroupSummary(row.getStatusBarNotification());
+ final NotificationEntry groupSummary =
+ mGroupManager.getGroupSummary(row.getEntry().getSbn());
if (groupSummary != null) {
row = groupSummary.getRow();
}
@@ -2997,7 +2996,7 @@
private boolean isChildInGroup(View child) {
return child instanceof ExpandableNotificationRow
&& mGroupManager.isChildInGroupWithSummary(
- ((ExpandableNotificationRow) child).getStatusBarNotification());
+ ((ExpandableNotificationRow) child).getEntry().getSbn());
}
/**
@@ -3072,7 +3071,7 @@
if (child instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
NotificationEntry groupSummary =
- mGroupManager.getGroupSummary(row.getStatusBarNotification());
+ mGroupManager.getGroupSummary(row.getEntry().getSbn());
if (groupSummary != null && groupSummary.getRow() != row) {
return row.getVisibility() == View.INVISIBLE;
}
@@ -5787,11 +5786,6 @@
}
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
- public boolean hasActiveNotifications() {
- return !mEntryManager.getNotificationData().getActiveNotifications().isEmpty();
- }
-
- @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
public void updateSpeedBumpIndex() {
int speedBumpIndex = 0;
int currentIndex = 0;
@@ -6140,7 +6134,7 @@
}
if (view instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) view;
- mMetricsLogger.write(row.getStatusBarNotification().getLogMaker()
+ mMetricsLogger.write(row.getEntry().getSbn().getLogMaker()
.setCategory(MetricsEvent.ACTION_TOUCH_GEAR)
.setType(MetricsEvent.TYPE_ACTION)
);
@@ -6166,7 +6160,7 @@
public void onMenuShown(View row) {
if (row instanceof ExpandableNotificationRow) {
ExpandableNotificationRow notificationRow = (ExpandableNotificationRow) row;
- mMetricsLogger.write(notificationRow.getStatusBarNotification().getLogMaker()
+ mMetricsLogger.write(notificationRow.getEntry().getSbn().getLogMaker()
.setCategory(MetricsEvent.ACTION_REVEAL_GEAR)
.setType(MetricsEvent.TYPE_ACTION));
mHeadsUpManager.setMenuShown(notificationRow.getEntry(), true);
@@ -6262,7 +6256,7 @@
ExpandableNotificationRow row = (ExpandableNotificationRow) view;
if (row.isHeadsUp()) {
mHeadsUpManager.addSwipedOutNotification(
- row.getStatusBarNotification().getKey());
+ row.getEntry().getSbn().getKey());
}
isBlockingHelperShown =
row.performDismissWithBlockingHelper(false /* fromAccessibility */);
@@ -6333,9 +6327,9 @@
if (animView instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) animView;
if (row.isPinned() && !canChildBeDismissed(row)
- && row.getStatusBarNotification().getNotification().fullScreenIntent
+ && row.getEntry().getSbn().getNotification().fullScreenIntent
== null) {
- mHeadsUpManager.removeNotification(row.getStatusBarNotification().getKey(),
+ mHeadsUpManager.removeNotification(row.getEntry().getSbn().getKey(),
true /* removeImmediately */);
}
}
@@ -6400,7 +6394,7 @@
@Override
public boolean onDraggedDown(View startingChild, int dragLengthY) {
if (mStatusBarState == StatusBarState.KEYGUARD
- && hasActiveNotifications()) {
+ && mEntryManager.hasActiveNotifications()) {
mLockscreenGestureLogger.write(
MetricsEvent.ACTION_LS_SHADE,
(int) (dragLengthY / mDisplayMetrics.density),
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
index 1ecc489..afaa593 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
@@ -90,14 +90,6 @@
public void onCancelled() {
pulseFinished();
}
-
- /**
- * Whether to timeout wallpaper or not.
- */
- @Override
- public boolean shouldTimeoutWallpaper() {
- return mPulseReason == DozeEvent.PULSE_REASON_DOCKING;
- }
};
@Inject
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
index a1af5e8..6aee194 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
@@ -233,10 +233,6 @@
mScrimController.setWakeLockScreenSensorActive(true);
}
- if (reason == DozeEvent.PULSE_REASON_DOCKING && mStatusBarWindow != null) {
- mStatusBarWindowViewController.suppressWakeUpGesture(true);
- }
-
boolean passiveAuthInterrupt = reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN
&& mWakeLockScreenPerformsAuth;
// Set the state to pulsing, so ScrimController will know what to do once we ask it to
@@ -257,9 +253,6 @@
callback.onPulseFinished();
mStatusBar.updateNotificationPanelTouchState();
mScrimController.setWakeLockScreenSensorActive(false);
- if (mStatusBarWindow != null) {
- mStatusBarWindowViewController.suppressWakeUpGesture(false);
- }
setPulsing(false);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
index 1c8e832..8ee964f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
@@ -22,7 +22,6 @@
import android.graphics.PixelFormat;
import android.graphics.Point;
import android.graphics.PointF;
-import android.graphics.Rect;
import android.graphics.Region;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManager.DisplayListener;
@@ -32,9 +31,7 @@
import android.os.SystemClock;
import android.os.SystemProperties;
import android.util.Log;
-import android.util.MathUtils;
import android.util.StatsLog;
-import android.view.Gravity;
import android.view.ISystemGestureExclusionListener;
import android.view.InputChannel;
import android.view.InputDevice;
@@ -44,7 +41,6 @@
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.MotionEvent;
-import android.view.View;
import android.view.ViewConfiguration;
import android.view.WindowManager;
import android.view.WindowManagerGlobal;
@@ -53,7 +49,10 @@
import com.android.systemui.R;
import com.android.systemui.bubbles.BubbleController;
import com.android.systemui.model.SysUiState;
+import com.android.systemui.plugins.NavigationEdgeBackPlugin;
+import com.android.systemui.plugins.PluginListener;
import com.android.systemui.recents.OverviewProxyService;
+import com.android.systemui.shared.plugins.PluginManager;
import com.android.systemui.shared.system.QuickStepContract;
import java.io.PrintWriter;
@@ -62,7 +61,8 @@
/**
* Utility class to handle edge swipes for back gesture
*/
-public class EdgeBackGestureHandler implements DisplayListener {
+public class EdgeBackGestureHandler implements DisplayListener,
+ PluginListener<NavigationEdgeBackPlugin> {
private static final String TAG = "EdgeBackGestureHandler";
private static final int MAX_LONG_PRESS_TIMEOUT = SystemProperties.getInt(
@@ -85,6 +85,7 @@
private final Context mContext;
private final OverviewProxyService mOverviewProxyService;
+ private PluginManager mPluginManager;
private final Point mDisplaySize = new Point();
private final int mDisplayId;
@@ -100,14 +101,6 @@
private final float mTouchSlop;
// Duration after which we consider the event as longpress.
private final int mLongPressTimeout;
- // The threshold where the touch needs to be at most, such that the arrow is displayed above the
- // finger, otherwise it will be below
- private final int mMinArrowPosition;
- // The amount by which the arrow is shifted to avoid the finger
- private final int mFingerOffset;
-
-
- private final int mNavBarHeight;
private final PointF mDownPoint = new PointF();
private boolean mThresholdCrossed = false;
@@ -123,24 +116,49 @@
private InputMonitor mInputMonitor;
private InputEventReceiver mInputEventReceiver;
- private final WindowManager mWm;
-
- private NavigationBarEdgePanel mEdgePanel;
- private WindowManager.LayoutParams mEdgePanelLp;
- private final Rect mSamplingRect = new Rect();
- private RegionSamplingHelper mRegionSamplingHelper;
+ private NavigationEdgeBackPlugin mEdgeBackPlugin;
private int mLeftInset;
private int mRightInset;
private int mSysUiFlags;
+ private final NavigationEdgeBackPlugin.BackCallback mBackCallback =
+ new NavigationEdgeBackPlugin.BackCallback() {
+ @Override
+ public void triggerBack() {
+ sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
+ sendEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK);
+
+ mOverviewProxyService.notifyBackAction(true, (int) mDownPoint.x,
+ (int) mDownPoint.y, false /* isButton */, !mIsOnLeftEdge);
+ int backtype = (mInRejectedExclusion
+ ? StatsLog.BACK_GESTURE__TYPE__COMPLETED_REJECTED :
+ StatsLog.BACK_GESTURE__TYPE__COMPLETED);
+ StatsLog.write(StatsLog.BACK_GESTURE_REPORTED_REPORTED, backtype,
+ (int) mDownPoint.y, mIsOnLeftEdge
+ ? StatsLog.BACK_GESTURE__X_LOCATION__LEFT :
+ StatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
+ }
+
+ @Override
+ public void cancelBack() {
+ mOverviewProxyService.notifyBackAction(false, (int) mDownPoint.x,
+ (int) mDownPoint.y, false /* isButton */, !mIsOnLeftEdge);
+ int backtype = StatsLog.BACK_GESTURE__TYPE__INCOMPLETE;
+ StatsLog.write(StatsLog.BACK_GESTURE_REPORTED_REPORTED, backtype,
+ (int) mDownPoint.y, mIsOnLeftEdge
+ ? StatsLog.BACK_GESTURE__X_LOCATION__LEFT :
+ StatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
+ }
+ };
+
public EdgeBackGestureHandler(Context context, OverviewProxyService overviewProxyService,
- SysUiState sysUiFlagContainer) {
+ SysUiState sysUiFlagContainer, PluginManager pluginManager) {
final Resources res = context.getResources();
mContext = context;
mDisplayId = context.getDisplayId();
mMainExecutor = context.getMainExecutor();
- mWm = context.getSystemService(WindowManager.class);
mOverviewProxyService = overviewProxyService;
+ mPluginManager = pluginManager;
// Reduce the default touch slop to ensure that we can intercept the gesture
// before the app starts to react to it.
@@ -149,9 +167,6 @@
mLongPressTimeout = Math.min(MAX_LONG_PRESS_TIMEOUT,
ViewConfiguration.getLongPressTimeout());
- mNavBarHeight = res.getDimensionPixelSize(R.dimen.navigation_bar_frame_height);
- mMinArrowPosition = res.getDimensionPixelSize(R.dimen.navigation_edge_arrow_min_y);
- mFingerOffset = res.getDimensionPixelSize(R.dimen.navigation_edge_finger_offset);
updateCurrentUserResources(res);
sysUiFlagContainer.addCallback(sysUiFlags -> mSysUiFlags = sysUiFlags);
}
@@ -206,15 +221,14 @@
mIsEnabled = isEnabled;
disposeInputChannel();
- if (mEdgePanel != null) {
- mWm.removeView(mEdgePanel);
- mEdgePanel = null;
- mRegionSamplingHelper.stop();
- mRegionSamplingHelper = null;
+ if (mEdgeBackPlugin != null) {
+ mEdgeBackPlugin.onDestroy();
+ mEdgeBackPlugin = null;
}
if (!mIsEnabled) {
mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
+ mPluginManager.removePluginListener(this);
try {
WindowManagerGlobal.getWindowManagerService()
@@ -244,41 +258,51 @@
mInputMonitor.getInputChannel(), Looper.getMainLooper());
// Add a nav bar panel window
- mEdgePanel = new NavigationBarEdgePanel(mContext);
- mEdgePanelLp = new WindowManager.LayoutParams(
- mContext.getResources()
- .getDimensionPixelSize(R.dimen.navigation_edge_panel_width),
- mContext.getResources()
- .getDimensionPixelSize(R.dimen.navigation_edge_panel_height),
- WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
- | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
- | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH
- | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- PixelFormat.TRANSLUCENT);
- mEdgePanelLp.privateFlags |=
- WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
- mEdgePanelLp.setTitle(TAG + mDisplayId);
- mEdgePanelLp.accessibilityTitle = mContext.getString(R.string.nav_bar_edge_panel);
- mEdgePanelLp.windowAnimations = 0;
- mEdgePanel.setLayoutParams(mEdgePanelLp);
- mWm.addView(mEdgePanel, mEdgePanelLp);
- mRegionSamplingHelper = new RegionSamplingHelper(mEdgePanel,
- new RegionSamplingHelper.SamplingCallback() {
- @Override
- public void onRegionDarknessChanged(boolean isRegionDark) {
- mEdgePanel.setIsDark(!isRegionDark, true /* animate */);
- }
-
- @Override
- public Rect getSampledRegion(View sampledView) {
- return mSamplingRect;
- }
- });
- mRegionSamplingHelper.setWindowVisible(true);
+ setEdgeBackPlugin(new NavigationBarEdgePanel(mContext));
+ mPluginManager.addPluginListener(
+ this, NavigationEdgeBackPlugin.class, /*allowMultiple=*/ false);
}
}
+ @Override
+ public void onPluginConnected(NavigationEdgeBackPlugin plugin, Context context) {
+ setEdgeBackPlugin(plugin);
+ }
+
+ @Override
+ public void onPluginDisconnected(NavigationEdgeBackPlugin plugin) {
+ setEdgeBackPlugin(new NavigationBarEdgePanel(mContext));
+ }
+
+ private void setEdgeBackPlugin(NavigationEdgeBackPlugin edgeBackPlugin) {
+ if (mEdgeBackPlugin != null) {
+ mEdgeBackPlugin.onDestroy();
+ }
+ mEdgeBackPlugin = edgeBackPlugin;
+ mEdgeBackPlugin.setBackCallback(mBackCallback);
+ mEdgeBackPlugin.setLayoutParams(createLayoutParams());
+ updateDisplaySize();
+ }
+
+ private WindowManager.LayoutParams createLayoutParams() {
+ Resources resources = mContext.getResources();
+ WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(
+ resources.getDimensionPixelSize(R.dimen.navigation_edge_panel_width),
+ resources.getDimensionPixelSize(R.dimen.navigation_edge_panel_height),
+ WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+ | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+ | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH
+ | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT);
+ layoutParams.privateFlags |=
+ WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
+ layoutParams.setTitle(TAG + mContext.getDisplayId());
+ layoutParams.accessibilityTitle = mContext.getString(R.string.nav_bar_edge_panel);
+ layoutParams.windowAnimations = 0;
+ return layoutParams;
+ }
+
private void onInputEvent(InputEvent ev) {
if (ev instanceof MotionEvent) {
onMotionEvent((MotionEvent) ev);
@@ -316,7 +340,7 @@
mInRejectedExclusion = false;
MotionEvent cancelEv = MotionEvent.obtain(ev);
cancelEv.setAction(MotionEvent.ACTION_CANCEL);
- mEdgePanel.handleTouch(cancelEv);
+ mEdgeBackPlugin.onMotionEvent(cancelEv);
cancelEv.recycle();
}
@@ -330,14 +354,8 @@
mAllowGesture = !QuickStepContract.isBackGestureDisabled(mSysUiFlags)
&& isWithinTouchRegion((int) ev.getX(), (int) ev.getY());
if (mAllowGesture) {
- mEdgePanelLp.gravity = mIsOnLeftEdge
- ? (Gravity.LEFT | Gravity.TOP)
- : (Gravity.RIGHT | Gravity.TOP);
- mEdgePanel.setIsLeftPanel(mIsOnLeftEdge);
- mEdgePanel.handleTouch(ev);
- updateEdgePanelPosition(ev.getY());
- mWm.updateViewLayout(mEdgePanel, mEdgePanelLp);
- mRegionSamplingHelper.start(mSamplingRect);
+ mEdgeBackPlugin.setIsLeftPanel(mIsOnLeftEdge);
+ mEdgeBackPlugin.onMotionEvent(ev);
mDownPoint.set(ev.getX(), ev.getY());
mThresholdCrossed = false;
@@ -369,53 +387,10 @@
}
// forward touch
- mEdgePanel.handleTouch(ev);
-
- boolean isUp = action == MotionEvent.ACTION_UP;
- if (isUp) {
- boolean performAction = mEdgePanel.shouldTriggerBack();
- if (performAction) {
- // Perform back
- sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
- sendEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK);
- }
- mOverviewProxyService.notifyBackAction(performAction, (int) mDownPoint.x,
- (int) mDownPoint.y, false /* isButton */, !mIsOnLeftEdge);
- int backtype = performAction ? (mInRejectedExclusion
- ? StatsLog.BACK_GESTURE__TYPE__COMPLETED_REJECTED :
- StatsLog.BACK_GESTURE__TYPE__COMPLETED) :
- StatsLog.BACK_GESTURE__TYPE__INCOMPLETE;
- StatsLog.write(StatsLog.BACK_GESTURE_REPORTED_REPORTED, backtype,
- (int) mDownPoint.y, mIsOnLeftEdge
- ? StatsLog.BACK_GESTURE__X_LOCATION__LEFT :
- StatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
- }
- if (isUp || action == MotionEvent.ACTION_CANCEL) {
- mRegionSamplingHelper.stop();
- } else {
- updateSamplingRect();
- mRegionSamplingHelper.updateSamplingRect();
- }
+ mEdgeBackPlugin.onMotionEvent(ev);
}
}
- private void updateEdgePanelPosition(float touchY) {
- float position = touchY - mFingerOffset;
- position = Math.max(position, mMinArrowPosition);
- position = (position - mEdgePanelLp.height / 2.0f);
- mEdgePanelLp.y = MathUtils.constrain((int) position, 0, mDisplaySize.y);
- updateSamplingRect();
- }
-
- private void updateSamplingRect() {
- int top = mEdgePanelLp.y;
- int left = mIsOnLeftEdge ? mLeftInset : mDisplaySize.x - mRightInset - mEdgePanelLp.width;
- int right = left + mEdgePanelLp.width;
- int bottom = top + mEdgePanelLp.height;
- mSamplingRect.set(left, top, right, bottom);
- mEdgePanel.adjustRectToBoundingBox(mSamplingRect);
- }
-
@Override
public void onDisplayAdded(int displayId) { }
@@ -433,6 +408,9 @@
mContext.getSystemService(DisplayManager.class)
.getDisplay(mDisplayId)
.getRealSize(mDisplaySize);
+ if (mEdgeBackPlugin != null) {
+ mEdgeBackPlugin.setDisplaySize(mDisplaySize);
+ }
}
private void sendEvent(int action, int code) {
@@ -454,6 +432,9 @@
public void setInsets(int leftInset, int rightInset) {
mLeftInset = leftInset;
mRightInset = rightInset;
+ if (mEdgeBackPlugin != null) {
+ mEdgeBackPlugin.setInsets(leftInset, rightInset);
+ }
}
public void dump(PrintWriter pw) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java
index 4e06c84..6ac6d35 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java
@@ -52,13 +52,9 @@
import java.util.HashSet;
import java.util.Stack;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
/**
* A implementation of HeadsUpManager for phone and car.
*/
-@Singleton
public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable,
VisualStabilityManager.Callback, OnHeadsUpChangedListener,
ConfigurationController.ConfigurationListener, StateListener {
@@ -113,7 +109,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////
// Constructor:
- @Inject
public HeadsUpManagerPhone(@NonNull final Context context,
StatusBarStateController statusBarStateController,
KeyguardBypassController bypassController) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java
index 7f31f3d..ac06d9d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java
@@ -132,7 +132,7 @@
if (mPickedChild != null && mTouchingHeadsUpView) {
// We may swallow this click if the heads up just came in.
if (mHeadsUpManager.shouldSwallowClick(
- mPickedChild.getStatusBarNotification().getKey())) {
+ mPickedChild.getEntry().getSbn().getKey())) {
endMotion();
return true;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardEnvironmentImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardEnvironmentImpl.java
index 2c931ae..e763496 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardEnvironmentImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardEnvironmentImpl.java
@@ -22,7 +22,7 @@
import com.android.systemui.Dependency;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment;
+import com.android.systemui.statusbar.notification.NotificationEntryManager.KeyguardEnvironment;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import javax.inject.Inject;
@@ -42,12 +42,12 @@
public KeyguardEnvironmentImpl() {
}
- @Override // NotificationData.KeyguardEnvironment
+ @Override // NotificationEntryManager.KeyguardEnvironment
public boolean isDeviceProvisioned() {
return mDeviceProvisionedController.isDeviceProvisioned();
}
- @Override // NotificationData.KeyguardEnvironment
+ @Override // NotificationEntryManager.KeyguardEnvironment
public boolean isNotificationForCurrentProfiles(StatusBarNotification n) {
final int notificationUserId = n.getUserId();
if (DEBUG && MULTIUSER_DEBUG) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java
index 93887a6..5703f06 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java
@@ -97,7 +97,7 @@
}
private boolean hasActiveNotifications() {
- return !mEntryManager.getNotificationData().getActiveNotifications().isEmpty();
+ return mEntryManager.hasActiveNotifications();
}
@VisibleForTesting
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java
index 4f223c3..2357309 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java
@@ -19,34 +19,40 @@
import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.Configuration;
-import android.graphics.Canvas;;
+import android.content.res.Resources;
+import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Path;
+import android.graphics.Point;
import android.graphics.Rect;
import android.os.SystemClock;
import android.os.VibrationEffect;
-import android.util.DisplayMetrics;
import android.util.MathUtils;
import android.view.ContextThemeWrapper;
+import android.view.Gravity;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
+import android.view.WindowManager;
import android.view.animation.Interpolator;
import android.view.animation.PathInterpolator;
-import com.android.settingslib.Utils;
-import com.android.systemui.Dependency;
-import com.android.systemui.Interpolators;
-import com.android.systemui.R;
-import com.android.systemui.statusbar.VibratorHelper;
-
import androidx.core.graphics.ColorUtils;
import androidx.dynamicanimation.animation.DynamicAnimation;
import androidx.dynamicanimation.animation.FloatPropertyCompat;
import androidx.dynamicanimation.animation.SpringAnimation;
import androidx.dynamicanimation.animation.SpringForce;
-public class NavigationBarEdgePanel extends View {
+import com.android.settingslib.Utils;
+import com.android.systemui.Dependency;
+import com.android.systemui.Interpolators;
+import com.android.systemui.R;
+import com.android.systemui.plugins.NavigationEdgeBackPlugin;
+import com.android.systemui.statusbar.VibratorHelper;
+
+public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPlugin {
+
+ private static final String TAG = "NavigationBarEdgePanel";
private static final long COLOR_ANIMATION_DURATION_MS = 120;
private static final long DISAPPEAR_FADE_ANIMATION_DURATION_MS = 80;
@@ -114,6 +120,7 @@
private static final Interpolator RUBBER_BAND_INTERPOLATOR_APPEAR
= new PathInterpolator(1.0f / RUBBER_BAND_AMOUNT_APPEAR, 1.0f, 1.0f, 1.0f);
+ private final WindowManager mWindowManager;
private final VibratorHelper mVibratorHelper;
/**
@@ -134,9 +141,14 @@
* The minimum delta needed in movement for the arrow to change direction / stop triggering back
*/
private final float mMinDeltaForSwitch;
+ // The closest to y = 0 that the arrow will be displayed.
+ private int mMinArrowPosition;
+ // The amount the arrow is shifted to avoid the finger.
+ private int mFingerOffset;
private final float mSwipeThreshold;
private final Path mArrowPath = new Path();
+ private final Point mDisplaySize = new Point();
private final SpringAnimation mAngleAnimation;
private final SpringAnimation mTranslationAnimation;
@@ -158,6 +170,11 @@
private int mArrowColorDark;
private int mProtectionColor;
private int mArrowColor;
+ private RegionSamplingHelper mRegionSamplingHelper;
+ private final Rect mSamplingRect = new Rect();
+ private WindowManager.LayoutParams mLayoutParams;
+ private int mLeftInset;
+ private int mRightInset;
/**
* True if the panel is currently on the left of the screen
@@ -242,10 +259,12 @@
return object.getVerticalTranslation();
}
};
+ private BackCallback mBackCallback;
public NavigationBarEdgePanel(Context context) {
super(context);
+ mWindowManager = context.getSystemService(WindowManager.class);
mVibratorHelper = Dependency.get(VibratorHelper.class);
mDensity = context.getResources().getDisplayMetrics().density;
@@ -263,13 +282,10 @@
mArrowColorAnimator = ValueAnimator.ofFloat(0.0f, 1.0f);
mArrowColorAnimator.setDuration(COLOR_ANIMATION_DURATION_MS);
- mArrowColorAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- int newColor = ColorUtils.blendARGB(mArrowStartColor, mArrowColor,
- animation.getAnimatedFraction());
- setCurrentArrowColor(newColor);
- }
+ mArrowColorAnimator.addUpdateListener(animation -> {
+ int newColor = ColorUtils.blendARGB(
+ mArrowStartColor, mArrowColor, animation.getAnimatedFraction());
+ setCurrentArrowColor(newColor);
});
mArrowDisappearAnimation = ValueAnimator.ofFloat(0.0f, 1.0f);
@@ -317,6 +333,27 @@
mSwipeThreshold = context.getResources()
.getDimension(R.dimen.navigation_edge_action_drag_threshold);
setVisibility(GONE);
+
+ mRegionSamplingHelper = new RegionSamplingHelper(this,
+ new RegionSamplingHelper.SamplingCallback() {
+ @Override
+ public void onRegionDarknessChanged(boolean isRegionDark) {
+ setIsDark(!isRegionDark, true /* animate */);
+ }
+
+ @Override
+ public Rect getSampledRegion(View sampledView) {
+ return mSamplingRect;
+ }
+ });
+ mRegionSamplingHelper.setWindowVisible(true);
+ }
+
+ @Override
+ public void onDestroy() {
+ mWindowManager.removeView(this);
+ mRegionSamplingHelper.stop();
+ mRegionSamplingHelper = null;
}
@Override
@@ -324,30 +361,51 @@
return false;
}
- public boolean shouldTriggerBack() {
- return mTriggerBack;
- }
-
- public void setIsDark(boolean isDark, boolean animate) {
+ private void setIsDark(boolean isDark, boolean animate) {
mIsDark = isDark;
updateIsDark(animate);
}
- public void setShowProtection(boolean showProtection) {
+ private void setShowProtection(boolean showProtection) {
mShowProtection = showProtection;
invalidate();
}
+ @Override
public void setIsLeftPanel(boolean isLeftPanel) {
mIsLeftPanel = isLeftPanel;
+ mLayoutParams.gravity = mIsLeftPanel
+ ? (Gravity.LEFT | Gravity.TOP)
+ : (Gravity.RIGHT | Gravity.TOP);
+ }
+
+ @Override
+ public void setInsets(int leftInset, int rightInset) {
+ mLeftInset = leftInset;
+ mRightInset = rightInset;
+ }
+
+ @Override
+ public void setDisplaySize(Point displaySize) {
+ mDisplaySize.set(displaySize.x, displaySize.y);
+ mScreenSize = Math.min(mDisplaySize.x, mDisplaySize.y);
+ }
+
+ @Override
+ public void setBackCallback(BackCallback callback) {
+ mBackCallback = callback;
+ }
+
+ @Override
+ public void setLayoutParams(WindowManager.LayoutParams layoutParams) {
+ mLayoutParams = layoutParams;
+ mWindowManager.addView(this, mLayoutParams);
}
/**
- * Adjust the rect to conform the the actual visible bounding box of the arrow.
- *
- * @param samplingRect the existing bounding box in screen coordinates, to be modified
+ * Adjusts the sampling rect to conform to the actual visible bounding box of the arrow.
*/
- public void adjustRectToBoundingBox(Rect samplingRect) {
+ private void adjustSamplingRectToBoundingBox() {
float translation = mDesiredTranslation;
if (!mTriggerBack) {
// Let's take the resting position and bounds as the sampling rect, since we are not
@@ -361,7 +419,7 @@
}
}
float left = translation - mArrowThickness / 2.0f;
- left = mIsLeftPanel ? left : samplingRect.width() - left;
+ left = mIsLeftPanel ? left : mSamplingRect.width() - left;
// Let's calculate the position of the end based on the angle
float width = getStaticArrowWidth();
@@ -371,49 +429,49 @@
}
float top = (getHeight() * 0.5f) + mDesiredVerticalTranslation - height / 2.0f;
- samplingRect.offset((int) left, (int) top);
- samplingRect.set(samplingRect.left, samplingRect.top,
- (int) (samplingRect.left + width),
- (int) (samplingRect.top + height));
+ mSamplingRect.offset((int) left, (int) top);
+ mSamplingRect.set(mSamplingRect.left, mSamplingRect.top,
+ (int) (mSamplingRect.left + width),
+ (int) (mSamplingRect.top + height));
+ mRegionSamplingHelper.updateSamplingRect();
}
- /**
- * Updates the UI based on the motion events passed in device co-ordinates
- */
- public void handleTouch(MotionEvent event) {
+ @Override
+ public void onMotionEvent(MotionEvent event) {
if (mVelocityTracker == null) {
mVelocityTracker = VelocityTracker.obtain();
}
mVelocityTracker.addMovement(event);
switch (event.getActionMasked()) {
- case MotionEvent.ACTION_DOWN : {
+ case MotionEvent.ACTION_DOWN:
mDragSlopPassed = false;
resetOnDown();
mStartX = event.getX();
mStartY = event.getY();
setVisibility(VISIBLE);
+ updatePosition(event.getY());
+ mRegionSamplingHelper.start(mSamplingRect);
+ mWindowManager.updateViewLayout(this, mLayoutParams);
break;
- }
- case MotionEvent.ACTION_MOVE: {
+ case MotionEvent.ACTION_MOVE:
handleMoveEvent(event);
break;
- }
- // Fall through
case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_CANCEL: {
if (mTriggerBack) {
triggerBack();
} else {
- if (mTranslationAnimation.isRunning()) {
- mTranslationAnimation.addEndListener(mSetGoneEndListener);
- } else {
- setVisibility(GONE);
- }
+ cancelBack();
}
+ mRegionSamplingHelper.stop();
mVelocityTracker.recycle();
mVelocityTracker = null;
break;
- }
+ case MotionEvent.ACTION_CANCEL:
+ cancelBack();
+ mRegionSamplingHelper.stop();
+ mVelocityTracker.recycle();
+ mVelocityTracker = null;
+ break;
}
}
@@ -452,10 +510,10 @@
}
private void loadDimens() {
- mArrowPaddingEnd = getContext().getResources().getDimensionPixelSize(
- R.dimen.navigation_edge_panel_padding);
- DisplayMetrics metrics = getResources().getDisplayMetrics();
- mScreenSize = Math.min(metrics.widthPixels, metrics.heightPixels);
+ Resources res = getResources();
+ mArrowPaddingEnd = res.getDimensionPixelSize(R.dimen.navigation_edge_panel_padding);
+ mMinArrowPosition = res.getDimensionPixelSize(R.dimen.navigation_edge_arrow_min_y);
+ mFingerOffset = res.getDimensionPixelSize(R.dimen.navigation_edge_finger_offset);
}
private void updateArrowDirection() {
@@ -531,6 +589,11 @@
}
private void triggerBack() {
+ mBackCallback.triggerBack();
+
+ if (mVelocityTracker == null) {
+ mVelocityTracker = VelocityTracker.obtain();
+ }
mVelocityTracker.computeCurrentVelocity(1000);
// Only do the extra translation if we're not already flinging
boolean isSlow = Math.abs(mVelocityTracker.getXVelocity()) < 500;
@@ -573,7 +636,16 @@
} else {
translationEnd.run();
}
+ }
+ private void cancelBack() {
+ mBackCallback.cancelBack();
+
+ if (mTranslationAnimation.isRunning()) {
+ mTranslationAnimation.addEndListener(mSetGoneEndListener);
+ } else {
+ setVisibility(GONE);
+ }
}
private void resetOnDown() {
@@ -680,6 +752,24 @@
float verticalTranslation = RUBBER_BAND_INTERPOLATOR.getInterpolation(progress)
* maxYOffset * Math.signum(yOffset);
setDesiredVerticalTransition(verticalTranslation, true /* animated */);
+ updateSamplingRect();
+ }
+
+ private void updatePosition(float touchY) {
+ float position = touchY - mFingerOffset;
+ position = Math.max(position, mMinArrowPosition);
+ position -= mLayoutParams.height / 2.0f;
+ mLayoutParams.y = MathUtils.constrain((int) position, 0, mDisplaySize.y);
+ updateSamplingRect();
+ }
+
+ private void updateSamplingRect() {
+ int top = mLayoutParams.y;
+ int left = mIsLeftPanel ? mLeftInset : mDisplaySize.x - mRightInset - mLayoutParams.width;
+ int right = left + mLayoutParams.width;
+ int bottom = top + mLayoutParams.height;
+ mSamplingRect.set(left, top, right, bottom);
+ adjustSamplingRectToBoundingBox();
}
private void setDesiredVerticalTransition(float verticalTranslation, boolean animated) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index d3c7940..5a1b20d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -72,6 +72,7 @@
import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsOnboarding;
+import com.android.systemui.shared.plugins.PluginManager;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.QuickStepContract;
import com.android.systemui.shared.system.WindowManagerWrapper;
@@ -96,6 +97,7 @@
private final RegionSamplingHelper mRegionSamplingHelper;
private final int mNavColorSampleMargin;
private final SysUiState mSysUiFlagContainer;
+ private final PluginManager mPluginManager;
View mCurrentView = null;
private View mVertical;
@@ -272,6 +274,7 @@
boolean isGesturalMode = isGesturalMode(mNavBarMode);
mSysUiFlagContainer = Dependency.get(SysUiState.class);
+ mPluginManager = Dependency.get(PluginManager.class);
// Set up the context group of buttons
mContextualButtonGroup = new ContextualButtonGroup(R.id.menu_container);
final ContextualButton imeSwitcherButton = new ContextualButton(R.id.ime_switcher,
@@ -315,8 +318,8 @@
mNavColorSampleMargin = getResources()
.getDimensionPixelSize(R.dimen.navigation_handle_sample_horizontal_margin);
- mEdgeBackGestureHandler =
- new EdgeBackGestureHandler(context, mOverviewProxyService, mSysUiFlagContainer);
+ mEdgeBackGestureHandler = new EdgeBackGestureHandler(
+ context, mOverviewProxyService, mSysUiFlagContainer, mPluginManager);
mRegionSamplingHelper = new RegionSamplingHelper(this,
new RegionSamplingHelper.SamplingCallback() {
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
index 1e10b6f..3554b54 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
@@ -15,7 +15,6 @@
import com.android.internal.statusbar.StatusBarIcon;
import com.android.internal.util.ContrastColorUtil;
import com.android.settingslib.Utils;
-import com.android.systemui.Dependency;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.plugins.DarkIconDispatcher;
@@ -26,7 +25,6 @@
import com.android.systemui.statusbar.NotificationShelf;
import com.android.systemui.statusbar.StatusBarIconView;
import com.android.systemui.statusbar.StatusBarState;
-import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationUtils;
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
@@ -48,7 +46,6 @@
private static final long AOD_ICONS_APPEAR_DURATION = 200;
private final ContrastColorUtil mContrastColorUtil;
- private final NotificationEntryManager mEntryManager;
private final Runnable mUpdateStatusBarIcons = this::updateStatusBarIcons;
private final StatusBarStateController mStatusBarStateController;
private final NotificationMediaManager mMediaManager;
@@ -91,7 +88,6 @@
mStatusBar = statusBar;
mContrastColorUtil = ContrastColorUtil.getInstance(context);
mContext = context;
- mEntryManager = Dependency.get(NotificationEntryManager.class);
mStatusBarStateController = statusBarStateController;
mStatusBarStateController.addCallback(this);
mMediaManager = notificationMediaManager;
@@ -247,7 +243,7 @@
if (hideCenteredIcon && isCenteredNotificationIcon && !entry.isRowHeadsUp()) {
return false;
}
- if (mEntryManager.getNotificationData().isAmbient(entry.getKey()) && !showAmbient) {
+ if (entry.getRanking().isAmbient() && !showAmbient) {
return false;
}
if (hideCurrentMedia && entry.getKey().equals(mMediaManager.getMediaNotificationKey())) {
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 6839fb4..35407c6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -986,7 +986,7 @@
}
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
boolean suppressedSummary = mGroupManager != null
- && mGroupManager.isSummaryOfSuppressedGroup(row.getStatusBarNotification());
+ && mGroupManager.isSummaryOfSuppressedGroup(row.getEntry().getSbn());
if (suppressedSummary) {
continue;
}
@@ -3562,8 +3562,7 @@
private void updateShowEmptyShadeView() {
boolean showEmptyShadeView =
- mBarState != StatusBarState.KEYGUARD &&
- mEntryManager.getNotificationData().getActiveNotifications().size() == 0;
+ mBarState != StatusBarState.KEYGUARD && !mEntryManager.hasActiveNotifications();
showEmptyShadeView(showEmptyShadeView);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index f21a9a2..1454e25 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -46,6 +46,7 @@
import com.android.systemui.R;
import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.dagger.qualifiers.MainResources;
+import com.android.systemui.dock.DockManager;
import com.android.systemui.statusbar.ScrimView;
import com.android.systemui.statusbar.notification.stack.ViewState;
import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -136,6 +137,7 @@
private final KeyguardStateController mKeyguardStateController;
private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
private final DozeParameters mDozeParameters;
+ private final DockManager mDockManager;
private final AlarmTimeout mTimeTicker;
private final KeyguardVisibilityCallback mKeyguardVisibilityCallback;
private final Handler mHandler;
@@ -192,7 +194,8 @@
AlarmManager alarmManager, KeyguardStateController keyguardStateController,
@MainResources Resources resources,
DelayedWakeLock.Builder delayedWakeLockBuilder, Handler handler,
- KeyguardUpdateMonitor keyguardUpdateMonitor, SysuiColorExtractor sysuiColorExtractor) {
+ KeyguardUpdateMonitor keyguardUpdateMonitor, SysuiColorExtractor sysuiColorExtractor,
+ DockManager dockManager) {
mScrimStateListener = lightBarController::setScrimState;
@@ -209,6 +212,7 @@
// to make sure that text on top of it is legible.
mScrimBehindAlpha = mScrimBehindAlphaResValue;
mDozeParameters = dozeParameters;
+ mDockManager = dockManager;
keyguardStateController.addCallback(new KeyguardStateController.Callback() {
@Override
public void onKeyguardFadingAwayChanged() {
@@ -234,7 +238,8 @@
final ScrimState[] states = ScrimState.values();
for (int i = 0; i < states.length; i++) {
- states[i].init(mScrimInFront, mScrimBehind, mScrimForBubble, mDozeParameters);
+ states[i].init(mScrimInFront, mScrimBehind, mScrimForBubble, mDozeParameters,
+ mDockManager);
states[i].setScrimBehindAlphaKeyguard(mScrimBehindAlphaKeyguard);
}
@@ -359,11 +364,6 @@
return true;
}
- if (mState == ScrimState.PULSING
- && mCallback != null && mCallback.shouldTimeoutWallpaper()) {
- return true;
- }
-
return false;
}
@@ -520,8 +520,7 @@
* device is dozing when the light sensor is on.
*/
public void setAodFrontScrimAlpha(float alpha) {
- if (((mState == ScrimState.AOD && mDozeParameters.getAlwaysOn())
- || mState == ScrimState.PULSING) && mInFrontAlpha != alpha) {
+ if (mInFrontAlpha != alpha && shouldUpdateFrontScrimAlpha()) {
mInFrontAlpha = alpha;
updateScrims();
}
@@ -530,6 +529,19 @@
mState.PULSING.setAodFrontScrimAlpha(alpha);
}
+ private boolean shouldUpdateFrontScrimAlpha() {
+ if (mState == ScrimState.AOD
+ && (mDozeParameters.getAlwaysOn() || mDockManager.isDocked())) {
+ return true;
+ }
+
+ if (mState == ScrimState.PULSING) {
+ return true;
+ }
+
+ return false;
+ }
+
/**
* If the lock screen sensor is active.
*/
@@ -1022,10 +1034,6 @@
default void onCancelled() {
}
- /** Returns whether to timeout wallpaper or not. */
- default boolean shouldTimeoutWallpaper() {
- return false;
- }
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
index 13055ff..40f8d58 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -19,6 +19,7 @@
import android.graphics.Color;
import android.os.Trace;
+import com.android.systemui.dock.DockManager;
import com.android.systemui.statusbar.ScrimView;
import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
@@ -128,10 +129,11 @@
@Override
public void prepare(ScrimState previousState) {
final boolean alwaysOnEnabled = mDozeParameters.getAlwaysOn();
+ final boolean isDocked = mDockManager.isDocked();
mBlankScreen = mDisplayRequiresBlanking;
mFrontTint = Color.BLACK;
- mFrontAlpha = alwaysOnEnabled ? mAodFrontScrimAlpha : 1f;
+ mFrontAlpha = (alwaysOnEnabled || isDocked) ? mAodFrontScrimAlpha : 1f;
mBehindTint = Color.BLACK;
mBehindAlpha = ScrimController.TRANSPARENT;
@@ -258,6 +260,7 @@
ScrimView mScrimForBubble;
DozeParameters mDozeParameters;
+ DockManager mDockManager;
boolean mDisplayRequiresBlanking;
boolean mWallpaperSupportsAmbientMode;
boolean mHasBackdrop;
@@ -267,12 +270,13 @@
long mKeyguardFadingAwayDuration;
public void init(ScrimView scrimInFront, ScrimView scrimBehind, ScrimView scrimForBubble,
- DozeParameters dozeParameters) {
+ DozeParameters dozeParameters, DockManager dockManager) {
mScrimInFront = scrimInFront;
mScrimBehind = scrimBehind;
mScrimForBubble = scrimForBubble;
mDozeParameters = dozeParameters;
+ mDockManager = dockManager;
mDisplayRequiresBlanking = dozeParameters.getDisplayNeedsBlanking();
}
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 0e1985d..fafdf6a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -148,7 +148,6 @@
import com.android.systemui.charging.WirelessChargingAnimation;
import com.android.systemui.classifier.FalsingLog;
import com.android.systemui.colorextraction.SysuiColorExtractor;
-import com.android.systemui.doze.DozeHost;
import com.android.systemui.fragments.ExtensionFragmentListener;
import com.android.systemui.fragments.FragmentHostManager;
import com.android.systemui.keyguard.DismissCallbackRegistry;
@@ -198,7 +197,6 @@
import com.android.systemui.statusbar.notification.ActivityLaunchAnimator;
import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
-import com.android.systemui.statusbar.notification.NewNotifPipeline;
import com.android.systemui.statusbar.notification.NotificationActivityStarter;
import com.android.systemui.statusbar.notification.NotificationAlertingManager;
import com.android.systemui.statusbar.notification.NotificationClicker;
@@ -210,6 +208,7 @@
import com.android.systemui.statusbar.notification.VisualStabilityManager;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl;
+import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
@@ -222,7 +221,6 @@
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
import com.android.systemui.statusbar.policy.ExtensionController;
-import com.android.systemui.statusbar.policy.HeadsUpManager;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
import com.android.systemui.statusbar.policy.NetworkController;
@@ -795,7 +793,6 @@
R.bool.config_vibrateOnIconAnimation);
DateTimeView.setReceiverHandler(Dependency.get(Dependency.TIME_TICK_HANDLER));
- putComponent(StatusBar.class, this);
// start old BaseStatusBar.start().
mWindowManagerService = WindowManagerGlobal.getWindowManagerService();
@@ -897,7 +894,6 @@
mDozeServiceHost.initialize(this, mNotificationIconAreaController,
mStatusBarWindowViewController, mStatusBarWindow, mStatusBarKeyguardViewManager,
mNotificationPanel, mAmbientIndicationContainer);
- putComponent(DozeHost.class, mDozeServiceHost);
Dependency.get(ActivityStarterDelegate.class).setActivityStarterImpl(this);
@@ -1053,7 +1049,6 @@
mGroupManager.setHeadsUpManager(mHeadsUpManager);
mGroupAlertTransferHelper.setHeadsUpManager(mHeadsUpManager);
mNotificationLogger.setHeadsUpManager(mHeadsUpManager);
- putComponent(HeadsUpManager.class, mHeadsUpManager);
createNavigationBar(result);
@@ -1228,7 +1223,8 @@
mContext,
mAllowNotificationLongPress,
mKeyguardBypassController,
- mStatusBarStateController);
+ mStatusBarStateController,
+ mNotificationLogger);
mPresenter = new StatusBarNotificationPresenter(mContext, mNotificationPanel,
mHeadsUpManager, mStatusBarWindow, mStackScroller, mDozeScrimController,
@@ -2494,8 +2490,8 @@
}
if (DUMPTRUCK) {
- synchronized (mEntryManager.getNotificationData()) {
- mEntryManager.getNotificationData().dump(pw, " ");
+ synchronized (mEntryManager) {
+ mEntryManager.dump(pw, " ");
}
if (false) {
@@ -2753,11 +2749,7 @@
};
public void resetUserExpandedStates() {
- ArrayList<NotificationEntry> activeNotifications = mEntryManager.getNotificationData()
- .getActiveNotifications();
- final int notificationCount = activeNotifications.size();
- for (int i = 0; i < notificationCount; i++) {
- NotificationEntry entry = activeNotifications.get(i);
+ for (NotificationEntry entry : mEntryManager.getVisibleNotifications()) {
entry.resetUserExpansion();
}
}
@@ -2857,8 +2849,7 @@
try {
// consider the transition from peek to expanded to be a panel open,
// but not one that clears notification effects.
- int notificationLoad = mEntryManager.getNotificationData()
- .getActiveNotifications().size();
+ int notificationLoad = mEntryManager.getActiveNotificationsCount();
mBarService.onPanelRevealed(false, notificationLoad);
} catch (RemoteException ex) {
// Won't fail unless the world has ended.
@@ -2876,8 +2867,7 @@
!mPresenter.isPresenterFullyCollapsed() &&
(mState == StatusBarState.SHADE
|| mState == StatusBarState.SHADE_LOCKED);
- int notificationLoad = mEntryManager.getNotificationData().getActiveNotifications()
- .size();
+ int notificationLoad = mEntryManager.getActiveNotificationsCount();
if (pinnedHeadsUp && mPresenter.isPresenterFullyCollapsed()) {
notificationLoad = 1;
}
@@ -3862,10 +3852,6 @@
mScreenPinningRequest.showPrompt(taskId, allowCancel);
}
- public boolean hasActiveNotifications() {
- return !mEntryManager.getNotificationData().getActiveNotifications().isEmpty();
- }
-
@Override
public void appTransitionCancelled(int displayId) {
if (displayId == mDisplayId) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java
index 60e9385..88f1c63 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java
@@ -56,12 +56,12 @@
import com.android.systemui.statusbar.VibratorHelper;
import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
-import com.android.systemui.statusbar.notification.NewNotifPipeline;
import com.android.systemui.statusbar.notification.NotificationAlertingManager;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
+import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
import com.android.systemui.statusbar.policy.BatteryController;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
index 64a45e1..b340813 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
@@ -40,6 +40,7 @@
import android.util.EventLog;
import android.util.Log;
import android.view.RemoteAnimationAdapter;
+import android.view.View;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.IStatusBarService;
@@ -75,7 +76,7 @@
*/
public class StatusBarNotificationActivityStarter implements NotificationActivityStarter {
- private static final String TAG = "NotificationClickHandler";
+ private static final String TAG = "NotifActivityStarter";
protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private final AssistManager mAssistManager;
@@ -197,8 +198,6 @@
return;
}
- final String notificationKey = sbn.getKey();
-
boolean isActivityIntent = intent != null && intent.isActivity() && !isBubble;
final boolean afterKeyguardGone = isActivityIntent
&& mActivityIntentHelper.wouldLaunchResolverActivity(intent.getIntent(),
@@ -209,7 +208,7 @@
mLockscreenUserManager.getCurrentUserId());
ActivityStarter.OnDismissAction postKeyguardAction =
() -> handleNotificationClickAfterKeyguardDismissed(
- sbn, row, controller, intent, notificationKey,
+ sbn, row, controller, intent,
isActivityIntent, wasOccluded, showOverLockscreen);
if (showOverLockscreen) {
mIsCollapsingToShowActivityOverLockscreen = true;
@@ -225,12 +224,11 @@
ExpandableNotificationRow row,
RemoteInputController controller,
PendingIntent intent,
- String notificationKey,
boolean isActivityIntent,
boolean wasOccluded,
boolean showOverLockscreen) {
// TODO: Some of this code may be able to move to NotificationEntryManager.
- if (mHeadsUpManager != null && mHeadsUpManager.isAlerting(notificationKey)) {
+ if (mHeadsUpManager != null && mHeadsUpManager.isAlerting(sbn.getKey())) {
// Release the HUN notification to the shade.
if (mPresenter.isPresenterFullyCollapsed()) {
@@ -252,7 +250,7 @@
}
final StatusBarNotification parentToCancelFinal = parentToCancel;
final Runnable runnable = () -> handleNotificationClickAfterPanelCollapsed(
- sbn, row, controller, intent, notificationKey,
+ sbn, row, controller, intent,
isActivityIntent, wasOccluded, parentToCancelFinal);
if (showOverLockscreen) {
@@ -273,10 +271,10 @@
ExpandableNotificationRow row,
RemoteInputController controller,
PendingIntent intent,
- String notificationKey,
boolean isActivityIntent,
boolean wasOccluded,
StatusBarNotification parentToCancelFinal) {
+ String notificationKey = sbn.getKey();
try {
// The intent we are sending is for the application, which
// won't have permission to immediately start an activity after
@@ -310,7 +308,7 @@
if (!TextUtils.isEmpty(entry.remoteInputText)) {
remoteInputText = entry.remoteInputText;
}
- if (!TextUtils.isEmpty(remoteInputText) && !controller.isSpinning(entry.getKey())) {
+ if (!TextUtils.isEmpty(remoteInputText) && !controller.isSpinning(notificationKey)) {
fillInIntent = new Intent().putExtra(Notification.EXTRA_REMOTE_INPUT_DRAFT,
remoteInputText.toString());
}
@@ -326,12 +324,10 @@
collapseOnMainThread();
}
- final int count =
- mEntryManager.getNotificationData().getActiveNotifications().size();
- final int rank = mEntryManager.getNotificationData().getRank(notificationKey);
+ final int count = mEntryManager.getActiveNotificationsCount();
+ final int rank = entry.getRanking().getRank();
NotificationVisibility.NotificationLocation location =
- NotificationLogger.getNotificationLocation(
- mEntryManager.getNotificationData().get(notificationKey));
+ NotificationLogger.getNotificationLocation(entry);
final NotificationVisibility nv = NotificationVisibility.obtain(notificationKey,
rank, count, true, location);
try {
@@ -363,7 +359,7 @@
}
private void startNotificationIntent(PendingIntent intent, Intent fillInIntent,
- ExpandableNotificationRow row, boolean wasOccluded, boolean isActivityIntent) {
+ View row, boolean wasOccluded, boolean isActivityIntent) {
RemoteAnimationAdapter adapter = mActivityLaunchAnimator.getLaunchAnimation(row,
wasOccluded);
try {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java
index 38ff862..30e26e5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java
@@ -75,7 +75,7 @@
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.KeyguardStateController;
-import java.util.ArrayList;
+import java.util.List;
public class StatusBarNotificationPresenter implements NotificationPresenter,
ConfigurationController.ConfigurationListener,
@@ -252,8 +252,8 @@
}
private void updateNotificationOnUiModeChanged() {
- ArrayList<NotificationEntry> userNotifications
- = mEntryManager.getNotificationData().getNotificationsForCurrentUser();
+ List<NotificationEntry> userNotifications =
+ mEntryManager.getActiveNotificationsForCurrentUser();
for (int i = 0; i < userNotifications.size(); i++) {
NotificationEntry entry = userNotifications.get(i);
ExpandableNotificationRow row = entry.getRow();
@@ -264,8 +264,8 @@
}
private void updateNotificationsOnDensityOrFontScaleChanged() {
- ArrayList<NotificationEntry> userNotifications =
- mEntryManager.getNotificationData().getNotificationsForCurrentUser();
+ List<NotificationEntry> userNotifications =
+ mEntryManager.getActiveNotificationsForCurrentUser();
for (int i = 0; i < userNotifications.size(); i++) {
NotificationEntry entry = userNotifications.get(i);
entry.onDensityOrFontScaleChanged();
@@ -326,7 +326,7 @@
}
public boolean hasActiveNotifications() {
- return !mEntryManager.getNotificationData().getActiveNotifications().isEmpty();
+ return mEntryManager.hasActiveNotifications();
}
public boolean canHeadsUp(NotificationEntry entry, StatusBarNotification sbn) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java
index b5a7847..322b23f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java
@@ -175,7 +175,7 @@
} else {
if (row.isChildInGroup() && !row.areChildrenExpanded()) {
// The group isn't expanded, let's make sure it's visible!
- mGroupManager.toggleGroupExpansion(row.getStatusBarNotification());
+ mGroupManager.toggleGroupExpansion(row.getEntry().getSbn());
}
row.setUserExpanded(true);
row.getPrivateLayout().setOnExpandedVisibleListener(clickedView::performClick);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java
index f716443..6d6a1fe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java
@@ -35,6 +35,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.systemui.ExpandHelper;
import com.android.systemui.R;
+import com.android.systemui.dock.DockManager;
import com.android.systemui.doze.DozeLog;
import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -75,10 +76,10 @@
private PhoneStatusBarView mStatusBarView;
private StatusBar mService;
private DragDownHelper mDragDownHelper;
- private boolean mSuppressingWakeUpGesture;
private boolean mDoubleTapEnabled;
private boolean mSingleTapEnabled;
private boolean mExpandingBelowNotch;
+ private final DockManager mDockManager;
private StatusBarWindowViewController(
StatusBarWindowView view,
@@ -97,9 +98,11 @@
SysuiStatusBarStateController statusBarStateController,
DozeLog dozeLog,
DozeParameters dozeParameters,
- CommandQueue commandQueue) {
+ CommandQueue commandQueue,
+ DockManager dockManager) {
mView = view;
mFalsingManager = falsingManager;
+ mDockManager = dockManager;
// TODO: create controller for NotificationPanelView
NotificationPanelView notificationPanelView = new NotificationPanelView(
@@ -158,7 +161,7 @@
new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onSingleTapConfirmed(MotionEvent e) {
- if (mSingleTapEnabled && !mSuppressingWakeUpGesture) {
+ if (mSingleTapEnabled && !mDockManager.isDocked()) {
mService.wakeUpIfDozing(
SystemClock.uptimeMillis(), mView, "SINGLE_TAP");
return true;
@@ -185,6 +188,7 @@
boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP;
boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL;
+ boolean expandingBelowNotch = mExpandingBelowNotch;
if (isUp || isCancel) {
mExpandingBelowNotch = false;
}
@@ -233,8 +237,9 @@
// regular view bounds.
if (isDown && ev.getY() >= mView.getBottom()) {
mExpandingBelowNotch = true;
+ expandingBelowNotch = true;
}
- if (mExpandingBelowNotch) {
+ if (expandingBelowNotch) {
return mStatusBarView.dispatchTouchEvent(ev);
}
@@ -243,7 +248,7 @@
@Override
public boolean shouldInterceptTouchEvent(MotionEvent ev) {
- if (mService.isDozing() && !mService.isPulsing()) {
+ if (mService.isDozing() && !mService.isPulsing() && !mDockManager.isDocked()) {
// Capture all touch events in always-on.
return true;
}
@@ -445,10 +450,6 @@
mDragDownHelper = dragDownHelper;
}
- public void suppressWakeUpGesture(boolean suppress) {
- mSuppressingWakeUpGesture = suppress;
- }
-
/**
* When we're launching an affordance, like double pressing power to open camera.
*/
@@ -495,6 +496,7 @@
private final CommandQueue mCommandQueue;
private final SuperStatusBarViewFactory mSuperStatusBarViewFactory;
private final StatusBarWindowView mView;
+ private final DockManager mDockManager;
@Inject
public Builder(
@@ -513,7 +515,8 @@
DozeLog dozeLog,
DozeParameters dozeParameters,
CommandQueue commandQueue,
- SuperStatusBarViewFactory superStatusBarViewFactory) {
+ SuperStatusBarViewFactory superStatusBarViewFactory,
+ DockManager dockManager) {
mInjectionInflationController = injectionInflationController;
mCoordinator = coordinator;
mPulseExpansionHandler = pulseExpansionHandler;
@@ -530,8 +533,8 @@
mDozeParameters = dozeParameters;
mCommandQueue = commandQueue;
mSuperStatusBarViewFactory = superStatusBarViewFactory;
-
mView = mSuperStatusBarViewFactory.getStatusBarWindowView();
+ mDockManager = dockManager;
}
/**
@@ -563,7 +566,8 @@
mStatusBarStateController,
mDozeLog,
mDozeParameters,
- mCommandQueue);
+ mCommandQueue,
+ mDockManager);
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
index dba3b92..ddacc3a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
@@ -185,6 +185,9 @@
filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
filter.addAction(Intent.ACTION_USER_SWITCHED);
+ // NOTE: This receiver could run before this method returns, as it's not dispatching
+ // on the main thread and BroadcastDispatcher may not need to register with Context.
+ // The receiver will return immediately if the view does not have a Handler yet.
mBroadcastDispatcher.registerReceiver(mIntentReceiver, filter,
Dependency.get(Dependency.TIME_TICK_HANDLER), UserHandle.ALL);
Dependency.get(TunerService.class).addTunable(this, CLOCK_SECONDS,
@@ -197,11 +200,9 @@
mCurrentUserId = mCurrentUserTracker.getCurrentUserId();
}
- // NOTE: It's safe to do these after registering the receiver since the receiver always runs
- // in the main thread, therefore the receiver can't run before this method returns.
-
// The time zone may have changed while the receiver wasn't registered, so update the Time
mCalendar = Calendar.getInstance(TimeZone.getDefault());
+ mClockFormatString = "";
// Make sure we update to the current time
updateClock();
@@ -227,10 +228,16 @@
private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
+ // If the handler is null, it means we received a broadcast while the view has not
+ // finished being attached or in the process of being detached.
+ // In that case, do not post anything.
+ Handler handler = getHandler();
+ if (handler == null) return;
+
String action = intent.getAction();
if (action.equals(Intent.ACTION_TIMEZONE_CHANGED)) {
String tz = intent.getStringExtra("time-zone");
- getHandler().post(() -> {
+ handler.post(() -> {
mCalendar = Calendar.getInstance(TimeZone.getTimeZone(tz));
if (mClockFormat != null) {
mClockFormat.setTimeZone(mCalendar.getTimeZone());
@@ -238,14 +245,14 @@
});
} else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {
final Locale newLocale = getResources().getConfiguration().locale;
- getHandler().post(() -> {
+ handler.post(() -> {
if (!newLocale.equals(mLocale)) {
mLocale = newLocale;
mClockFormatString = ""; // force refresh
}
});
}
- getHandler().post(() -> updateClock());
+ handler.post(() -> updateClock());
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
index d488767..2e26711 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
@@ -23,6 +23,7 @@
import android.content.res.TypedArray;
import android.icu.text.DateFormat;
import android.icu.text.DisplayContext;
+import android.os.Handler;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.TextView;
@@ -47,6 +48,12 @@
private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
+ // If the handler is null, it means we received a broadcast while the view has not
+ // finished being attached or in the process of being detached.
+ // In that case, do not post anything.
+ Handler handler = getHandler();
+ if (handler == null) return;
+
final String action = intent.getAction();
if (Intent.ACTION_TIME_TICK.equals(action)
|| Intent.ACTION_TIME_CHANGED.equals(action)
@@ -55,9 +62,9 @@
if (Intent.ACTION_LOCALE_CHANGED.equals(action)
|| Intent.ACTION_TIMEZONE_CHANGED.equals(action)) {
// need to get a fresh date format
- getHandler().post(() -> mDateFormat = null);
+ handler.post(() -> mDateFormat = null);
}
- getHandler().post(() -> updateClock());
+ handler.post(() -> updateClock());
}
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
index 7587c8c..6331a2d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
@@ -111,8 +111,8 @@
if (mWifiManager != null) {
if (mListening) {
if (mCallbacks.size() == 1) {
- mWifiManager.registerSoftApCallback(this,
- new HandlerExecutor(mMainHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mMainHandler),
+ this);
} else {
// mWifiManager#registerSoftApCallback triggers a call to
// onConnectedClientsChanged on the Main Handler. In order to always update
@@ -146,7 +146,7 @@
if (mListening || !listening) return;
mListening = true;
if (mCallbacks.size() >= 1) {
- mWifiManager.registerSoftApCallback(this, new HandlerExecutor(mMainHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mMainHandler), this);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
index bae51b6..3f25bb6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -23,6 +23,8 @@
import android.os.Looper;
import android.os.Message;
import android.provider.Settings.Global;
+import android.telephony.CellSignalStrength;
+import android.telephony.CellSignalStrengthCdma;
import android.telephony.NetworkRegistrationInfo;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@@ -50,6 +52,7 @@
import java.util.BitSet;
import java.util.concurrent.Executor;
import java.util.Objects;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -477,6 +480,18 @@
}
/**
+ * Extracts the CellSignalStrengthCdma from SignalStrength then returns the level
+ */
+ private final int getCdmaLevel() {
+ List<CellSignalStrengthCdma> signalStrengthCdma =
+ mSignalStrength.getCellSignalStrengths(CellSignalStrengthCdma.class);
+ if (!signalStrengthCdma.isEmpty()) {
+ return signalStrengthCdma.get(0).getLevel();
+ }
+ return CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
+ }
+
+ /**
* Updates the current state based on mServiceState, mSignalStrength, mDataNetType,
* mDataState, and mSimState. It should be called any time one of these is updated.
* This will call listeners if necessary.
@@ -491,7 +506,7 @@
&& mSignalStrength != null;
if (mCurrentState.connected) {
if (!mSignalStrength.isGsm() && mConfig.alwaysShowCdmaRssi) {
- mCurrentState.level = mSignalStrength.getCdmaLevel();
+ mCurrentState.level = getCdmaLevel();
} else {
mCurrentState.level = mSignalStrength.getLevel();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
index 379cf1f..39de0f3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
@@ -50,8 +50,6 @@
@Override
public void start() {
- putComponent(TvStatusBar.class, this);
-
final IStatusBarService barService = IStatusBarService.Stub.asInterface(
ServiceManager.getService(Context.STATUS_BAR_SERVICE));
mCommandQueue.addCallback(this);
diff --git a/packages/SystemUI/src/com/android/systemui/util/time/SystemClock.java b/packages/SystemUI/src/com/android/systemui/util/time/SystemClock.java
new file mode 100644
index 0000000..4316df1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/time/SystemClock.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.util.time;
+
+/**
+ * Testable wrapper around {@link android.os.SystemClock}.
+ *
+ * Dagger can inject this wrapper into your classes. The implementation just proxies calls to the
+ * real SystemClock.
+ *
+ * In tests, pass an instance of FakeSystemClock, which allows you to control the values returned by
+ * the various getters below.
+ */
+public interface SystemClock {
+ /** @see android.os.SystemClock#uptimeMillis() */
+ long uptimeMillis();
+
+ /** @see android.os.SystemClock#elapsedRealtime() */
+ long elapsedRealtime();
+
+ /** @see android.os.SystemClock#elapsedRealtimeNanos() */
+ long elapsedRealtimeNanos();
+
+ /** @see android.os.SystemClock#currentThreadTimeMillis() */
+ long currentThreadTimeMillis();
+
+ /** @see android.os.SystemClock#currentThreadTimeMicro() */
+ long currentThreadTimeMicro();
+
+ /** @see android.os.SystemClock#currentTimeMicro() */
+ long currentTimeMicro();
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/time/SystemClockImpl.java b/packages/SystemUI/src/com/android/systemui/util/time/SystemClockImpl.java
new file mode 100644
index 0000000..532ea05
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/time/SystemClockImpl.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.util.time;
+
+import javax.inject.Inject;
+
+/** Default implementation of {@link SystemClock}. */
+public class SystemClockImpl implements SystemClock {
+ @Inject
+ public SystemClockImpl() {}
+
+ @Override
+ public long uptimeMillis() {
+ return android.os.SystemClock.uptimeMillis();
+ }
+
+ @Override
+ public long elapsedRealtime() {
+ return android.os.SystemClock.elapsedRealtime();
+ }
+
+ @Override
+ public long elapsedRealtimeNanos() {
+ return android.os.SystemClock.elapsedRealtimeNanos();
+ }
+
+ @Override
+ public long currentThreadTimeMillis() {
+ return android.os.SystemClock.currentThreadTimeMillis();
+ }
+
+ @Override
+ public long currentThreadTimeMicro() {
+ return android.os.SystemClock.currentThreadTimeMicro();
+ }
+
+ @Override
+ public long currentTimeMicro() {
+ return android.os.SystemClock.currentTimeMicro();
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
index da01171..02c699f 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
@@ -52,6 +52,7 @@
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
+import android.util.Slog;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.annotations.GuardedBy;
@@ -1082,10 +1083,12 @@
@Override
public void onRemoteUpdate(Token token, String name, PlaybackInfo pi) {
addStream(token, "onRemoteUpdate");
+
int stream = 0;
synchronized (mRemoteStreams) {
stream = mRemoteStreams.get(token);
}
+ Slog.d(TAG, "onRemoteUpdate: stream: " + stream + " volume: " + pi.getCurrentVolume());
boolean changed = mState.states.indexOfKey(stream) < 0;
final StreamState ss = streamStateW(stream);
ss.dynamic = true;
@@ -1101,8 +1104,7 @@
changed = true;
}
if (changed) {
- if (D.BUG) Log.d(TAG, "onRemoteUpdate: " + name + ": " + ss.level
- + " of " + ss.levelMax);
+ Log.d(TAG, "onRemoteUpdate: " + name + ": " + ss.level + " of " + ss.levelMax);
mCallbacks.onStateChanged(mState);
}
}
@@ -1115,11 +1117,13 @@
stream = mRemoteStreams.get(token);
}
final boolean showUI = shouldShowUI(flags);
+ Slog.d(TAG, "onRemoteVolumeChanged: stream: " + stream + " showui? " + showUI);
boolean changed = updateActiveStreamW(stream);
if (showUI) {
changed |= checkRoutedToBluetoothW(AudioManager.STREAM_MUSIC);
}
if (changed) {
+ Slog.d(TAG, "onRemoteChanged: updatingState");
mCallbacks.onStateChanged(mState);
}
if (showUI) {
@@ -1132,7 +1136,7 @@
int stream = 0;
synchronized (mRemoteStreams) {
if (!mRemoteStreams.containsKey(token)) {
- if (D.BUG) Log.d(TAG, "onRemoteRemoved: stream doesn't exist, "
+ Log.d(TAG, "onRemoteRemoved: stream doesn't exist, "
+ "aborting remote removed for token:" + token.toString());
return;
}
@@ -1169,7 +1173,7 @@
synchronized (mRemoteStreams) {
if (!mRemoteStreams.containsKey(token)) {
mRemoteStreams.put(token, mNextStream);
- if (D.BUG) Log.d(TAG, triggeringMethod + ": added stream " + mNextStream
+ Log.d(TAG, triggeringMethod + ": added stream " + mNextStream
+ " from token + " + token.toString());
mNextStream++;
}
diff --git a/packages/SystemUI/src/com/android/systemui/wm/DisplayWindowController.java b/packages/SystemUI/src/com/android/systemui/wm/DisplayWindowController.java
new file mode 100644
index 0000000..f3487fb
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/wm/DisplayWindowController.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.wm;
+
+import android.os.Handler;
+import android.os.RemoteException;
+import android.util.SparseArray;
+import android.view.IDisplayWindowListener;
+import android.view.IDisplayWindowRotationCallback;
+import android.view.IDisplayWindowRotationController;
+import android.view.WindowContainerTransaction;
+import android.view.WindowManagerGlobal;
+
+import com.android.systemui.dagger.qualifiers.MainHandler;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * This module deals with display rotations coming from WM. When WM starts a rotation: after it has
+ * frozen the screen, it will call into this class. This will then call all registered local
+ * controllers and give them a chance to queue up task changes to be applied synchronously with that
+ * rotation.
+ */
+@Singleton
+public class DisplayWindowController {
+ private final Handler mHandler;
+
+ private final ArrayList<OnDisplayWindowRotationController> mRotationControllers =
+ new ArrayList<>();
+ private final ArrayList<OnDisplayWindowRotationController> mTmpControllers = new ArrayList<>();
+
+ private final SparseArray<DisplayRecord> mDisplays = new SparseArray<>();
+ private final ArrayList<DisplayWindowListener> mDisplayChangedListeners = new ArrayList<>();
+
+ private final IDisplayWindowRotationController mDisplayRotationController =
+ new IDisplayWindowRotationController.Stub() {
+ @Override
+ public void onRotateDisplay(int displayId, final int fromRotation,
+ final int toRotation, IDisplayWindowRotationCallback callback) {
+ mHandler.post(() -> {
+ WindowContainerTransaction t = new WindowContainerTransaction();
+ synchronized (mRotationControllers) {
+ mTmpControllers.clear();
+ // Make a local copy in case the handlers add/remove themselves.
+ mTmpControllers.addAll(mRotationControllers);
+ }
+ for (OnDisplayWindowRotationController c : mTmpControllers) {
+ c.onRotateDisplay(displayId, fromRotation, toRotation, t);
+ }
+ try {
+ callback.continueRotateDisplay(toRotation, t);
+ } catch (RemoteException e) {
+ }
+ });
+ }
+ };
+
+ private final IDisplayWindowListener mDisplayContainerListener =
+ new IDisplayWindowListener.Stub() {
+ @Override
+ public void onDisplayAdded(int displayId) {
+ mHandler.post(() -> {
+ synchronized (mDisplays) {
+ if (mDisplays.get(displayId) != null) {
+ return;
+ }
+ DisplayRecord record = new DisplayRecord();
+ record.mDisplayId = displayId;
+ mDisplays.put(displayId, record);
+ for (DisplayWindowListener l : mDisplayChangedListeners) {
+ l.onDisplayAdded(displayId);
+ }
+ }
+ });
+ }
+
+ @Override
+ public void onDisplayRemoved(int displayId) {
+ mHandler.post(() -> {
+ synchronized (mDisplays) {
+ for (int i = mDisplayChangedListeners.size() - 1; i >= 0; --i) {
+ mDisplayChangedListeners.get(i).onDisplayRemoved(displayId);
+ }
+ mDisplays.remove(displayId);
+ }
+ });
+ }
+ };
+
+ @Inject
+ public DisplayWindowController(@MainHandler Handler mainHandler) {
+ mHandler = mainHandler;
+ try {
+ WindowManagerGlobal.getWindowManagerService().registerDisplayWindowListener(
+ mDisplayContainerListener);
+ WindowManagerGlobal.getWindowManagerService().setDisplayWindowRotationController(
+ mDisplayRotationController);
+ } catch (RemoteException e) {
+ throw new RuntimeException("Unable to register hierarchy listener");
+ }
+ }
+
+ /**
+ * Add a display window-container listener. It will get notified when displays are
+ * added/removed from the WM hierarchy.
+ */
+ public void addDisplayWindowListener(DisplayWindowListener listener) {
+ synchronized (mDisplays) {
+ if (mDisplayChangedListeners.contains(listener)) {
+ return;
+ }
+ mDisplayChangedListeners.add(listener);
+ for (int i = 0; i < mDisplays.size(); ++i) {
+ listener.onDisplayAdded(mDisplays.keyAt(i));
+ }
+ }
+ }
+
+ /**
+ * Remove a display window-container listener.
+ */
+ public void removeDisplayWindowListener(DisplayWindowListener listener) {
+ synchronized (mDisplays) {
+ mDisplayChangedListeners.remove(listener);
+ }
+ }
+
+ /**
+ * Adds a display rotation controller.
+ */
+ public void addRotationController(OnDisplayWindowRotationController controller) {
+ synchronized (mRotationControllers) {
+ mRotationControllers.add(controller);
+ }
+ }
+
+ /**
+ * Removes a display rotation controller.
+ */
+ public void removeRotationController(OnDisplayWindowRotationController controller) {
+ synchronized (mRotationControllers) {
+ mRotationControllers.remove(controller);
+ }
+ }
+
+ private static class DisplayRecord {
+ int mDisplayId;
+ }
+
+ /**
+ * Gets notified when a display is added/removed to the WM hierarchy.
+ *
+ * @see IDisplayWindowListener
+ */
+ public interface DisplayWindowListener {
+ /**
+ * Called when a display has been added to the WM hierarchy.
+ */
+ void onDisplayAdded(int displayId);
+
+ /**
+ * Called when a display is removed.
+ */
+ void onDisplayRemoved(int displayId);
+ }
+
+ /**
+ * Give a controller a chance to queue up configuration changes to execute as part of a
+ * display rotation. The contents of {@link #onRotateDisplay} must run synchronously.
+ */
+ public interface OnDisplayWindowRotationController {
+ /**
+ * Called before the display is rotated. Contents of this method must run synchronously.
+ * @param displayId Id of display that is rotating.
+ * @param fromRotation starting rotation of the display.
+ * @param toRotation target rotation of the display (after rotating).
+ * @param t A task transaction to populate.
+ */
+ void onRotateDisplay(int displayId, int fromRotation, int toRotation,
+ WindowContainerTransaction t);
+ }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
index e63b6d66..02a3766 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
@@ -102,7 +102,7 @@
public void testAppOps_appOpAddedToForegroundNotif() {
// GIVEN a notification associated with a foreground service
NotificationEntry entry = addFgEntry();
- when(mEntryManager.getPendingOrCurrentNotif(entry.getKey())).thenReturn(entry);
+ when(mEntryManager.getPendingOrActiveNotif(entry.getKey())).thenReturn(entry);
// WHEN we are notified of a new app op for this notification
mFsc.onAppOpChanged(
@@ -123,7 +123,7 @@
// GIVEN a foreground service associated notification that already has the correct app op
NotificationEntry entry = addFgEntry();
entry.mActiveAppOps.add(AppOpsManager.OP_CAMERA);
- when(mEntryManager.getPendingOrCurrentNotif(entry.getKey())).thenReturn(entry);
+ when(mEntryManager.getPendingOrActiveNotif(entry.getKey())).thenReturn(entry);
// WHEN we are notified of the same app op for this notification
mFsc.onAppOpChanged(
@@ -143,7 +143,7 @@
public void testAppOps_appOpNotAddedToUnrelatedNotif() {
// GIVEN no notification entries correspond to the newly updated appOp
NotificationEntry entry = addFgEntry();
- when(mEntryManager.getPendingOrCurrentNotif(entry.getKey())).thenReturn(null);
+ when(mEntryManager.getPendingOrActiveNotif(entry.getKey())).thenReturn(null);
// WHEN a new app op is detected
mFsc.onAppOpChanged(
diff --git a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java
index 1e9000b..ba264c0 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java
@@ -136,7 +136,6 @@
mTestableLooper.processAllMessages();
}
};
- mScreenDecorations.mComponents = mContext.getComponents();
reset(mTunerService);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java
index f792d7d..d847208 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java
@@ -17,13 +17,9 @@
import android.content.Context;
import android.testing.LeakCheck;
import android.testing.TestableContext;
-import android.util.ArrayMap;
import android.view.Display;
-public class SysuiTestableContext extends TestableContext implements SysUiServiceProvider {
-
- private ArrayMap<Class<?>, Object> mComponents;
-
+public class SysuiTestableContext extends TestableContext {
public SysuiTestableContext(Context base) {
super(base);
setTheme(R.style.Theme_SystemUI);
@@ -34,21 +30,6 @@
setTheme(R.style.Theme_SystemUI);
}
- public ArrayMap<Class<?>, Object> getComponents() {
- if (mComponents == null) mComponents = new ArrayMap<>();
- return mComponents;
- }
-
- @SuppressWarnings("unchecked")
- public <T> T getComponent(Class<T> interfaceType) {
- return (T) (mComponents != null ? mComponents.get(interfaceType) : null);
- }
-
- public <T, C extends T> void putComponent(Class<T> interfaceType, C component) {
- if (mComponents == null) mComponents = new ArrayMap<>();
- mComponents.put(interfaceType, component);
- }
-
@Override
public Context createDisplayContext(Display display) {
if (display == null) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleBehaviorControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleBehaviorControllerTest.java
index fbb8e0c..f832b7b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleBehaviorControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleBehaviorControllerTest.java
@@ -65,7 +65,7 @@
@Mock private AssistUtils mMockAssistUtils;
@Mock private Handler mMockHandler;
- @Mock private PhenotypeHelper mMockPhenotypeHelper;
+ @Mock private DeviceConfigHelper mMockDeviceConfigHelper;
@Mock private AssistHandleOffBehavior mMockOffBehavior;
@Mock private AssistHandleLikeHomeBehavior mMockLikeHomeBehavior;
@Mock private AssistHandleReminderExpBehavior mMockReminderExpBehavior;
@@ -97,7 +97,7 @@
mMockAssistUtils,
mMockHandler,
() -> mMockAssistHandleViewController,
- mMockPhenotypeHelper,
+ mMockDeviceConfigHelper,
behaviorMap,
mMockNavigationModeController,
mMockDumpController);
@@ -216,7 +216,7 @@
public void showAndGo_doesNothingIfRecentlyHidden() {
// Arrange
when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME);
- when(mMockPhenotypeHelper.getLong(
+ when(mMockDeviceConfigHelper.getLong(
eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS),
anyLong())).thenReturn(10000L);
mAssistHandleBehaviorController.showAndGo();
@@ -297,7 +297,7 @@
public void showAndGoDelayed_doesNothingIfRecentlyHidden() {
// Arrange
when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME);
- when(mMockPhenotypeHelper.getLong(
+ when(mMockDeviceConfigHelper.getLong(
eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS),
anyLong())).thenReturn(10000L);
mAssistHandleBehaviorController.showAndGo();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java
index 486fa12..f6375fc 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java
@@ -53,7 +53,6 @@
import com.android.internal.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.CommandQueue;
-import com.android.systemui.statusbar.phone.StatusBar;
import org.junit.Before;
import org.junit.Test;
@@ -88,8 +87,6 @@
TestableContext context = spy(mContext);
- mContext.putComponent(StatusBar.class, mock(StatusBar.class));
-
when(context.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE))
.thenReturn(true);
@@ -104,7 +101,6 @@
mAuthController = new TestableAuthController(
context, mock(CommandQueue.class), new MockInjector());
- mAuthController.mComponents = mContext.getComponents();
mAuthController.start();
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
index a7c0204..8c9f759 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
@@ -72,7 +72,6 @@
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationFilter;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.phone.DozeParameters;
@@ -141,8 +140,6 @@
private ExpandableNotificationRow mNonBubbleNotifRow;
@Mock
- private NotificationData mNotificationData;
- @Mock
private BubbleController.BubbleStateChangeListener mBubbleStateChangeListener;
@Mock
private BubbleController.BubbleExpandListener mBubbleExpandListener;
@@ -183,10 +180,9 @@
mNonBubbleNotifRow = mNotificationTestHelper.createRow();
// Return non-null notification data from the NEM
- when(mNotificationEntryManager.getNotificationData()).thenReturn(mNotificationData);
- when(mNotificationData.get(mRow.getEntry().getKey())).thenReturn(mRow.getEntry());
- when(mNotificationData.getChannel(mRow.getEntry().getKey())).thenReturn(
- mRow.getEntry().getChannel());
+ when(mNotificationEntryManager
+ .getActiveNotificationUnfiltered(mRow.getEntry().getKey())).thenReturn(
+ mRow.getEntry());
mZenModeConfig.suppressedVisualEffects = 0;
when(mZenModeController.getConfig()).thenReturn(mZenModeConfig);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java
index 32361cd..a9be30b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java
@@ -16,6 +16,8 @@
package com.android.systemui.bubbles;
+import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
@@ -72,6 +74,8 @@
private NotificationEntry mEntryB2;
private NotificationEntry mEntryB3;
private NotificationEntry mEntryC1;
+ private NotificationEntry mEntryInterruptive;
+ private NotificationEntry mEntryDismissed;
private Bubble mBubbleA1;
private Bubble mBubbleA2;
@@ -110,6 +114,13 @@
mEntryB3 = createBubbleEntry(1, "b3", "package.b");
mEntryC1 = createBubbleEntry(1, "c1", "package.c");
+ mEntryInterruptive = createBubbleEntry(1, "interruptive", "package.d");
+ modifyRanking(mEntryInterruptive)
+ .setVisuallyInterruptive(true)
+ .build();
+
+ mEntryDismissed = createBubbleEntry(1, "dismissed", "package.d");
+
mBubbleA1 = new Bubble(mContext, mEntryA1);
mBubbleA2 = new Bubble(mContext, mEntryA2);
mBubbleA3 = new Bubble(mContext, mEntryA3);
@@ -160,6 +171,77 @@
assertBubbleRemoved(mBubbleA1, BubbleController.DISMISS_USER_GESTURE);
}
+ @Test
+ public void ifSuppress_hideFlyout() {
+ // Setup
+ mBubbleData.setListener(mListener);
+
+ // Test
+ mBubbleData.notificationEntryUpdated(mEntryC1, /* suppressFlyout */ true, /* showInShade */
+ true);
+
+ // Verify
+ verifyUpdateReceived();
+ BubbleData.Update update = mUpdateCaptor.getValue();
+ assertThat(update.addedBubble.showFlyoutForBubble()).isFalse();
+ }
+
+ @Test
+ public void ifInterruptiveAndNotSuppressed_thenShowFlyout() {
+ // Setup
+ mBubbleData.setListener(mListener);
+
+ // Test
+ mBubbleData.notificationEntryUpdated(mEntryInterruptive, /* suppressFlyout */
+ false, /* showInShade */
+ true);
+
+ // Verify
+ verifyUpdateReceived();
+ BubbleData.Update update = mUpdateCaptor.getValue();
+ assertThat(update.addedBubble.showFlyoutForBubble()).isTrue();
+ }
+
+ @Test
+ public void sameUpdate_InShade_thenHideFlyout() {
+ // Setup
+ mBubbleData.setListener(mListener);
+
+ // Test
+ mBubbleData.notificationEntryUpdated(mEntryC1, /* suppressFlyout */ false, /* showInShade */
+ true);
+ verifyUpdateReceived();
+
+ mBubbleData.notificationEntryUpdated(mEntryC1, /* suppressFlyout */ false, /* showInShade */
+ true);
+ verifyUpdateReceived();
+
+ // Verify
+ BubbleData.Update update = mUpdateCaptor.getValue();
+ assertThat(update.updatedBubble.showFlyoutForBubble()).isFalse();
+ }
+
+ @Test
+ public void sameUpdate_NotInShade_showFlyout() {
+ // Setup
+ mBubbleData.setListener(mListener);
+ setMetadataFlags(mEntryDismissed,
+ Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION, /* enableFlag */ true);
+
+ // Test
+ mBubbleData.notificationEntryUpdated(mEntryDismissed, /* suppressFlyout */ false,
+ /* showInShade */ false);
+ verifyUpdateReceived();
+
+ mBubbleData.notificationEntryUpdated(mEntryDismissed, /* suppressFlyout */
+ false, /* showInShade */ false);
+ verifyUpdateReceived();
+
+ // Verify
+ BubbleData.Update update = mUpdateCaptor.getValue();
+ assertThat(update.updatedBubble.showFlyoutForBubble()).isTrue();
+ }
+
// COLLAPSED / ADD
/**
@@ -854,6 +936,23 @@
}
/**
+ * Sets the bubble metadata flags for this entry. These flags are normally set by
+ * NotificationManagerService when the notification is sent, however, these tests do not
+ * go through that path so we set them explicitly when testing.
+ */
+ private void setMetadataFlags(NotificationEntry entry, int flag, boolean enableFlag) {
+ Notification.BubbleMetadata bubbleMetadata =
+ entry.getSbn().getNotification().getBubbleMetadata();
+ int flags = bubbleMetadata.getFlags();
+ if (enableFlag) {
+ flags |= flag;
+ } else {
+ flags &= ~flag;
+ }
+ bubbleMetadata.setFlags(flags);
+ }
+
+ /**
* No ExpandableNotificationRow is required to test BubbleData. This setup is all that is
* required for BubbleData functionality and verification. NotificationTestHelper is used only
* as a convenience to create a Notification w/BubbleMetadata.
diff --git a/packages/SystemUI/tests/src/com/android/systemui/dock/DockManagerFake.java b/packages/SystemUI/tests/src/com/android/systemui/dock/DockManagerFake.java
index 839b5e4..466c1c4 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/dock/DockManagerFake.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/dock/DockManagerFake.java
@@ -37,6 +37,11 @@
return false;
}
+ @Override
+ public boolean isHidden() {
+ return false;
+ }
+
public void setDockEvent(int event) {
mCallback.onEvent(event);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java
index 98ec4594..c9bb401 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java
@@ -20,16 +20,11 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
import android.hardware.display.AmbientDisplayConfiguration;
-import android.os.Handler;
-import android.os.Looper;
import android.testing.AndroidTestingRunner;
-import android.testing.TestableLooper;
import android.testing.TestableLooper.RunWithLooper;
import androidx.test.filters.SmallTest;
@@ -49,10 +44,7 @@
@RunWith(AndroidTestingRunner.class)
@RunWithLooper
public class DozeDockHandlerTest extends SysuiTestCase {
- @Mock
- private DozeMachine mMachine;
- @Mock
- private DozeHost mHost;
+ @Mock private DozeMachine mMachine;
private AmbientDisplayConfiguration mConfig;
private DockManagerFake mDockManagerFake;
private DozeDockHandler mDockHandler;
@@ -61,146 +53,52 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mConfig = DozeConfigurationUtil.createMockConfig();
- doReturn(false).when(mConfig).alwaysOnEnabled(anyInt());
-
mDockManagerFake = spy(new DockManagerFake());
- mDockHandler = new DozeDockHandler(mContext, mMachine, mHost, mConfig,
- Handler.createAsync(Looper.myLooper()), mDockManagerFake);
+ mDockHandler = new DozeDockHandler(mConfig, mMachine, mDockManagerFake);
+
+ doReturn(true).when(mConfig).alwaysOnEnabled(anyInt());
+ mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
}
@Test
- public void testDockEventListener_registerAndUnregister() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
-
+ public void transitionToInitialized_registersDockEventListener() {
verify(mDockManagerFake).addListener(any());
+ }
- mDockHandler.transitionTo(DozeMachine.State.DOZE, DozeMachine.State.FINISH);
+ @Test
+ public void transitionToFinish_unregistersDockEventListener() {
+ mDockHandler.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.FINISH);
verify(mDockManagerFake).removeListener(any());
}
@Test
- public void testOnEvent_dockedWhenDoze_requestPulse() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
-
+ public void onEvent_docked_requestsDockedAodState() {
mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED);
- verify(mMachine).requestPulse(eq(DozeEvent.PULSE_REASON_DOCKING));
+ verify(mMachine).requestState(eq(State.DOZE_AOD_DOCKED));
}
@Test
- public void testOnEvent_dockedWhenDozeAoD_requestPulse() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_AOD);
-
- mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED);
-
- verify(mMachine).requestPulse(eq(DozeEvent.PULSE_REASON_DOCKING));
- }
-
- @Test
- public void testOnEvent_dockedHideWhenPulsing_requestPulseOut() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(State.DOZE_PULSING);
- when(mMachine.getPulseReason()).thenReturn(DozeEvent.PULSE_REASON_DOCKING);
-
- mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED_HIDE);
-
- verify(mHost).stopPulsing();
- }
-
- @Test
- public void testOnEvent_undockedWhenPulsing_requestPulseOut() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_PULSING);
- when(mMachine.getPulseReason()).thenReturn(DozeEvent.PULSE_REASON_DOCKING);
-
- mDockManagerFake.setDockEvent(DockManager.STATE_NONE);
-
- verify(mHost).stopPulsing();
- }
-
- @Test
- public void testOnEvent_undockedWhenDoze_neverRequestPulseOut() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
-
- mDockManagerFake.setDockEvent(DockManager.STATE_NONE);
-
- verify(mHost, never()).stopPulsing();
- }
-
- @Test
- public void testOnEvent_undockedWhenDozeAndEnabledAoD_requestDozeAoD() {
- doReturn(true).when(mConfig).alwaysOnEnabled(anyInt());
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
-
+ public void onEvent_noneWhileEnabledAod_requestsAodState() {
mDockManagerFake.setDockEvent(DockManager.STATE_NONE);
verify(mMachine).requestState(eq(State.DOZE_AOD));
}
@Test
- public void testTransitionToDoze_whenDocked_requestPulse() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.INITIALIZED);
- mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
- mDockHandler.transitionTo(State.INITIALIZED, DozeMachine.State.DOZE);
+ public void onEvent_noneWhileDisabledAod_requestsDozeState() {
+ doReturn(false).when(mConfig).alwaysOnEnabled(anyInt());
- TestableLooper.get(this).processAllMessages();
-
- verify(mMachine).requestPulse(eq(DozeEvent.PULSE_REASON_DOCKING));
- }
-
- @Test
- public void testTransitionToDozeAoD_whenDocked_requestPulse() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.INITIALIZED);
- mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_AOD);
- mDockHandler.transitionTo(State.INITIALIZED, DozeMachine.State.DOZE_AOD);
-
- TestableLooper.get(this).processAllMessages();
-
- verify(mMachine).requestPulse(eq(DozeEvent.PULSE_REASON_DOCKING));
- }
-
- @Test
- public void testTransitionToDoze_whenDockedHide_neverRequestPulse() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.INITIALIZED);
- mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED_HIDE);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
-
- mDockHandler.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE);
-
- verify(mMachine, never()).requestPulse(eq(DozeEvent.PULSE_REASON_DOCKING));
- }
-
- @Test
- public void testTransitionToDozeAoD_whenDockedHide_requestDoze() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.INITIALIZED);
- mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED_HIDE);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_AOD);
-
- mDockHandler.transitionTo(DozeMachine.State.INITIALIZED, State.DOZE_AOD);
+ mDockManagerFake.setDockEvent(DockManager.STATE_NONE);
verify(mMachine).requestState(eq(State.DOZE));
}
@Test
- public void testTransitionToPulsing_whenDockedHide_requestPulseOut() {
- mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_PULSING);
- when(mMachine.getPulseReason()).thenReturn(DozeEvent.PULSE_REASON_DOCKING);
+ public void onEvent_hide_requestsDozeState() {
mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED_HIDE);
- mDockHandler.transitionTo(DozeMachine.State.INITIALIZED, State.DOZE_PULSING);
-
- verify(mHost).stopPulsing();
+ verify(mMachine).requestState(eq(State.DOZE));
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
index bbd2ab1..0723a4c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
@@ -18,6 +18,7 @@
import static com.android.systemui.doze.DozeMachine.State.DOZE;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD;
+import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_DOCKED;
import static com.android.systemui.doze.DozeMachine.State.DOZE_PULSE_DONE;
import static com.android.systemui.doze.DozeMachine.State.DOZE_PULSING;
import static com.android.systemui.doze.DozeMachine.State.DOZE_REQUEST_PULSE;
@@ -45,6 +46,7 @@
import androidx.test.filters.SmallTest;
import com.android.systemui.SysuiTestCase;
+import com.android.systemui.dock.DockManager;
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.util.wakelock.WakeLockFake;
@@ -66,6 +68,7 @@
private WakefulnessLifecycle mWakefulnessLifecycle;
@Mock
private DozeLog mDozeLog;
+ @Mock private DockManager mDockManager;
private DozeServiceFake mServiceFake;
private WakeLockFake mWakeLockFake;
private AmbientDisplayConfiguration mConfigMock;
@@ -78,9 +81,11 @@
mWakeLockFake = new WakeLockFake();
mConfigMock = mock(AmbientDisplayConfiguration.class);
mPartMock = mock(DozeMachine.Part.class);
+ when(mDockManager.isDocked()).thenReturn(false);
+ when(mDockManager.isHidden()).thenReturn(false);
mMachine = new DozeMachine(mServiceFake, mConfigMock, mWakeLockFake,
- mWakefulnessLifecycle, mock(BatteryController.class), mDozeLog);
+ mWakefulnessLifecycle, mock(BatteryController.class), mDozeLog, mDockManager);
mMachine.setParts(new DozeMachine.Part[]{mPartMock});
}
@@ -112,6 +117,28 @@
}
@Test
+ public void testInitialize_afterDocked_goesToDockedAod() {
+ when(mDockManager.isDocked()).thenReturn(true);
+
+ mMachine.requestState(INITIALIZED);
+
+ verify(mPartMock).transitionTo(INITIALIZED, DOZE_AOD_DOCKED);
+ assertEquals(DOZE_AOD_DOCKED, mMachine.getState());
+ }
+
+ @Test
+ public void testInitialize_afterDockPaused_goesToDoze() {
+ when(mConfigMock.alwaysOnEnabled(anyInt())).thenReturn(true);
+ when(mDockManager.isDocked()).thenReturn(true);
+ when(mDockManager.isHidden()).thenReturn(true);
+
+ mMachine.requestState(INITIALIZED);
+
+ verify(mPartMock).transitionTo(INITIALIZED, DOZE);
+ assertEquals(DOZE, mMachine.getState());
+ }
+
+ @Test
public void testPulseDone_goesToDoze() {
when(mConfigMock.alwaysOnEnabled(anyInt())).thenReturn(false);
mMachine.requestState(INITIALIZED);
@@ -138,6 +165,34 @@
}
@Test
+ public void testPulseDone_afterDocked_goesToDockedAoD() {
+ when(mDockManager.isDocked()).thenReturn(true);
+ mMachine.requestState(INITIALIZED);
+ mMachine.requestPulse(DozeEvent.PULSE_REASON_NOTIFICATION);
+ mMachine.requestState(DOZE_PULSING);
+
+ mMachine.requestState(DOZE_PULSE_DONE);
+
+ verify(mPartMock).transitionTo(DOZE_PULSE_DONE, DOZE_AOD_DOCKED);
+ assertEquals(DOZE_AOD_DOCKED, mMachine.getState());
+ }
+
+ @Test
+ public void testPulseDone_afterDockPaused_goesToDoze() {
+ when(mConfigMock.alwaysOnEnabled(anyInt())).thenReturn(true);
+ when(mDockManager.isDocked()).thenReturn(true);
+ when(mDockManager.isHidden()).thenReturn(true);
+ mMachine.requestState(INITIALIZED);
+ mMachine.requestPulse(DozeEvent.PULSE_REASON_NOTIFICATION);
+ mMachine.requestState(DOZE_PULSING);
+
+ mMachine.requestState(DOZE_PULSE_DONE);
+
+ verify(mPartMock).transitionTo(DOZE_PULSE_DONE, DOZE);
+ assertEquals(DOZE, mMachine.getState());
+ }
+
+ @Test
public void testFinished_staysFinished() {
mMachine.requestState(INITIALIZED);
mMachine.requestState(FINISH);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java
index 2ed0b4f..399f723f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java
@@ -18,6 +18,7 @@
import static com.android.systemui.doze.DozeMachine.State.DOZE;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD;
+import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_DOCKED;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSED;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSING;
import static com.android.systemui.doze.DozeMachine.State.DOZE_PULSE_DONE;
@@ -172,6 +173,16 @@
}
@Test
+ public void testDockedAod_usesLightSensor() {
+ mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
+ mScreen.transitionTo(INITIALIZED, DOZE_AOD_DOCKED);
+
+ mSensor.sendSensorEvent(3);
+
+ assertEquals(3, mServiceFake.screenBrightness);
+ }
+
+ @Test
public void testDozingAfterPulsing_pausesLightSensor() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java
index b92f173..e8a3c0e 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java
@@ -18,6 +18,7 @@
import static com.android.systemui.doze.DozeMachine.State.DOZE;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD;
+import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_DOCKED;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSED;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSING;
import static com.android.systemui.doze.DozeMachine.State.DOZE_PULSING;
@@ -128,6 +129,14 @@
}
@Test
+ public void testScreen_onInDockedAod() {
+ mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
+ mScreen.transitionTo(INITIALIZED, DOZE_AOD_DOCKED);
+
+ assertEquals(Display.STATE_ON, mServiceFake.screenState);
+ }
+
+ @Test
public void test_initialScreenStatePostedToHandler() {
mHandlerFake.setMode(QUEUEING);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
index 226bf6b..bf10609 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
@@ -69,10 +69,11 @@
private AlarmManager mAlarmManager;
@Mock
private BroadcastDispatcher mBroadcastDispatcher;
+ @Mock
+ private DockManager mDockManager;
private DozeTriggers mTriggers;
private FakeSensorManager mSensors;
private Sensor mTapSensor;
- private DockManager mDockManagerFake;
private FakeProximitySensor mProximitySensor;
@Before
@@ -83,14 +84,13 @@
mSensors = spy(new FakeSensorManager(mContext));
mTapSensor = mSensors.getFakeTapSensor().getSensor();
WakeLock wakeLock = new WakeLockFake();
- mDockManagerFake = mock(DockManager.class);
AsyncSensorManager asyncSensorManager =
new AsyncSensorManager(mSensors, null, new Handler());
mProximitySensor = new FakeProximitySensor(getContext().getResources(), asyncSensorManager);
mTriggers = new DozeTriggers(mContext, mMachine, mHost, mAlarmManager, config, parameters,
asyncSensorManager, Handler.createAsync(Looper.myLooper()), wakeLock, true,
- mDockManagerFake, mProximitySensor, mock(DozeLog.class), mBroadcastDispatcher);
+ mDockManager, mProximitySensor, mock(DozeLog.class), mBroadcastDispatcher);
waitForSensorManager();
}
@@ -142,12 +142,24 @@
}
@Test
+ public void transitionToDockedAod_disablesTouchSensors() {
+ mTriggers.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE);
+ waitForSensorManager();
+ verify(mSensors).requestTriggerSensor(any(), eq(mTapSensor));
+
+ mTriggers.transitionTo(DozeMachine.State.DOZE, DozeMachine.State.DOZE_AOD_DOCKED);
+ waitForSensorManager();
+
+ verify(mSensors).cancelTriggerSensor(any(), eq(mTapSensor));
+ }
+
+ @Test
public void testDockEventListener_registerAndUnregister() {
mTriggers.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
- verify(mDockManagerFake).addListener(any());
+ verify(mDockManager).addListener(any());
mTriggers.transitionTo(DozeMachine.State.DOZE, DozeMachine.State.FINISH);
- verify(mDockManagerFake).removeListener(any());
+ verify(mDockManager).removeListener(any());
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java b/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java
index 47b35fd..e8f19238 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java
@@ -687,7 +687,6 @@
private void createPowerUi() {
mPowerUI = new PowerUI(mContext, mBroadcastDispatcher, mStatusBarLazy);
- mPowerUI.mComponents = mContext.getComponents();
mPowerUI.mThermalService = mThermalServiceMock;
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationEntryBuilder.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationEntryBuilder.java
index fcfdd11..d18b16b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationEntryBuilder.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationEntryBuilder.java
@@ -20,6 +20,7 @@
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager.Importance;
+import android.content.Context;
import android.os.UserHandle;
import android.service.notification.SnoozeCriterion;
import android.service.notification.StatusBarNotification;
@@ -92,6 +93,10 @@
return this;
}
+ public Notification.Builder modifyNotification(Context context) {
+ return mSbnBuilder.modifyNotification(context);
+ }
+
public NotificationEntryBuilder setUser(UserHandle user) {
mSbnBuilder.setUser(user);
return this;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java
index 86869bd..2f53a01 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java
@@ -37,7 +37,6 @@
import com.android.systemui.Dependency;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import org.junit.Before;
import org.junit.Test;
@@ -54,7 +53,6 @@
@Mock private NotificationPresenter mPresenter;
@Mock private NotificationListenerService.RankingMap mRanking;
- @Mock private NotificationData mNotificationData;
// Dependency mocks:
@Mock private NotificationEntryManager mEntryManager;
@@ -74,8 +72,6 @@
new Handler(TestableLooper.get(this).getLooper()));
mContext.addMockSystemService(NotificationManager.class, mNotificationManager);
- when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
-
mListener = new NotificationListener(mContext);
mSbn = new StatusBarNotification(TEST_PACKAGE_NAME, TEST_PACKAGE_NAME, 0, null, TEST_UID, 0,
new Notification(), UserHandle.CURRENT, null, 0);
@@ -90,7 +86,7 @@
@Test
public void testNotificationUpdateCallsUpdateNotification() {
- when(mNotificationData.get(mSbn.getKey()))
+ when(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()))
.thenReturn(
new NotificationEntryBuilder()
.setSbn(mSbn)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java
index 548f7a8..d54e24ba 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java
@@ -16,6 +16,7 @@
package com.android.systemui.statusbar;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.content.Intent.ACTION_USER_SWITCHED;
import static android.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL;
@@ -24,7 +25,6 @@
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -49,7 +49,6 @@
import com.android.systemui.SysuiTestCase;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -72,7 +71,6 @@
// Dependency mocks:
@Mock private NotificationEntryManager mEntryManager;
- @Mock private NotificationData mNotificationData;
@Mock private DeviceProvisionedController mDeviceProvisionedController;
@Mock private StatusBarKeyguardViewManager mKeyguardViewManager;
@Mock private BroadcastDispatcher mBroadcastDispatcher;
@@ -93,7 +91,6 @@
when(mUserManager.getProfiles(mCurrentUserId)).thenReturn(Lists.newArrayList(
new UserInfo(mCurrentUserId, "", 0), new UserInfo(mCurrentUserId + 1, "", 0)));
- when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
mDependency.injectTestDependency(Dependency.MAIN_HANDLER,
Handler.createAsync(Looper.myLooper()));
@@ -170,9 +167,10 @@
NOTIFICATION_NEW_INTERRUPTION_MODEL, 1);
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
- when(mNotificationData.isHighPriority(any())).thenReturn(false);
- NotificationEntry entry = new NotificationEntryBuilder().build();
+ NotificationEntry entry = new NotificationEntryBuilder()
+ .setImportance(IMPORTANCE_LOW)
+ .build();
entry.setBucket(BUCKET_SILENT);
assertTrue(mLockscreenUserManager.shouldShowOnKeyguard(entry));
@@ -186,10 +184,12 @@
NOTIFICATION_NEW_INTERRUPTION_MODEL, 1);
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
- when(mNotificationData.isHighPriority(any())).thenReturn(false);
- NotificationEntry entry = new NotificationEntryBuilder().build();
+ NotificationEntry entry = new NotificationEntryBuilder()
+ .setImportance(IMPORTANCE_LOW)
+ .build();
entry.setBucket(BUCKET_SILENT);
+ entry.setIsHighPriority(true);
assertFalse(mLockscreenUserManager.shouldShowOnKeyguard(entry));
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationTestHelper.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationTestHelper.java
index 90bd0e9..88546b9 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationTestHelper.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationTestHelper.java
@@ -26,7 +26,6 @@
import android.annotation.Nullable;
import android.app.ActivityManager;
-import android.app.Instrumentation;
import android.app.Notification;
import android.app.Notification.BubbleMetadata;
import android.app.NotificationChannel;
@@ -40,8 +39,6 @@
import android.view.LayoutInflater;
import android.widget.RemoteViews;
-import androidx.test.InstrumentationRegistry;
-
import com.android.systemui.TestableDependency;
import com.android.systemui.bubbles.BubbleController;
import com.android.systemui.bubbles.BubblesTestActivity;
@@ -72,7 +69,6 @@
private static final String GROUP_KEY = "gruKey";
private final Context mContext;
- private final Instrumentation mInstrumentation;
private int mId;
private final NotificationGroupManager mGroupManager;
private ExpandableNotificationRow mRow;
@@ -83,7 +79,7 @@
dependency.injectMockDependency(NotificationMediaManager.class);
dependency.injectMockDependency(BubbleController.class);
dependency.injectMockDependency(StatusBarWindowController.class);
- mInstrumentation = InstrumentationRegistry.getInstrumentation();
+ dependency.injectMockDependency(SmartReplyController.class);
StatusBarStateController stateController = mock(StatusBarStateController.class);
mGroupManager = new NotificationGroupManager(stateController);
mHeadsUpManager = new HeadsUpManagerPhone(mContext, stateController,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java
index 18649bf..46a8dad 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java
@@ -46,7 +46,6 @@
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -73,7 +72,6 @@
@TestableLooper.RunWithLooper
public class NotificationViewHierarchyManagerTest extends SysuiTestCase {
@Mock private NotificationPresenter mPresenter;
- @Mock private NotificationData mNotificationData;
@Spy private FakeListContainer mListContainer = new FakeListContainer();
// Dependency mocks:
@@ -105,8 +103,6 @@
mHelper = new NotificationTestHelper(mContext, mDependency);
- when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
-
mViewHierarchyManager = new NotificationViewHierarchyManager(mContext,
mHandler, mLockscreenUserManager, mGroupManager, mVisualStabilityManager,
mock(StatusBarStateControllerImpl.class), mEntryManager,
@@ -121,7 +117,7 @@
private NotificationEntry createEntry() throws Exception {
ExpandableNotificationRow row = mHelper.createRow();
NotificationEntry entry = new NotificationEntryBuilder()
- .setSbn(row.getStatusBarNotification())
+ .setSbn(row.getEntry().getSbn())
.build();
entry.setRow(row);
return entry;
@@ -139,7 +135,7 @@
mListContainer.addContainerView(entry0.getRow());
mListContainer.addContainerView(entry1.getRow());
mListContainer.addContainerView(entry2.getRow());
- when(mNotificationData.getActiveNotifications()).thenReturn(
+ when(mEntryManager.getVisibleNotifications()).thenReturn(
Lists.newArrayList(entry0, entry1, entry2));
// Set up group manager to report that they should be bundled now.
@@ -168,7 +164,7 @@
// Set up the prior state to look like one top level notification.
mListContainer.addContainerView(entry0.getRow());
- when(mNotificationData.getActiveNotifications()).thenReturn(
+ when(mEntryManager.getVisibleNotifications()).thenReturn(
Lists.newArrayList(entry0, entry1, entry2));
// Set up group manager to report that they should not be bundled now.
@@ -197,7 +193,7 @@
// Set up the prior state to look like a top level notification.
mListContainer.addContainerView(entry0.getRow());
- when(mNotificationData.getActiveNotifications()).thenReturn(
+ when(mEntryManager.getVisibleNotifications()).thenReturn(
Lists.newArrayList(entry0, entry1));
// Set up group manager to report a suppressed summary now.
@@ -219,7 +215,7 @@
public void testUpdateNotificationViews_appOps() throws Exception {
NotificationEntry entry0 = createEntry();
entry0.setRow(spy(entry0.getRow()));
- when(mNotificationData.getActiveNotifications()).thenReturn(
+ when(mEntryManager.getVisibleNotifications()).thenReturn(
Lists.newArrayList(entry0));
mListContainer.addContainerView(entry0.getRow());
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java
index 820f465..d003b99 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java
@@ -175,6 +175,11 @@
return this;
}
+ public RankingBuilder setVisuallyInterruptive(boolean interruptive) {
+ mIsVisuallyInterruptive = interruptive;
+ return this;
+ }
+
public RankingBuilder setImportance(@Importance int importance) {
mImportance = importance;
return this;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SbnBuilder.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/SbnBuilder.java
index 9bc962c..94b3ac4 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SbnBuilder.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/SbnBuilder.java
@@ -16,7 +16,9 @@
package com.android.systemui.statusbar;
+import android.annotation.Nullable;
import android.app.Notification;
+import android.content.Context;
import android.os.UserHandle;
import android.service.notification.StatusBarNotification;
@@ -32,7 +34,9 @@
private String mTag;
private int mUid;
private int mInitialPid;
- private Notification mNotification = new Notification();
+ @Nullable private Notification mNotification;
+ @Nullable private Notification.Builder mNotificationBuilder;
+ private Notification.BubbleMetadata mBubbleMetadata;
private UserHandle mUser = UserHandle.of(0);
private String mOverrideGroupKey;
private long mPostTime;
@@ -54,6 +58,19 @@
}
public StatusBarNotification build() {
+ Notification notification;
+ if (mNotificationBuilder != null) {
+ notification = mNotificationBuilder.build();
+ } else if (mNotification != null) {
+ notification = mNotification;
+ } else {
+ notification = new Notification();
+ }
+
+ if (mBubbleMetadata != null) {
+ notification.setBubbleMetadata(mBubbleMetadata);
+ }
+
return new StatusBarNotification(
mPkg,
mOpPkg,
@@ -61,7 +78,7 @@
mTag,
mUid,
mInitialPid,
- mNotification,
+ notification,
mUser,
mOverrideGroupKey,
mPostTime);
@@ -102,6 +119,17 @@
return this;
}
+ public Notification.Builder modifyNotification(Context context) {
+ if (mNotification != null) {
+ mNotificationBuilder = new Notification.Builder(context, mNotification);
+ mNotification = null;
+ } else if (mNotificationBuilder == null) {
+ mNotificationBuilder = new Notification.Builder(context);
+ }
+
+ return mNotificationBuilder;
+ }
+
public SbnBuilder setUser(UserHandle user) {
mUser = user;
return this;
@@ -116,4 +144,9 @@
mPostTime = postTime;
return this;
}
+
+ public SbnBuilder setBubbleMetadata(Notification.BubbleMetadata data) {
+ mBubbleMetadata = data;
+ return this;
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
index 86ef6e8..a98945f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.notification;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.service.notification.NotificationListenerService.REASON_CANCEL;
import static com.android.systemui.statusbar.notification.NotificationEntryManager.UNDEFINED_DISMISS_REASON;
@@ -28,7 +29,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
@@ -40,14 +40,15 @@
import android.app.ActivityManager;
import android.app.Notification;
-import android.app.NotificationManager;
+import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
-import android.service.notification.NotificationListenerService;
+import android.service.notification.NotificationListenerService.Ranking;
+import android.service.notification.NotificationListenerService.RankingMap;
import android.service.notification.StatusBarNotification;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -73,18 +74,18 @@
import com.android.systemui.statusbar.NotificationPresenter;
import com.android.systemui.statusbar.NotificationRemoteInputManager;
import com.android.systemui.statusbar.NotificationRemoveInterceptor;
+import com.android.systemui.statusbar.RankingBuilder;
import com.android.systemui.statusbar.RemoteInputController;
import com.android.systemui.statusbar.SmartReplyController;
import com.android.systemui.statusbar.StatusBarIconView;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
-import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment;
+import com.android.systemui.statusbar.notification.NotificationEntryManager.KeyguardEnvironment;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+import com.android.systemui.statusbar.notification.collection.NotificationRankingManager;
import com.android.systemui.statusbar.notification.collection.NotificationRowBinder;
import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl;
import com.android.systemui.statusbar.notification.logging.NotifLog;
-import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier;
+import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
-import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
import com.android.systemui.statusbar.notification.row.RowInflaterTask;
import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
@@ -93,6 +94,7 @@
import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.HeadsUpManager;
+import com.android.systemui.util.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -104,13 +106,14 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@SmallTest
@RunWith(AndroidTestingRunner.class)
-@TestableLooper.RunWithLooper
+@TestableLooper.RunWithLooper()
public class NotificationEntryManagerTest extends SysuiTestCase {
private static final String TEST_PACKAGE_NAME = "test";
private static final int TEST_UID = 0;
@@ -123,7 +126,7 @@
@Mock private NotificationRemoveInterceptor mRemoveInterceptor;
@Mock private NotificationRowBinderImpl.BindRowCallback mBindCallback;
@Mock private HeadsUpManager mHeadsUpManager;
- @Mock private NotificationListenerService.RankingMap mRankingMap;
+ @Mock private RankingMap mRankingMap;
@Mock private RemoteInputController mRemoteInputController;
// Dependency mocks:
@@ -139,6 +142,7 @@
@Mock private SmartReplyController mSmartReplyController;
@Mock private RowInflaterTask mAsyncInflationTask;
@Mock private NotificationRowBinder mMockedRowBinder;
+ @Mock private NotifLog mNotifLog;
private int mId;
private NotificationEntry mEntry;
@@ -146,43 +150,9 @@
private TestableNotificationEntryManager mEntryManager;
private CountDownLatch mCountDownLatch;
- private class TestableNotificationEntryManager extends NotificationEntryManager {
- private final CountDownLatch mCountDownLatch;
-
- TestableNotificationEntryManager() {
- super(
- new NotificationData(
- mock(NotificationSectionsFeatureManager.class),
- mock(NotifLog.class),
- mock(PeopleNotificationIdentifier.class)),
- mock(NotifLog.class));
- mCountDownLatch = new CountDownLatch(1);
- }
-
- public void setNotificationData(NotificationData data) {
- mNotificationData = data;
- }
-
- @Override
- public void onAsyncInflationFinished(NotificationEntry entry,
- @InflationFlag int inflatedFlags) {
- super.onAsyncInflationFinished(entry, inflatedFlags);
-
- mCountDownLatch.countDown();
- }
-
- public CountDownLatch getCountDownLatch() {
- return mCountDownLatch;
- }
-
- public ArrayList<NotificationLifetimeExtender> getLifetimeExtenders() {
- return mNotificationLifetimeExtenders;
- }
- }
-
private void setUserSentiment(String key, int sentiment) {
doAnswer(invocationOnMock -> {
- NotificationListenerService.Ranking ranking = (NotificationListenerService.Ranking)
+ Ranking ranking = (Ranking)
invocationOnMock.getArguments()[1];
ranking.populate(
key,
@@ -190,16 +160,16 @@
false,
0,
0,
- NotificationManager.IMPORTANCE_DEFAULT,
+ IMPORTANCE_DEFAULT,
null, null,
null, null, null, true, sentiment, false, -1, false, null, null, false, false);
return true;
- }).when(mRankingMap).getRanking(eq(key), any(NotificationListenerService.Ranking.class));
+ }).when(mRankingMap).getRanking(eq(key), any(Ranking.class));
}
private void setSmartActions(String key, ArrayList<Notification.Action> smartActions) {
doAnswer(invocationOnMock -> {
- NotificationListenerService.Ranking ranking = (NotificationListenerService.Ranking)
+ Ranking ranking = (Ranking)
invocationOnMock.getArguments()[1];
ranking.populate(
key,
@@ -207,13 +177,13 @@
false,
0,
0,
- NotificationManager.IMPORTANCE_DEFAULT,
+ IMPORTANCE_DEFAULT,
null, null,
null, null, null, true,
- NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL, false, -1,
+ Ranking.USER_SENTIMENT_NEUTRAL, false, -1,
false, smartActions, null, false, false);
return true;
- }).when(mRankingMap).getRanking(eq(key), any(NotificationListenerService.Ranking.class));
+ }).when(mRankingMap).getRanking(eq(key), any(Ranking.class));
}
@Before
@@ -249,7 +219,18 @@
mEntry.expandedIcon = mock(StatusBarIconView.class);
- mEntryManager = new TestableNotificationEntryManager();
+ mEntryManager = new TestableNotificationEntryManager(
+ mNotifLog,
+ mGroupManager,
+ new NotificationRankingManager(
+ () -> mock(NotificationMediaManager.class),
+ mGroupManager,
+ mHeadsUpManager,
+ mock(NotificationFilter.class),
+ mNotifLog,
+ mock(NotificationSectionsFeatureManager.class)),
+ mEnvironment
+ );
Dependency.get(InitController.class).executePostInitTasks();
mEntryManager.setUpWithPresenter(mPresenter, mListContainer, mHeadsUpManager);
mEntryManager.addNotificationEntryListener(mEntryListener);
@@ -258,19 +239,19 @@
NotificationRowBinderImpl notificationRowBinder =
new NotificationRowBinderImpl(mContext, true, /* allowLongPress */
mock(KeyguardBypassController.class),
- mock(StatusBarStateController.class));
+ mock(StatusBarStateController.class),
+ mock(NotificationLogger.class));
notificationRowBinder.setUpWithPresenter(
mPresenter, mListContainer, mHeadsUpManager, mEntryManager, mBindCallback);
notificationRowBinder.setNotificationClicker(mock(NotificationClicker.class));
mEntryManager.setRowBinder(notificationRowBinder);
setUserSentiment(
- mEntry.getKey(), NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL);
+ mEntry.getKey(), Ranking.USER_SENTIMENT_NEUTRAL);
}
@Test
public void testAddNotification() throws Exception {
- com.android.systemui.util.Assert.isNotMainThread();
TestableLooper.get(this).processAllMessages();
doAnswer(invocation -> {
@@ -299,21 +280,20 @@
verify(mEntryListener).onNotificationAdded(entry);
verify(mPresenter).updateNotificationViews();
- assertEquals(mEntryManager.getNotificationData().get(mSbn.getKey()), entry);
+ assertEquals(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()), entry);
assertNotNull(entry.getRow());
assertEquals(mEntry.getUserSentiment(),
- NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL);
+ Ranking.USER_SENTIMENT_NEUTRAL);
}
@Test
public void testUpdateNotification() throws Exception {
- com.android.systemui.util.Assert.isNotMainThread();
TestableLooper.get(this).processAllMessages();
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
setUserSentiment(
- mEntry.getKey(), NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE);
+ mEntry.getKey(), Ranking.USER_SENTIMENT_NEGATIVE);
mEntryManager.updateNotification(mSbn, mRankingMap);
TestableLooper.get(this).processMessages(1);
@@ -327,19 +307,15 @@
verify(mEntryListener).onPostEntryUpdated(mEntry);
assertNotNull(mEntry.getRow());
- assertEquals(mEntry.getUserSentiment(),
- NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE);
+ assertEquals(Ranking.USER_SENTIMENT_NEGATIVE,
+ mEntry.getUserSentiment());
}
@Test
public void testUpdateNotification_prePostEntryOrder() throws Exception {
- com.android.systemui.util.Assert.isNotMainThread();
TestableLooper.get(this).processAllMessages();
- NotificationData notifData = mock(NotificationData.class);
- when(notifData.get(mEntry.getKey())).thenReturn(mEntry);
-
- mEntryManager.setNotificationData(notifData);
+ mEntryManager.addActiveNotificationForTest(mEntry);
mEntryManager.updateNotification(mSbn, mRankingMap);
TestableLooper.get(this).processMessages(1);
@@ -349,9 +325,8 @@
verify(mEntryListener, never()).onInflationError(any(), any());
// Ensure that update callbacks happen in correct order
- InOrder order = inOrder(mEntryListener, notifData, mPresenter, mEntryListener);
+ InOrder order = inOrder(mEntryListener, mPresenter, mEntryListener);
order.verify(mEntryListener).onPreEntryUpdated(mEntry);
- order.verify(notifData).filterAndSort(anyString());
order.verify(mPresenter).updateNotificationViews();
order.verify(mEntryListener).onPostEntryUpdated(mEntry);
@@ -359,11 +334,12 @@
}
@Test
- public void testRemoveNotification() throws Exception {
- com.android.systemui.util.Assert.isNotMainThread();
+ public void testRemoveNotification() {
+ // Row inflation happens off thread, so pretend that this test looper is main
+ Assert.sMainLooper = TestableLooper.get(this).getLooper();
mEntry.setRow(mRow);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
mEntryManager.removeNotification(mSbn.getKey(), mRankingMap, UNDEFINED_DISMISS_REASON);
@@ -374,12 +350,11 @@
eq(mEntry), any(), eq(false) /* removedByUser */);
verify(mRow).setRemoved();
- assertNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
+ assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
}
@Test
public void testRemoveNotification_onEntryRemoveNotFiredIfEntryDoesntExist() {
- com.android.systemui.util.Assert.isNotMainThread();
mEntryManager.removeNotification("not_a_real_key", mRankingMap, UNDEFINED_DISMISS_REASON);
@@ -388,8 +363,7 @@
}
@Test
- public void testRemoveNotification_whilePending() throws InterruptedException {
- com.android.systemui.util.Assert.isNotMainThread();
+ public void testRemoveNotification_whilePending() {
mEntryManager.setRowBinder(mMockedRowBinder);
@@ -408,7 +382,7 @@
mEntry.setRow(mRow);
mEntry.setInflationTask(mAsyncInflationTask);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
setSmartActions(mEntry.getKey(), new ArrayList<>(Arrays.asList(createAction())));
mEntryManager.updateNotificationRanking(mRankingMap);
@@ -424,7 +398,7 @@
when(mEnvironment.isNotificationForCurrentProfiles(any())).thenReturn(true);
mEntry.setRow(mRow);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
setSmartActions(mEntry.getKey(), null);
mEntryManager.updateNotificationRanking(mRankingMap);
@@ -438,7 +412,7 @@
when(mEnvironment.isNotificationForCurrentProfiles(any())).thenReturn(true);
mEntry.setRow(null);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
setSmartActions(mEntry.getKey(), new ArrayList<>(Arrays.asList(createAction())));
mEntryManager.updateNotificationRanking(mRankingMap);
@@ -466,7 +440,7 @@
public void testLifetimeExtenders_ifNotificationIsRetainedItIsntRemoved() {
// GIVEN an entry manager with a notification
mEntryManager.setRowBinder(mMockedRowBinder);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
// GIVEN a lifetime extender that always tries to extend lifetime
NotificationLifetimeExtender extender = mock(NotificationLifetimeExtender.class);
@@ -479,15 +453,18 @@
// THEN the extender is asked to manage the lifetime
verify(extender).setShouldManageLifetime(mEntry, true);
// THEN the notification is retained
- assertNotNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
+ assertNotNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener, never()).onEntryRemoved(eq(mEntry), any(), eq(false));
}
@Test
public void testLifetimeExtenders_whenRetentionEndsNotificationIsRemoved() {
+ // Row inflation happens off thread, so pretend that this test looper is main
+ Assert.sMainLooper = TestableLooper.get(this).getLooper();
+
// GIVEN an entry manager with a notification whose life has been extended
mEntryManager.setRowBinder(mMockedRowBinder);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
final FakeNotificationLifetimeExtender extender = new FakeNotificationLifetimeExtender();
mEntryManager.addNotificationLifetimeExtender(extender);
mEntryManager.removeNotification(mEntry.getKey(), mRankingMap, UNDEFINED_DISMISS_REASON);
@@ -498,7 +475,7 @@
extender.getCallback().onSafeToRemove(mEntry.getKey());
// THEN the notification is removed
- assertNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
+ assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener).onEntryRemoved(eq(mEntry), any(), eq(false));
}
@@ -506,7 +483,7 @@
public void testLifetimeExtenders_whenNotificationUpdatedRetainersAreCanceled() {
// GIVEN an entry manager with a notification whose life has been extended
mEntryManager.setRowBinder(mMockedRowBinder);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
NotificationLifetimeExtender extender = mock(NotificationLifetimeExtender.class);
when(extender.shouldExtendLifetime(mEntry)).thenReturn(true);
mEntryManager.addNotificationLifetimeExtender(extender);
@@ -523,7 +500,7 @@
public void testLifetimeExtenders_whenNewExtenderTakesPrecedenceOldExtenderIsCanceled() {
// GIVEN an entry manager with a notification
mEntryManager.setRowBinder(mMockedRowBinder);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
// GIVEN two lifetime extenders, the first which never extends and the second which
// always extends
@@ -554,15 +531,15 @@
*/
@Test
public void testPerformRemoveNotification_removedEntry() {
- mEntryManager.getNotificationData().remove(mSbn.getKey(), null /* ranking */);
+ mEntryManager.removeNotification(mSbn.getKey(), null, 0);
mEntryManager.performRemoveNotification(mSbn, REASON_CANCEL);
}
@Test
- public void testRemoveInterceptor_interceptsDontGetRemoved() {
+ public void testRemoveInterceptor_interceptsDontGetRemoved() throws InterruptedException {
// GIVEN an entry manager with a notification
mEntryManager.setRowBinder(mMockedRowBinder);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
// GIVEN interceptor that intercepts that entry
when(mRemoveInterceptor.onNotificationRemoveRequested(eq(mEntry.getKey()), anyInt()))
@@ -572,16 +549,19 @@
mEntryManager.removeNotification(mEntry.getKey(), mRankingMap, UNDEFINED_DISMISS_REASON);
// THEN the interceptor intercepts & the entry is not removed & no listeners are called
- assertNotNull(mEntryManager.getNotificationData().get(mEntry.getKey()));
+ assertNotNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener, never()).onEntryRemoved(eq(mEntry),
any(NotificationVisibility.class), anyBoolean());
}
@Test
public void testRemoveInterceptor_notInterceptedGetsRemoved() {
+ // Row inflation happens off thread, so pretend that this test looper is main
+ Assert.sMainLooper = TestableLooper.get(this).getLooper();
+
// GIVEN an entry manager with a notification
mEntryManager.setRowBinder(mMockedRowBinder);
- mEntryManager.getNotificationData().add(mEntry);
+ mEntryManager.addActiveNotificationForTest(mEntry);
// GIVEN interceptor that doesn't intercept
when(mRemoveInterceptor.onNotificationRemoveRequested(eq(mEntry.getKey()), anyInt()))
@@ -591,7 +571,7 @@
mEntryManager.removeNotification(mEntry.getKey(), mRankingMap, UNDEFINED_DISMISS_REASON);
// THEN the interceptor intercepts & the entry is not removed & no listeners are called
- assertNull(mEntryManager.getNotificationData().get(mEntry.getKey()));
+ assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener, atLeastOnce()).onEntryRemoved(eq(mEntry),
any(NotificationVisibility.class), anyBoolean());
}
@@ -612,6 +592,63 @@
.build();
}
+ /* Tests annexed from NotificationDataTest go here */
+
+ @Test
+ public void testChannelIsSetWhenAdded() {
+ NotificationChannel nc = new NotificationChannel(
+ "testId",
+ "testName",
+ IMPORTANCE_DEFAULT);
+
+ Ranking r = new RankingBuilder()
+ .setKey(mEntry.getKey())
+ .setChannel(nc)
+ .build();
+
+ RankingMap rm = new RankingMap(new Ranking[] { r });
+
+ // GIVEN: a notification is added, and the ranking updated
+ mEntryManager.addActiveNotificationForTest(mEntry);
+ mEntryManager.updateRanking(rm, "testReason");
+
+ // THEN the notification entry better have a channel on it
+ assertEquals(
+ "Channel must be set when adding a notification",
+ nc.getName(),
+ mEntry.getChannel().getName());
+ }
+
+ @Test
+ public void testGetNotificationsForCurrentUser_shouldFilterNonCurrentUserNotifications() {
+ Assert.sMainLooper = TestableLooper.get(this).getLooper();
+ Notification.Builder n = new Notification.Builder(mContext, "")
+ .setSmallIcon(R.drawable.ic_person)
+ .setContentTitle("Title")
+ .setContentText("Text");
+
+ NotificationEntry e2 = new NotificationEntryBuilder()
+ .setPkg(TEST_PACKAGE_NAME)
+ .setOpPkg(TEST_PACKAGE_NAME)
+ .setUid(TEST_UID)
+ .setId(mId++)
+ .setNotification(n.build())
+ .setUser(new UserHandle(ActivityManager.getCurrentUser()))
+ .build();
+
+ mEntryManager.addActiveNotificationForTest(mEntry);
+ mEntryManager.addActiveNotificationForTest(e2);
+
+ when(mEnvironment.isNotificationForCurrentProfiles(mEntry.getSbn())).thenReturn(false);
+ when(mEnvironment.isNotificationForCurrentProfiles(e2.getSbn())).thenReturn(true);
+
+ List<NotificationEntry> result = mEntryManager.getActiveNotificationsForCurrentUser();
+ assertEquals(result.size(), 1);
+ junit.framework.Assert.assertEquals(result.get(0), e2);
+ }
+
+ /* End annex */
+
private Notification.Action createAction() {
return new Notification.Action.Builder(
Icon.createWithResource(getContext(), android.R.drawable.sym_def_app_icon),
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationFilterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationFilterTest.java
index d85f275..68730d1 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationFilterTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationFilterTest.java
@@ -44,7 +44,7 @@
import com.android.systemui.statusbar.NotificationEntryBuilder;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
import com.android.systemui.statusbar.NotificationTestHelper;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
+import com.android.systemui.statusbar.notification.NotificationEntryManager.KeyguardEnvironment;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.phone.NotificationGroupManager;
@@ -71,7 +71,7 @@
@Mock
ForegroundServiceController mFsc;
@Mock
- NotificationData.KeyguardEnvironment mEnvironment;
+ KeyguardEnvironment mEnvironment;
private final IPackageManager mMockPackageManager = mock(IPackageManager.class);
private NotificationFilter mNotificationFilter;
@@ -96,7 +96,7 @@
new NotificationGroupManager(mock(StatusBarStateController.class)));
mDependency.injectMockDependency(ShadeController.class);
mDependency.injectMockDependency(NotificationLockscreenUserManager.class);
- mDependency.injectTestDependency(NotificationData.KeyguardEnvironment.class, mEnvironment);
+ mDependency.injectTestDependency(KeyguardEnvironment.class, mEnvironment);
when(mEnvironment.isDeviceProvisioned()).thenReturn(true);
when(mEnvironment.isNotificationForCurrentProfiles(any())).thenReturn(true);
mRow = new NotificationTestHelper(getContext(), mDependency).createRow();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java
index cc56949..133d52b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java
@@ -17,9 +17,7 @@
package com.android.systemui.statusbar.notification;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.app.Notification;
@@ -34,14 +32,10 @@
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.NotificationEntryBuilder;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
-import com.android.systemui.statusbar.notification.logging.NotifLog;
-import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier;
import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
-import com.android.systemui.util.DeviceConfigProxyFake;
import org.junit.Before;
import org.junit.Test;
@@ -67,13 +61,6 @@
private NotificationEntryListener mEntryListener;
private DeviceProvisionedListener mProvisionedListener;
- // TODO: Remove this once EntryManager no longer needs to be mocked
- private NotificationData mNotificationData =
- new NotificationData(
- new NotificationSectionsFeatureManager(new DeviceConfigProxyFake(), mContext),
- mock(NotifLog.class),
- mock(PeopleNotificationIdentifier.class));
-
private int mNextNotifId = 0;
@Before
@@ -81,8 +68,6 @@
MockitoAnnotations.initMocks(this);
mDependency.injectMockDependency(NotificationLockscreenUserManager.class);
- when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
-
mController = new NotificationListController(
mEntryManager,
mListContainer,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/TestableNotificationEntryManager.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/TestableNotificationEntryManager.kt
new file mode 100644
index 0000000..34beefe
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/TestableNotificationEntryManager.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification
+
+import com.android.systemui.statusbar.NotificationPresenter
+import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.statusbar.notification.collection.NotificationRankingManager
+import com.android.systemui.statusbar.notification.logging.NotifLog
+import com.android.systemui.statusbar.notification.stack.NotificationListContainer
+import com.android.systemui.statusbar.phone.HeadsUpManagerPhone
+import com.android.systemui.statusbar.phone.NotificationGroupManager
+
+import java.util.concurrent.CountDownLatch
+
+/**
+ * Enable some test capabilities for NEM without making everything public on the base class
+ */
+class TestableNotificationEntryManager(
+ log: NotifLog,
+ gm: NotificationGroupManager,
+ rm: NotificationRankingManager,
+ ke: KeyguardEnvironment
+) : NotificationEntryManager(log, gm, rm, ke) {
+
+ public var countDownLatch: CountDownLatch = CountDownLatch(1)
+
+ override fun onAsyncInflationFinished(entry: NotificationEntry?, inflatedFlags: Int) {
+ super.onAsyncInflationFinished(entry, inflatedFlags)
+ countDownLatch.countDown()
+ }
+
+ fun setUpForTest(
+ presenter: NotificationPresenter?,
+ listContainer: NotificationListContainer?,
+ headsUpManager: HeadsUpManagerPhone?
+ ) {
+ super.setUpWithPresenter(presenter, listContainer, headsUpManager)
+ }
+
+ fun setActiveNotificationList(activeList: List<NotificationEntry>) {
+ mSortedAndFiltered.clear()
+ mSortedAndFiltered.addAll(activeList)
+ }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImplTest.java
new file mode 100644
index 0000000..a25af84
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifListBuilderImplTest.java
@@ -0,0 +1,1197 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection;
+
+import static com.android.internal.util.Preconditions.checkNotNull;
+import static com.android.systemui.statusbar.notification.collection.ListDumper.dumpList;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+import android.util.ArrayMap;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.systemui.SysuiTestCase;
+import com.android.systemui.statusbar.NotificationEntryBuilder;
+import com.android.systemui.statusbar.notification.collection.NotifListBuilderImpl.OnRenderListListener;
+import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener;
+import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeSortListener;
+import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeTransformGroupsListener;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.SectionsProvider;
+import com.android.systemui.util.Assert;
+import com.android.systemui.util.time.FakeSystemClock;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@SmallTest
+@RunWith(AndroidTestingRunner.class)
+@TestableLooper.RunWithLooper
+public class NotifListBuilderImplTest extends SysuiTestCase {
+
+ private NotifListBuilderImpl mListBuilder;
+ private FakeSystemClock mSystemClock = new FakeSystemClock();
+
+ @Mock private NotifCollection mNotifCollection;
+ @Spy private OnBeforeTransformGroupsListener mOnBeforeTransformGroupsListener;
+ @Spy private OnBeforeSortListener mOnBeforeSortListener;
+ @Spy private OnBeforeRenderListListener mOnBeforeRenderListListener;
+ @Spy private OnRenderListListener mOnRenderListListener = list -> mBuiltList = list;
+
+ @Captor private ArgumentCaptor<CollectionReadyForBuildListener> mBuildListenerCaptor;
+
+ private CollectionReadyForBuildListener mReadyForBuildListener;
+ private List<NotificationEntryBuilder> mPendingSet = new ArrayList<>();
+ private List<NotificationEntry> mEntrySet = new ArrayList<>();
+ private List<ListEntry> mBuiltList;
+
+ private Map<String, Integer> mNextIdMap = new ArrayMap<>();
+ private int mNextRank = 0;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ Assert.sMainLooper = TestableLooper.get(this).getLooper();
+
+ mListBuilder = new NotifListBuilderImpl(mSystemClock);
+ mListBuilder.setOnRenderListListener(mOnRenderListListener);
+
+ mListBuilder.attach(mNotifCollection);
+
+ Mockito.verify(mNotifCollection).setBuildListener(mBuildListenerCaptor.capture());
+ mReadyForBuildListener = checkNotNull(mBuildListenerCaptor.getValue());
+ }
+
+ @Test
+ public void testNotifsAreSortedByRankAndWhen() {
+ // GIVEN a simple pipeline
+
+ // WHEN a series of notifs with jumbled ranks are added
+ addNotif(0, PACKAGE_1).setRank(2);
+ addNotif(1, PACKAGE_2).setRank(4).modifyNotification(mContext).setWhen(22);
+ addNotif(2, PACKAGE_3).setRank(4).modifyNotification(mContext).setWhen(33);
+ addNotif(3, PACKAGE_3).setRank(3);
+ addNotif(4, PACKAGE_5).setRank(4).modifyNotification(mContext).setWhen(11);
+ addNotif(5, PACKAGE_3).setRank(1);
+ addNotif(6, PACKAGE_1).setRank(0);
+ dispatchBuild();
+
+ // The final output is sorted based first by rank and then by when
+ verifyBuiltList(
+ notif(6),
+ notif(5),
+ notif(0),
+ notif(3),
+ notif(2),
+ notif(1),
+ notif(4)
+ );
+ }
+
+ @Test
+ public void testNotifsAreGrouped() {
+ // GIVEN a simple pipeline
+
+ // WHEN a group is added
+ addGroupChild(0, PACKAGE_1, GROUP_1);
+ addGroupChild(1, PACKAGE_1, GROUP_1);
+ addGroupChild(2, PACKAGE_1, GROUP_1);
+ addGroupSummary(3, PACKAGE_1, GROUP_1);
+ dispatchBuild();
+
+ // THEN the notifs are grouped together
+ verifyBuiltList(
+ group(
+ summary(3),
+ child(0),
+ child(1),
+ child(2)
+ )
+ );
+ }
+
+ @Test
+ public void testNotifsWithDifferentGroupKeysAreGrouped() {
+ // GIVEN a simple pipeline
+
+ // WHEN a package posts two different groups
+ addGroupChild(0, PACKAGE_1, GROUP_1);
+ addGroupChild(1, PACKAGE_1, GROUP_2);
+ addGroupSummary(2, PACKAGE_1, GROUP_2);
+ addGroupChild(3, PACKAGE_1, GROUP_2);
+ addGroupChild(4, PACKAGE_1, GROUP_1);
+ addGroupChild(5, PACKAGE_1, GROUP_2);
+ addGroupChild(6, PACKAGE_1, GROUP_1);
+ addGroupSummary(7, PACKAGE_1, GROUP_1);
+ dispatchBuild();
+
+ // THEN the groups are separated separately
+ verifyBuiltList(
+ group(
+ summary(2),
+ child(1),
+ child(3),
+ child(5)
+ ),
+ group(
+ summary(7),
+ child(0),
+ child(4),
+ child(6)
+ )
+ );
+ }
+
+ @Test
+ public void testNotifsNotifChildrenAreSorted() {
+ // GIVEN a simple pipeline
+
+ // WHEN a group is added
+ addGroupChild(0, PACKAGE_1, GROUP_1).setRank(4);
+ addGroupChild(1, PACKAGE_1, GROUP_1).setRank(2)
+ .modifyNotification(mContext).setWhen(11);
+ addGroupChild(2, PACKAGE_1, GROUP_1).setRank(1);
+ addGroupChild(3, PACKAGE_1, GROUP_1).setRank(2)
+ .modifyNotification(mContext).setWhen(33);
+ addGroupChild(4, PACKAGE_1, GROUP_1).setRank(2)
+ .modifyNotification(mContext).setWhen(22);
+ addGroupChild(5, PACKAGE_1, GROUP_1).setRank(0);
+ addGroupSummary(6, PACKAGE_1, GROUP_1).setRank(3);
+ dispatchBuild();
+
+ // THEN the children are sorted by rank and when
+ verifyBuiltList(
+ group(
+ summary(6),
+ child(5),
+ child(2),
+ child(3),
+ child(4),
+ child(1),
+ child(0)
+ )
+ );
+ }
+
+ @Test
+ public void testDuplicateGroupSummariesAreDiscarded() {
+ // GIVEN a simple pipeline
+
+ // WHEN a group with multiple summaries is added
+ addNotif(0, PACKAGE_3);
+ addGroupChild(1, PACKAGE_1, GROUP_1);
+ addGroupChild(2, PACKAGE_1, GROUP_1);
+ addGroupSummary(3, PACKAGE_1, GROUP_1).setPostTime(22);
+ addGroupSummary(4, PACKAGE_1, GROUP_1).setPostTime(33);
+ addNotif(5, PACKAGE_2);
+ addGroupSummary(6, PACKAGE_1, GROUP_1).setPostTime(11);
+ addGroupChild(7, PACKAGE_1, GROUP_1);
+ dispatchBuild();
+
+ // THEN only most recent summary is used
+ verifyBuiltList(
+ notif(0),
+ group(
+ summary(4),
+ child(1),
+ child(2),
+ child(7)
+ ),
+ notif(5)
+ );
+
+ // THEN the extra summaries have their parents set to null
+ assertNull(mEntrySet.get(3).getParent());
+ assertNull(mEntrySet.get(6).getParent());
+ }
+
+ @Test
+ public void testGroupsWithNoSummaryAreUngrouped() {
+ // GIVEN a group with no summary
+ addNotif(0, PACKAGE_2);
+ addGroupChild(1, PACKAGE_4, GROUP_2);
+ addGroupChild(2, PACKAGE_4, GROUP_2);
+ addGroupChild(3, PACKAGE_4, GROUP_2);
+ addGroupChild(4, PACKAGE_4, GROUP_2);
+
+ // WHEN we build the list
+ dispatchBuild();
+
+ // THEN the children aren't grouped
+ verifyBuiltList(
+ notif(0),
+ notif(1),
+ notif(2),
+ notif(3),
+ notif(4)
+ );
+ }
+
+ @Test
+ public void testGroupsWithNoChildrenAreUngrouped() {
+ // GIVEN a group with a summary but no children
+ addGroupSummary(0, PACKAGE_5, GROUP_1);
+ addNotif(1, PACKAGE_5);
+ addNotif(2, PACKAGE_1);
+
+ // WHEN we build the list
+ dispatchBuild();
+
+ // THEN the summary isn't grouped but is still added to the final list
+ verifyBuiltList(
+ notif(0),
+ notif(1),
+ notif(2)
+ );
+ }
+
+ @Test
+ public void testGroupsWithTooFewChildrenAreSplitUp() {
+ // GIVEN a group with one child
+ addGroupChild(0, PACKAGE_2, GROUP_1);
+ addGroupSummary(1, PACKAGE_2, GROUP_1);
+
+ // WHEN we build the list
+ dispatchBuild();
+
+ // THEN the child is added at top level and the summary is discarded
+ verifyBuiltList(
+ notif(0)
+ );
+
+ assertNull(mEntrySet.get(1).getParent());
+ }
+
+ @Test
+ public void testGroupsWhoLoseChildrenMidPipelineAreSplitUp() {
+ // GIVEN a group with two children
+ addGroupChild(0, PACKAGE_2, GROUP_1);
+ addGroupSummary(1, PACKAGE_2, GROUP_1);
+ addGroupChild(2, PACKAGE_2, GROUP_1);
+
+ // GIVEN a promoter that will promote one of children to top level
+ mListBuilder.addPromoter(new IdPromoter(0));
+
+ // WHEN we build the list
+ dispatchBuild();
+
+ // THEN both children end up at top level (because group is now too small)
+ verifyBuiltList(
+ notif(0),
+ notif(2)
+ );
+
+ // THEN the summary is discarded
+ assertNull(mEntrySet.get(1).getParent());
+ }
+
+ @Test
+ public void testPreviousParentsAreSetProperly() {
+ // GIVEN a notification that is initially added to the list
+ PackageFilter filter = new PackageFilter(PACKAGE_2);
+ filter.setEnabled(false);
+ mListBuilder.addFilter(filter);
+
+ addNotif(0, PACKAGE_1);
+ addNotif(1, PACKAGE_2);
+ addNotif(2, PACKAGE_3);
+ dispatchBuild();
+
+ // WHEN it is suddenly filtered out
+ filter.setEnabled(true);
+ dispatchBuild();
+
+ // THEN its previous parent indicates that it used to be added
+ assertNull(mEntrySet.get(1).getParent());
+ assertEquals(GroupEntry.ROOT_ENTRY, mEntrySet.get(1).getPreviousParent());
+ }
+
+ @Test
+ public void testThatAnnulledGroupsAndSummariesAreProperlyRolledBack() {
+ // GIVEN a registered transform groups listener
+ RecordingOnBeforeTransformGroupsListener listener =
+ new RecordingOnBeforeTransformGroupsListener();
+ mListBuilder.addOnBeforeTransformGroupsListener(listener);
+
+ // GIVEN a malformed group that will be dismantled
+ addGroupChild(0, PACKAGE_2, GROUP_1);
+ addGroupSummary(1, PACKAGE_2, GROUP_1);
+ addNotif(2, PACKAGE_1);
+
+ // WHEN we build the list
+ dispatchBuild();
+
+ // THEN only the child appears in the final list
+ verifyBuiltList(
+ notif(0),
+ notif(2)
+ );
+
+ // THEN the list of newly visible entries doesn't contain the summary or the group
+ assertEquals(
+ Arrays.asList(
+ mEntrySet.get(0),
+ mEntrySet.get(2)),
+ listener.newlyVisibleEntries
+ );
+
+ // THEN the summary has a null parent and an unset firstAddedIteration
+ assertNull(mEntrySet.get(1).getParent());
+ assertEquals(-1, mEntrySet.get(1).mFirstAddedIteration);
+ }
+
+ @Test
+ public void testNotifsAreFiltered() {
+ // GIVEN a NotifFilter that filters out a specific package
+ NotifFilter filter1 = spy(new PackageFilter(PACKAGE_2));
+ mListBuilder.addFilter(filter1);
+
+ // WHEN the pipeline is kicked off on a list of notifs
+ addNotif(0, PACKAGE_1);
+ addNotif(1, PACKAGE_2);
+ addNotif(2, PACKAGE_3);
+ addNotif(3, PACKAGE_2);
+ dispatchBuild();
+
+ // THEN the filter is called on each notif in the original set
+ verify(filter1).shouldFilterOut(eq(mEntrySet.get(0)), anyLong());
+ verify(filter1).shouldFilterOut(eq(mEntrySet.get(1)), anyLong());
+ verify(filter1).shouldFilterOut(eq(mEntrySet.get(2)), anyLong());
+ verify(filter1).shouldFilterOut(eq(mEntrySet.get(3)), anyLong());
+
+ // THEN the final list doesn't contain any filtered-out notifs
+ verifyBuiltList(
+ notif(0),
+ notif(2)
+ );
+
+ // THEN each filtered notif records the filter that did it
+ assertEquals(filter1, mEntrySet.get(1).mExcludingFilter);
+ assertEquals(filter1, mEntrySet.get(3).mExcludingFilter);
+ }
+
+ @Test
+ public void testNotifFiltersCanBePreempted() {
+ // GIVEN two notif filters
+ NotifFilter filter1 = spy(new PackageFilter(PACKAGE_2));
+ NotifFilter filter2 = spy(new PackageFilter(PACKAGE_5));
+ mListBuilder.addFilter(filter1);
+ mListBuilder.addFilter(filter2);
+
+ // WHEN the pipeline is kicked off on a list of notifs
+ addNotif(0, PACKAGE_1);
+ addNotif(1, PACKAGE_2);
+ addNotif(2, PACKAGE_5);
+ dispatchBuild();
+
+ // THEN both filters are called on the first notif but the second filter is never called
+ // on the already-filtered second notif
+ verify(filter1).shouldFilterOut(eq(mEntrySet.get(0)), anyLong());
+ verify(filter1).shouldFilterOut(eq(mEntrySet.get(1)), anyLong());
+ verify(filter1).shouldFilterOut(eq(mEntrySet.get(2)), anyLong());
+ verify(filter2).shouldFilterOut(eq(mEntrySet.get(0)), anyLong());
+ verify(filter2).shouldFilterOut(eq(mEntrySet.get(2)), anyLong());
+
+ // THEN the final list doesn't contain any filtered-out notifs
+ verifyBuiltList(
+ notif(0)
+ );
+
+ // THEN each filtered notif records the filter that did it
+ assertEquals(filter1, mEntrySet.get(1).mExcludingFilter);
+ assertEquals(filter2, mEntrySet.get(2).mExcludingFilter);
+ }
+
+ @Test
+ public void testNotifsArePromoted() {
+ // GIVEN a NotifPromoter that promotes certain notif IDs
+ NotifPromoter promoter = spy(new IdPromoter(1, 2));
+ mListBuilder.addPromoter(promoter);
+
+ // WHEN the pipeline is kicked off
+ addNotif(0, PACKAGE_1);
+ addGroupChild(1, PACKAGE_2, GROUP_1);
+ addGroupChild(2, PACKAGE_2, GROUP_1);
+ addGroupChild(3, PACKAGE_2, GROUP_1);
+ addGroupChild(4, PACKAGE_2, GROUP_1);
+ addGroupSummary(5, PACKAGE_2, GROUP_1);
+ addNotif(6, PACKAGE_3);
+ dispatchBuild();
+
+ // THEN the filter is called on each group child
+ verify(promoter).shouldPromoteToTopLevel(mEntrySet.get(1));
+ verify(promoter).shouldPromoteToTopLevel(mEntrySet.get(2));
+ verify(promoter).shouldPromoteToTopLevel(mEntrySet.get(3));
+ verify(promoter).shouldPromoteToTopLevel(mEntrySet.get(4));
+
+ // THEN the final list contains the promoted entries at top level
+ verifyBuiltList(
+ notif(0),
+ notif(2),
+ notif(3),
+ group(
+ summary(5),
+ child(1),
+ child(4)),
+ notif(6)
+ );
+
+ // THEN each promoted notif records the promoter that did it
+ assertEquals(promoter, mEntrySet.get(2).mNotifPromoter);
+ assertEquals(promoter, mEntrySet.get(3).mNotifPromoter);
+ }
+
+ @Test
+ public void testNotifPromotersCanBePreempted() {
+ // GIVEN two notif promoters
+ NotifPromoter promoter1 = spy(new IdPromoter(1));
+ NotifPromoter promoter2 = spy(new IdPromoter(2));
+ mListBuilder.addPromoter(promoter1);
+ mListBuilder.addPromoter(promoter2);
+
+ // WHEN the pipeline is kicked off on some notifs and a group
+ addNotif(0, PACKAGE_1);
+ addGroupChild(1, PACKAGE_2, GROUP_1);
+ addGroupChild(2, PACKAGE_2, GROUP_1);
+ addGroupChild(3, PACKAGE_2, GROUP_1);
+ addGroupSummary(4, PACKAGE_2, GROUP_1);
+ addNotif(5, PACKAGE_3);
+ dispatchBuild();
+
+ // THEN both promoters are called on each child, except for children that a previous
+ // promoter has already promoted
+ verify(promoter1).shouldPromoteToTopLevel(mEntrySet.get(1));
+ verify(promoter1).shouldPromoteToTopLevel(mEntrySet.get(2));
+ verify(promoter1).shouldPromoteToTopLevel(mEntrySet.get(3));
+
+ verify(promoter2).shouldPromoteToTopLevel(mEntrySet.get(1));
+ verify(promoter2).shouldPromoteToTopLevel(mEntrySet.get(3));
+
+ // THEN each promoter is recorded on each notif it promoted
+ assertEquals(promoter1, mEntrySet.get(2).mNotifPromoter);
+ assertEquals(promoter2, mEntrySet.get(3).mNotifPromoter);
+ }
+
+ @Test
+ public void testNotifsAreSectioned() {
+ // GIVEN a filter that removes all PACKAGE_4 notifs and a SectionsProvider that divides
+ // notifs based on package name
+ mListBuilder.addFilter(new PackageFilter(PACKAGE_4));
+ final SectionsProvider sectionsProvider = spy(new PackageSectioner());
+ mListBuilder.setSectionsProvider(sectionsProvider);
+
+ // WHEN we build a list with different packages
+ addNotif(0, PACKAGE_4);
+ addNotif(1, PACKAGE_2);
+ addNotif(2, PACKAGE_1);
+ addNotif(3, PACKAGE_3);
+ addGroupSummary(4, PACKAGE_2, GROUP_1);
+ addGroupChild(5, PACKAGE_2, GROUP_1);
+ addGroupChild(6, PACKAGE_2, GROUP_1);
+ addNotif(7, PACKAGE_1);
+ addNotif(8, PACKAGE_2);
+ addNotif(9, PACKAGE_5);
+ addNotif(10, PACKAGE_4);
+ dispatchBuild();
+
+ // THEN the list is sorted according to section
+ verifyBuiltList(
+ notif(2),
+ notif(7),
+ notif(1),
+ group(
+ summary(4),
+ child(5),
+ child(6)
+ ),
+ notif(8),
+ notif(3),
+ notif(9)
+ );
+
+ // THEN the sections provider is called on all top level elements (but no children and no
+ // entries that were filtered out)
+ verify(sectionsProvider).getSection(mEntrySet.get(1));
+ verify(sectionsProvider).getSection(mEntrySet.get(2));
+ verify(sectionsProvider).getSection(mEntrySet.get(3));
+ verify(sectionsProvider).getSection(mEntrySet.get(7));
+ verify(sectionsProvider).getSection(mEntrySet.get(8));
+ verify(sectionsProvider).getSection(mEntrySet.get(9));
+ verify(sectionsProvider).getSection(mBuiltList.get(3));
+ }
+
+ @Test
+ public void testThatNotifComparatorsAreCalled() {
+ // GIVEN a set of comparators that care about specific packages
+ mListBuilder.setComparators(Arrays.asList(
+ new HypeComparator(PACKAGE_4),
+ new HypeComparator(PACKAGE_1, PACKAGE_3),
+ new HypeComparator(PACKAGE_2)
+ ));
+
+ // WHEN the pipeline is kicked off on a bunch of notifications
+ addNotif(0, PACKAGE_1);
+ addNotif(1, PACKAGE_5);
+ addNotif(2, PACKAGE_3);
+ addNotif(3, PACKAGE_4);
+ addNotif(4, PACKAGE_2);
+ dispatchBuild();
+
+ // THEN the notifs are sorted according to the hierarchy of comparators
+ verifyBuiltList(
+ notif(3),
+ notif(0),
+ notif(2),
+ notif(4),
+ notif(1)
+ );
+ }
+
+ @Test
+ public void testListenersAndPluggablesAreFiredInOrder() {
+ // GIVEN a bunch of registered listeners and pluggables
+ NotifFilter filter = spy(new PackageFilter(PACKAGE_1));
+ NotifPromoter promoter = spy(new IdPromoter(3));
+ PackageSectioner sectioner = spy(new PackageSectioner());
+ NotifComparator comparator = spy(new HypeComparator(PACKAGE_4));
+ mListBuilder.addFilter(filter);
+ mListBuilder.addOnBeforeTransformGroupsListener(mOnBeforeTransformGroupsListener);
+ mListBuilder.addPromoter(promoter);
+ mListBuilder.addOnBeforeSortListener(mOnBeforeSortListener);
+ mListBuilder.setComparators(Collections.singletonList(comparator));
+ mListBuilder.setSectionsProvider(sectioner);
+ mListBuilder.addOnBeforeRenderListListener(mOnBeforeRenderListListener);
+
+ // WHEN a few new notifs are added
+ addNotif(0, PACKAGE_1);
+ addGroupSummary(1, PACKAGE_2, GROUP_1);
+ addGroupChild(2, PACKAGE_2, GROUP_1);
+ addGroupChild(3, PACKAGE_2, GROUP_1);
+ addNotif(4, PACKAGE_5);
+ addNotif(5, PACKAGE_5);
+ addNotif(6, PACKAGE_4);
+ dispatchBuild();
+
+ // THEN the pluggables and listeners are called in order
+ InOrder inOrder = inOrder(
+ filter,
+ mOnBeforeTransformGroupsListener,
+ promoter,
+ mOnBeforeSortListener,
+ sectioner,
+ comparator,
+ mOnBeforeRenderListListener,
+ mOnRenderListListener);
+
+ inOrder.verify(filter, atLeastOnce())
+ .shouldFilterOut(any(NotificationEntry.class), anyLong());
+ inOrder.verify(mOnBeforeTransformGroupsListener)
+ .onBeforeTransformGroups(anyList(), anyList());
+ inOrder.verify(promoter, atLeastOnce())
+ .shouldPromoteToTopLevel(any(NotificationEntry.class));
+ inOrder.verify(mOnBeforeSortListener).onBeforeSort(anyList());
+ inOrder.verify(sectioner, atLeastOnce()).getSection(any(ListEntry.class));
+ inOrder.verify(comparator, atLeastOnce())
+ .compare(any(ListEntry.class), any(ListEntry.class));
+ inOrder.verify(mOnBeforeRenderListListener).onBeforeRenderList(anyList());
+ inOrder.verify(mOnRenderListListener).onRenderList(anyList());
+ }
+
+ @Test
+ public void testThatPluggableInvalidationsTriggersRerun() {
+ // GIVEN a variety of pluggables
+ NotifFilter packageFilter = new PackageFilter(PACKAGE_1);
+ NotifPromoter idPromoter = new IdPromoter(4);
+ SectionsProvider sectionsProvider = new PackageSectioner();
+ NotifComparator hypeComparator = new HypeComparator(PACKAGE_2);
+
+ mListBuilder.addFilter(packageFilter);
+ mListBuilder.addPromoter(idPromoter);
+ mListBuilder.setSectionsProvider(sectionsProvider);
+ mListBuilder.setComparators(Collections.singletonList(hypeComparator));
+
+ // GIVEN a set of random notifs
+ addNotif(0, PACKAGE_1);
+ addNotif(1, PACKAGE_2);
+ addNotif(2, PACKAGE_3);
+ dispatchBuild();
+
+ // WHEN each pluggable is invalidated THEN the list is re-rendered
+
+ clearInvocations(mOnRenderListListener);
+ packageFilter.invalidateList();
+ verify(mOnRenderListListener).onRenderList(anyList());
+
+ clearInvocations(mOnRenderListListener);
+ idPromoter.invalidateList();
+ verify(mOnRenderListListener).onRenderList(anyList());
+
+ clearInvocations(mOnRenderListListener);
+ sectionsProvider.invalidateList();
+ verify(mOnRenderListListener).onRenderList(anyList());
+
+ clearInvocations(mOnRenderListListener);
+ hypeComparator.invalidateList();
+ verify(mOnRenderListListener).onRenderList(anyList());
+ }
+
+ @Test
+ public void testNotifFiltersAreAllSentTheSameNow() {
+ // GIVEN three notif filters
+ NotifFilter filter1 = spy(new PackageFilter(PACKAGE_5));
+ NotifFilter filter2 = spy(new PackageFilter(PACKAGE_5));
+ NotifFilter filter3 = spy(new PackageFilter(PACKAGE_5));
+ mListBuilder.addFilter(filter1);
+ mListBuilder.addFilter(filter2);
+ mListBuilder.addFilter(filter3);
+
+ // GIVEN the SystemClock is set to a particular time:
+ mSystemClock.setAutoIncrement(true);
+ mSystemClock.setUptimeMillis(47);
+
+ // WHEN the pipeline is kicked off on a list of notifs
+ addNotif(0, PACKAGE_1);
+ addNotif(1, PACKAGE_2);
+ dispatchBuild();
+
+ // THEN the value of `now` is the same for all calls to shouldFilterOut
+ verify(filter1).shouldFilterOut(mEntrySet.get(0), 47);
+ verify(filter2).shouldFilterOut(mEntrySet.get(0), 47);
+ verify(filter3).shouldFilterOut(mEntrySet.get(0), 47);
+ verify(filter1).shouldFilterOut(mEntrySet.get(1), 47);
+ verify(filter2).shouldFilterOut(mEntrySet.get(1), 47);
+ verify(filter3).shouldFilterOut(mEntrySet.get(1), 47);
+ }
+
+ @Test
+ public void testNewlyAddedEntries() {
+ // GIVEN a registered OnBeforeTransformGroupsListener
+ RecordingOnBeforeTransformGroupsListener listener =
+ spy(new RecordingOnBeforeTransformGroupsListener());
+ mListBuilder.addOnBeforeTransformGroupsListener(listener);
+
+ // Given some new notifs
+ addNotif(0, PACKAGE_1);
+ addGroupChild(1, PACKAGE_2, GROUP_1);
+ addGroupSummary(2, PACKAGE_2, GROUP_1);
+ addGroupChild(3, PACKAGE_2, GROUP_1);
+ addNotif(4, PACKAGE_3);
+ addGroupChild(5, PACKAGE_2, GROUP_1);
+
+ // WHEN we run the pipeline
+ dispatchBuild();
+
+ verifyBuiltList(
+ notif(0),
+ group(
+ summary(2),
+ child(1),
+ child(3),
+ child(5)
+ ),
+ notif(4)
+ );
+
+ // THEN all the new notifs, including the new GroupEntry, are passed to the listener
+ verify(listener).onBeforeTransformGroups(
+ Arrays.asList(
+ mEntrySet.get(0),
+ mBuiltList.get(1),
+ mEntrySet.get(4)
+ ),
+ Arrays.asList(
+ mEntrySet.get(0),
+ mEntrySet.get(1),
+ mBuiltList.get(1),
+ mEntrySet.get(2),
+ mEntrySet.get(3),
+ mEntrySet.get(4),
+ mEntrySet.get(5)
+ )
+ );
+ }
+
+ @Test
+ public void testNewlyAddedEntriesOnSecondRun() {
+ // GIVEN a registered OnBeforeTransformGroupsListener
+ RecordingOnBeforeTransformGroupsListener listener =
+ spy(new RecordingOnBeforeTransformGroupsListener());
+ mListBuilder.addOnBeforeTransformGroupsListener(listener);
+
+ // Given some notifs that have already been added (two of which are in malformed groups)
+ addNotif(0, PACKAGE_1);
+ addGroupChild(1, PACKAGE_2, GROUP_1);
+ addGroupChild(2, PACKAGE_3, GROUP_2);
+
+ dispatchBuild();
+ clearInvocations(listener);
+
+ // WHEN we run the pipeline
+ addGroupSummary(3, PACKAGE_2, GROUP_1);
+ addGroupChild(4, PACKAGE_3, GROUP_2);
+ addGroupSummary(5, PACKAGE_3, GROUP_2);
+ addGroupChild(6, PACKAGE_3, GROUP_2);
+ addNotif(7, PACKAGE_2);
+
+ dispatchBuild();
+
+ verifyBuiltList(
+ notif(0),
+ notif(1),
+ group(
+ summary(5),
+ child(2),
+ child(4),
+ child(6)
+ ),
+ notif(7)
+ );
+
+ // THEN all the new notifs, including the new GroupEntry, are passed to the listener
+ verify(listener).onBeforeTransformGroups(
+ Arrays.asList(
+ mEntrySet.get(0),
+ mEntrySet.get(1),
+ mBuiltList.get(2),
+ mEntrySet.get(7)
+ ),
+ Arrays.asList(
+ mBuiltList.get(2),
+ mEntrySet.get(4),
+ mEntrySet.get(5),
+ mEntrySet.get(6),
+ mEntrySet.get(7)
+ )
+ );
+ }
+
+ @Test
+ public void testAnnulledGroupsHaveParentSetProperly() {
+ // GIVEN a list containing a small group that's already been built once
+ addGroupChild(0, PACKAGE_2, GROUP_2);
+ addGroupSummary(1, PACKAGE_2, GROUP_2);
+ addGroupChild(2, PACKAGE_2, GROUP_2);
+ dispatchBuild();
+
+ verifyBuiltList(
+ group(
+ summary(1),
+ child(0),
+ child(2)
+ )
+ );
+ GroupEntry group = (GroupEntry) mBuiltList.get(0);
+
+ // WHEN a child is removed such that the group is no longer big enough
+ mEntrySet.remove(2);
+ dispatchBuild();
+
+ // THEN the group is annulled and its parent is set back to null
+ verifyBuiltList(
+ notif(0)
+ );
+ assertNull(group.getParent());
+
+ // but its previous parent indicates that it was added in the previous iteration
+ assertEquals(GroupEntry.ROOT_ENTRY, group.getPreviousParent());
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testOutOfOrderFilterInvalidationThrows() {
+ // GIVEN a NotifFilter that gets invalidated during the grouping stage
+ NotifFilter filter = new PackageFilter(PACKAGE_5);
+ OnBeforeTransformGroupsListener listener =
+ (list, newlyVisibleEntries) -> filter.invalidateList();
+ mListBuilder.addFilter(filter);
+ mListBuilder.addOnBeforeTransformGroupsListener(listener);
+
+ // WHEN we try to run the pipeline and the filter is invalidated
+ addNotif(0, PACKAGE_1);
+ dispatchBuild();
+
+ // Then an exception is thrown
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testOutOfOrderPrompterInvalidationThrows() {
+ // GIVEN a NotifPromoter that gets invalidated during the sorting stage
+ NotifPromoter promoter = new IdPromoter(47);
+ OnBeforeSortListener listener =
+ (list) -> promoter.invalidateList();
+ mListBuilder.addPromoter(promoter);
+ mListBuilder.addOnBeforeSortListener(listener);
+
+ // WHEN we try to run the pipeline and the promoter is invalidated
+ addNotif(0, PACKAGE_1);
+ dispatchBuild();
+
+ // Then an exception is thrown
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testOutOfOrderComparatorInvalidationThrows() {
+ // GIVEN a NotifComparator that gets invalidated during the finalizing stage
+ NotifComparator comparator = new HypeComparator(PACKAGE_5);
+ OnBeforeRenderListListener listener =
+ (list) -> comparator.invalidateList();
+ mListBuilder.setComparators(Collections.singletonList(comparator));
+ mListBuilder.addOnBeforeRenderListListener(listener);
+
+ // WHEN we try to run the pipeline and the comparator is invalidated
+ addNotif(0, PACKAGE_1);
+ dispatchBuild();
+
+ // Then an exception is thrown
+ }
+
+ /**
+ * Adds a notif to the collection that will be passed to the list builder when
+ * {@link #dispatchBuild()}s is called.
+ *
+ * @param index Index of this notification in the set. This must be the current size of the set.
+ * it exists to improve readability of the resulting code, since later tests will
+ * have to refer to notifs by index.
+ * @param packageId Package that the notif should be posted under
+ * @return A NotificationEntryBuilder that can be used to further modify the notif. Do not call
+ * build() on the builder; that will be done on the next dispatchBuild().
+ */
+ private NotificationEntryBuilder addNotif(int index, String packageId) {
+ final NotificationEntryBuilder builder = new NotificationEntryBuilder()
+ .setPkg(packageId)
+ .setId(nextId(packageId))
+ .setRank(nextRank());
+
+ builder.modifyNotification(mContext)
+ .setContentTitle("Top level singleton")
+ .setChannelId("test_channel");
+
+ assertEquals(mEntrySet.size() + mPendingSet.size(), index);
+ mPendingSet.add(builder);
+ return builder;
+ }
+
+ /** Same behavior as {@link #addNotif(int, String)}. */
+ private NotificationEntryBuilder addGroupSummary(int index, String packageId, String groupId) {
+ final NotificationEntryBuilder builder = new NotificationEntryBuilder()
+ .setPkg(packageId)
+ .setId(nextId(packageId))
+ .setRank(nextRank());
+
+ builder.modifyNotification(mContext)
+ .setChannelId("test_channel")
+ .setContentTitle("Group summary")
+ .setGroup(groupId)
+ .setGroupSummary(true);
+
+ assertEquals(mEntrySet.size() + mPendingSet.size(), index);
+ mPendingSet.add(builder);
+ return builder;
+ }
+
+ /** Same behavior as {@link #addNotif(int, String)}. */
+ private NotificationEntryBuilder addGroupChild(int index, String packageId, String groupId) {
+ final NotificationEntryBuilder builder = new NotificationEntryBuilder()
+ .setPkg(packageId)
+ .setId(nextId(packageId))
+ .setRank(nextRank());
+
+ builder.modifyNotification(mContext)
+ .setChannelId("test_channel")
+ .setContentTitle("Group child")
+ .setGroup(groupId);
+
+ assertEquals(mEntrySet.size() + mPendingSet.size(), index);
+ mPendingSet.add(builder);
+ return builder;
+ }
+
+ private int nextId(String packageName) {
+ Integer nextId = mNextIdMap.get(packageName);
+ if (nextId == null) {
+ nextId = 0;
+ }
+ mNextIdMap.put(packageName, nextId + 1);
+ return nextId;
+ }
+
+ private int nextRank() {
+ int nextRank = mNextRank;
+ mNextRank++;
+ return nextRank;
+ }
+
+ private void dispatchBuild() {
+ if (mPendingSet.size() > 0) {
+ for (NotificationEntryBuilder builder : mPendingSet) {
+ mEntrySet.add(builder.build());
+ }
+ mPendingSet.clear();
+ }
+
+ mReadyForBuildListener.onBeginDispatchToListeners();
+ mReadyForBuildListener.onBuildList(mEntrySet);
+ }
+
+ private void verifyBuiltList(ExpectedEntry ...expectedEntries) {
+ try {
+ assertEquals(
+ "List is the wrong length",
+ expectedEntries.length,
+ mBuiltList.size());
+
+ for (int i = 0; i < expectedEntries.length; i++) {
+ ListEntry outEntry = mBuiltList.get(i);
+ ExpectedEntry expectedEntry = expectedEntries[i];
+
+ if (expectedEntry instanceof ExpectedNotif) {
+ assertEquals(
+ "Entry " + i + " isn't a NotifEntry",
+ NotificationEntry.class,
+ outEntry.getClass());
+ assertEquals(
+ "Entry " + i + " doesn't match expected value.",
+ ((ExpectedNotif) expectedEntry).entry, outEntry);
+ } else {
+ ExpectedGroup cmpGroup = (ExpectedGroup) expectedEntry;
+
+ assertEquals(
+ "Entry " + i + " isn't a GroupEntry",
+ GroupEntry.class,
+ outEntry.getClass());
+
+ GroupEntry outGroup = (GroupEntry) outEntry;
+
+ assertEquals(
+ "Summary notif for entry " + i
+ + " doesn't match expected value",
+ cmpGroup.summary,
+ outGroup.getSummary());
+ assertEquals(
+ "Summary notif for entry " + i
+ + " doesn't have proper parent",
+ outGroup,
+ outGroup.getSummary().getParent());
+
+ assertEquals("Children for entry " + i,
+ cmpGroup.children,
+ outGroup.getChildren());
+
+ for (int j = 0; j < outGroup.getChildren().size(); j++) {
+ NotificationEntry child = outGroup.getChildren().get(j);
+ assertEquals(
+ "Child " + j + " for entry " + i
+ + " doesn't have proper parent",
+ outGroup,
+ child.getParent());
+ }
+ }
+ }
+ } catch (AssertionError err) {
+ throw new AssertionError(
+ "List under test failed verification:\n" + dumpList(mBuiltList), err);
+ }
+ }
+
+ private ExpectedNotif notif(int index) {
+ return new ExpectedNotif(mEntrySet.get(index));
+ }
+
+ private ExpectedGroup group(ExpectedSummary summary, ExpectedChild...children) {
+ return new ExpectedGroup(
+ summary.entry,
+ Arrays.stream(children)
+ .map(child -> child.entry)
+ .collect(Collectors.toList()));
+ }
+
+ private ExpectedSummary summary(int index) {
+ return new ExpectedSummary(mEntrySet.get(index));
+ }
+
+ private ExpectedChild child(int index) {
+ return new ExpectedChild(mEntrySet.get(index));
+ }
+
+ private abstract static class ExpectedEntry {
+ }
+
+ private static class ExpectedNotif extends ExpectedEntry {
+ public final NotificationEntry entry;
+
+ private ExpectedNotif(NotificationEntry entry) {
+ this.entry = entry;
+ }
+ }
+
+ private static class ExpectedGroup extends ExpectedEntry {
+ public final NotificationEntry summary;
+ public final List<NotificationEntry> children;
+
+ private ExpectedGroup(
+ NotificationEntry summary,
+ List<NotificationEntry> children) {
+ this.summary = summary;
+ this.children = children;
+ }
+ }
+
+ private static class ExpectedSummary {
+ public final NotificationEntry entry;
+
+ private ExpectedSummary(NotificationEntry entry) {
+ this.entry = entry;
+ }
+ }
+
+ private static class ExpectedChild {
+ public final NotificationEntry entry;
+
+ private ExpectedChild(NotificationEntry entry) {
+ this.entry = entry;
+ }
+ }
+
+ /** Filters out notifs from a particular package */
+ private static class PackageFilter extends NotifFilter {
+ private final String mPackageName;
+
+ private boolean mEnabled = true;
+
+ PackageFilter(String packageName) {
+ super("PackageFilter");
+
+ mPackageName = packageName;
+ }
+
+ @Override
+ public boolean shouldFilterOut(NotificationEntry entry, long now) {
+ return mEnabled && entry.getSbn().getPackageName().equals(mPackageName);
+ }
+
+ public void setEnabled(boolean enabled) {
+ mEnabled = enabled;
+ }
+ }
+
+ /** Promotes notifs with particular IDs */
+ private static class IdPromoter extends NotifPromoter {
+ private final List<Integer> mIds;
+
+ IdPromoter(Integer... ids) {
+ super("IdPromoter");
+ mIds = Arrays.asList(ids);
+ }
+
+ @Override
+ public boolean shouldPromoteToTopLevel(NotificationEntry child) {
+ return mIds.contains(child.getSbn().getId());
+ }
+ }
+
+ /** Sorts specific notifs above all others. */
+ private static class HypeComparator extends NotifComparator {
+
+ private final List<String> mPreferredPackages;
+
+ HypeComparator(String ...preferredPackages) {
+ super("HypeComparator");
+ mPreferredPackages = Arrays.asList(preferredPackages);
+ }
+
+ @Override
+ public int compare(ListEntry o1, ListEntry o2) {
+ boolean contains1 = mPreferredPackages.contains(
+ o1.getRepresentativeEntry().getSbn().getPackageName());
+ boolean contains2 = mPreferredPackages.contains(
+ o2.getRepresentativeEntry().getSbn().getPackageName());
+
+ return Boolean.compare(contains2, contains1);
+ }
+ }
+
+ /** Sorts notifs into sections based on their package name */
+ private static class PackageSectioner extends SectionsProvider {
+
+ PackageSectioner() {
+ super("PackageSectioner");
+ }
+
+ @Override
+ public int getSection(ListEntry entry) {
+ switch (entry.getRepresentativeEntry().getSbn().getPackageName()) {
+ case PACKAGE_1:
+ return 1;
+ case PACKAGE_2:
+ return 2;
+ case PACKAGE_3:
+ return 3;
+ default:
+ return 4;
+ }
+ }
+ }
+
+ private static class RecordingOnBeforeTransformGroupsListener
+ implements OnBeforeTransformGroupsListener {
+ public List<ListEntry> newlyVisibleEntries;
+
+ @Override
+ public void onBeforeTransformGroups(List<ListEntry> list,
+ List<ListEntry> newlyVisibleEntries) {
+ this.newlyVisibleEntries = newlyVisibleEntries;
+ }
+ }
+
+ private static final String PACKAGE_1 = "com.test1";
+ private static final String PACKAGE_2 = "com.test2";
+ private static final String PACKAGE_3 = "org.test3";
+ private static final String PACKAGE_4 = "com.test4";
+ private static final String PACKAGE_5 = "com.test5";
+
+ private static final String GROUP_1 = "group_1";
+ private static final String GROUP_2 = "group_2";
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java
deleted file mode 100644
index 1a469d8..0000000
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.systemui.statusbar.notification.collection;
-
-import static android.app.Notification.CATEGORY_ALARM;
-import static android.app.Notification.CATEGORY_CALL;
-import static android.app.Notification.CATEGORY_EVENT;
-import static android.app.Notification.CATEGORY_MESSAGE;
-import static android.app.Notification.CATEGORY_REMINDER;
-import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_MIN;
-
-import static com.android.systemui.statusbar.NotificationEntryHelper.modifySbn;
-import static com.android.systemui.statusbar.notification.collection.NotificationDataTest.TestableNotificationData.OVERRIDE_CHANNEL;
-import static com.android.systemui.statusbar.notification.collection.NotificationDataTest.TestableNotificationData.OVERRIDE_IMPORTANCE;
-import static com.android.systemui.statusbar.notification.collection.NotificationDataTest.TestableNotificationData.OVERRIDE_RANK;
-import static com.android.systemui.statusbar.notification.collection.NotificationDataTest.TestableNotificationData.OVERRIDE_VIS_EFFECTS;
-import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_ALERTING;
-import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_SILENT;
-
-import static junit.framework.Assert.assertEquals;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.Manifest;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Person;
-import android.content.Intent;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Icon;
-import android.media.session.MediaSession;
-import android.os.Bundle;
-import android.service.notification.NotificationListenerService;
-import android.service.notification.NotificationListenerService.Ranking;
-import android.service.notification.SnoozeCriterion;
-import android.service.notification.StatusBarNotification;
-import android.testing.AndroidTestingRunner;
-import android.testing.TestableLooper;
-import android.testing.TestableLooper.RunWithLooper;
-
-import androidx.test.filters.SmallTest;
-
-import com.android.systemui.Dependency;
-import com.android.systemui.ForegroundServiceController;
-import com.android.systemui.InitController;
-import com.android.systemui.SysuiTestCase;
-import com.android.systemui.plugins.statusbar.StatusBarStateController;
-import com.android.systemui.statusbar.NotificationEntryBuilder;
-import com.android.systemui.statusbar.NotificationLockscreenUserManager;
-import com.android.systemui.statusbar.NotificationTestHelper;
-import com.android.systemui.statusbar.RankingBuilder;
-import com.android.systemui.statusbar.SbnBuilder;
-import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment;
-import com.android.systemui.statusbar.notification.logging.NotifLog;
-import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier;
-import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
-import com.android.systemui.statusbar.phone.NotificationGroupManager;
-import com.android.systemui.statusbar.phone.ShadeController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-@SmallTest
-@RunWith(AndroidTestingRunner.class)
-@RunWithLooper
-public class NotificationDataTest extends SysuiTestCase {
-
- private static final int UID_NORMAL = 123;
- private static final int UID_ALLOW_DURING_SETUP = 456;
- private static final NotificationChannel NOTIFICATION_CHANNEL =
- new NotificationChannel("id", "name", NotificationChannel.USER_LOCKED_IMPORTANCE);
-
- private NotificationEntry mEntry;
-
- @Mock
- ForegroundServiceController mFsc;
- @Mock
- NotificationData.KeyguardEnvironment mEnvironment;
-
- private final IPackageManager mMockPackageManager = mock(IPackageManager.class);
- private TestableNotificationData mNotificationData;
- private ExpandableNotificationRow mRow;
-
- @Before
- public void setUp() throws Exception {
- com.android.systemui.util.Assert.sMainLooper = TestableLooper.get(this).getLooper();
- MockitoAnnotations.initMocks(this);
-
- mEntry = new NotificationEntryBuilder()
- .setUid(UID_NORMAL)
- .build();
-
- when(mMockPackageManager.checkUidPermission(
- eq(Manifest.permission.NOTIFICATION_DURING_SETUP),
- eq(UID_NORMAL)))
- .thenReturn(PackageManager.PERMISSION_DENIED);
- when(mMockPackageManager.checkUidPermission(
- eq(Manifest.permission.NOTIFICATION_DURING_SETUP),
- eq(UID_ALLOW_DURING_SETUP)))
- .thenReturn(PackageManager.PERMISSION_GRANTED);
-
- mDependency.injectTestDependency(ForegroundServiceController.class, mFsc);
- mDependency.injectTestDependency(NotificationGroupManager.class,
- new NotificationGroupManager(mock(StatusBarStateController.class)));
- mDependency.injectMockDependency(ShadeController.class);
- mDependency.injectMockDependency(NotificationLockscreenUserManager.class);
- mDependency.injectTestDependency(KeyguardEnvironment.class, mEnvironment);
- when(mEnvironment.isDeviceProvisioned()).thenReturn(true);
- when(mEnvironment.isNotificationForCurrentProfiles(any())).thenReturn(true);
- mNotificationData = new TestableNotificationData(
- mock(NotificationSectionsFeatureManager.class));
- mNotificationData.updateRanking(mock(NotificationListenerService.RankingMap.class), "");
- mRow = new NotificationTestHelper(getContext(), mDependency).createRow();
- Dependency.get(InitController.class).executePostInitTasks();
- }
-
- @Test
- public void testChannelSetWhenAdded() {
- Bundle override = new Bundle();
- override.putParcelable(OVERRIDE_CHANNEL, NOTIFICATION_CHANNEL);
- mNotificationData.rankingOverrides.put(mRow.getEntry().getKey(), override);
- mNotificationData.add(mRow.getEntry());
- assertEquals(NOTIFICATION_CHANNEL, mRow.getEntry().getChannel());
- }
-
- @Test
- public void testGetNotificationsForCurrentUser_shouldFilterNonCurrentUserNotifications()
- throws Exception {
- mNotificationData.add(mRow.getEntry());
- ExpandableNotificationRow row2 = new NotificationTestHelper(getContext(), mDependency)
- .createRow();
- mNotificationData.add(row2.getEntry());
-
- when(mEnvironment.isNotificationForCurrentProfiles(
- mRow.getEntry().getSbn())).thenReturn(false);
- when(mEnvironment.isNotificationForCurrentProfiles(
- row2.getEntry().getSbn())).thenReturn(true);
- ArrayList<NotificationEntry> result =
- mNotificationData.getNotificationsForCurrentUser();
-
- assertEquals(result.size(), 1);
- junit.framework.Assert.assertEquals(result.get(0), row2.getEntry());
- }
-
- @Test
- public void testIsExemptFromDndVisualSuppression_foreground() {
- initStatusBarNotification(false);
-
- mEntry.getSbn().getNotification().flags = Notification.FLAG_FOREGROUND_SERVICE;
- mEntry.setRow(mRow);
- mNotificationData.add(mEntry);
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_VIS_EFFECTS, 255);
- mNotificationData.rankingOverrides.put(mEntry.getKey(), override);
-
- assertTrue(mEntry.isExemptFromDndVisualSuppression());
- assertFalse(mEntry.shouldSuppressAmbient());
- }
-
- @Test
- public void testIsExemptFromDndVisualSuppression_media() {
- initStatusBarNotification(false);
- Notification n = mEntry.getSbn().getNotification();
- Notification.Builder nb = Notification.Builder.recoverBuilder(mContext, n);
- nb.setStyle(new Notification.MediaStyle().setMediaSession(mock(MediaSession.Token.class)));
- n = nb.build();
- modifySbn(mEntry)
- .setNotification(n)
- .build();
- mEntry.setRow(mRow);
- mNotificationData.add(mEntry);
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_VIS_EFFECTS, 255);
- mNotificationData.rankingOverrides.put(mEntry.getKey(), override);
-
- assertTrue(mEntry.isExemptFromDndVisualSuppression());
- assertFalse(mEntry.shouldSuppressAmbient());
- }
-
- @Test
- public void testIsExemptFromDndVisualSuppression_system() {
- initStatusBarNotification(false);
- mEntry.setRow(mRow);
- mEntry.mIsSystemNotification = true;
- mNotificationData.add(mEntry);
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_VIS_EFFECTS, 255);
- mNotificationData.rankingOverrides.put(mEntry.getKey(), override);
-
- assertTrue(mEntry.isExemptFromDndVisualSuppression());
- assertFalse(mEntry.shouldSuppressAmbient());
- }
-
- @Test
- public void testIsNotExemptFromDndVisualSuppression_hiddenCategories() {
- initStatusBarNotification(false);
- NotificationEntry entry = new NotificationEntryBuilder()
- .setUid(UID_NORMAL)
- .build();
- entry.setRow(mRow);
- entry.mIsSystemNotification = true;
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_VIS_EFFECTS, NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT);
- mNotificationData.rankingOverrides.put(entry.getKey(), override);
- mNotificationData.add(entry);
-
- modifySbn(entry)
- .setNotification(
- new Notification.Builder(mContext, "").setCategory(CATEGORY_CALL).build())
- .build();
- assertFalse(entry.isExemptFromDndVisualSuppression());
- assertTrue(entry.shouldSuppressAmbient());
-
- modifySbn(entry)
- .setNotification(
- new Notification.Builder(mContext, "")
- .setCategory(CATEGORY_REMINDER)
- .build())
- .build();
- assertFalse(entry.isExemptFromDndVisualSuppression());
-
- modifySbn(entry)
- .setNotification(
- new Notification.Builder(mContext, "").setCategory(CATEGORY_ALARM).build())
- .build();
- assertFalse(entry.isExemptFromDndVisualSuppression());
-
- modifySbn(entry)
- .setNotification(
- new Notification.Builder(mContext, "").setCategory(CATEGORY_EVENT).build())
- .build();
- assertFalse(entry.isExemptFromDndVisualSuppression());
-
- modifySbn(entry)
- .setNotification(
- new Notification.Builder(mContext, "")
- .setCategory(CATEGORY_MESSAGE)
- .build())
- .build();
- assertFalse(entry.isExemptFromDndVisualSuppression());
- }
-
- @Test
- public void testCreateNotificationDataEntry_RankingUpdate() {
- StatusBarNotification sbn = new SbnBuilder().build();
- sbn.getNotification().actions =
- new Notification.Action[] { createContextualAction("appGeneratedAction") };
-
- ArrayList<Notification.Action> systemGeneratedSmartActions =
- createActions("systemGeneratedAction");
-
- SnoozeCriterion snoozeCriterion = new SnoozeCriterion("id", "explanation", "confirmation");
- ArrayList<SnoozeCriterion> snoozeCriterions = new ArrayList<>();
- snoozeCriterions.add(snoozeCriterion);
-
- Ranking ranking = new RankingBuilder()
- .setKey(sbn.getKey())
- .setSmartActions(systemGeneratedSmartActions)
- .setChannel(NOTIFICATION_CHANNEL)
- .setUserSentiment(Ranking.USER_SENTIMENT_NEGATIVE)
- .setSnoozeCriteria(snoozeCriterions)
- .build();
-
- NotificationEntry entry =
- new NotificationEntry(sbn, ranking);
-
- assertEquals(systemGeneratedSmartActions, entry.getSmartActions());
- assertEquals(NOTIFICATION_CHANNEL, entry.getChannel());
- assertEquals(Ranking.USER_SENTIMENT_NEGATIVE, entry.getUserSentiment());
- assertEquals(snoozeCriterions, entry.getSnoozeCriteria());
- }
-
- @Test
- public void notificationDataEntry_testIsLastMessageFromReply() {
- Person.Builder person = new Person.Builder()
- .setName("name")
- .setKey("abc")
- .setUri("uri")
- .setBot(true);
-
- // EXTRA_MESSAGING_PERSON is the same Person as the sender in last message in EXTRA_MESSAGES
- Bundle bundle = new Bundle();
- bundle.putParcelable(Notification.EXTRA_MESSAGING_PERSON, person.build());
- Bundle[] messagesBundle = new Bundle[]{ new Notification.MessagingStyle.Message(
- "text", 0, person.build()).toBundle() };
- bundle.putParcelableArray(Notification.EXTRA_MESSAGES, messagesBundle);
-
- Notification notification = new Notification.Builder(mContext, "test")
- .addExtras(bundle)
- .build();
-
- NotificationEntry entry = new NotificationEntryBuilder()
- .setPkg("pkg")
- .setOpPkg("pkg")
- .setTag("tag")
- .setNotification(notification)
- .setUser(mContext.getUser())
- .setOverrideGroupKey("")
- .build();
- entry.setHasSentReply();
-
- assertTrue(entry.isLastMessageFromReply());
- }
-
- @Test
- public void personHighPriority() {
- Person person = new Person.Builder()
- .setName("name")
- .setKey("abc")
- .setUri("uri")
- .setBot(true)
- .build();
-
- Notification notification = new Notification.Builder(mContext, "test")
- .addPerson(person)
- .build();
-
- StatusBarNotification sbn = new StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
- notification, mContext.getUser(), "", 0);
-
- assertTrue(mNotificationData.isHighPriority(sbn));
- }
-
- @Test
- public void messagingStyleHighPriority() {
-
- Notification notification = new Notification.Builder(mContext, "test")
- .setStyle(new Notification.MessagingStyle(""))
- .build();
-
- StatusBarNotification sbn = new StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
- notification, mContext.getUser(), "", 0);
-
- assertTrue(mNotificationData.isHighPriority(sbn));
- }
-
- @Test
- public void minForegroundNotHighPriority() {
- Notification notification = mock(Notification.class);
- when(notification.isForegroundService()).thenReturn(true);
-
- StatusBarNotification sbn = new StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
- notification, mContext.getUser(), "", 0);
-
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_MIN);
- mNotificationData.rankingOverrides.put(sbn.getKey(), override);
-
- assertFalse(mNotificationData.isHighPriority(sbn));
- }
-
- @Test
- public void lowForegroundHighPriority() {
- Notification notification = mock(Notification.class);
- when(notification.isForegroundService()).thenReturn(true);
-
- StatusBarNotification sbn = new StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
- notification, mContext.getUser(), "", 0);
-
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_LOW);
- mNotificationData.rankingOverrides.put(sbn.getKey(), override);
-
- assertTrue(mNotificationData.isHighPriority(sbn));
- }
-
- @Test
- public void userChangeTrumpsHighPriorityCharacteristics() {
- Person person = new Person.Builder()
- .setName("name")
- .setKey("abc")
- .setUri("uri")
- .setBot(true)
- .build();
-
- Notification notification = new Notification.Builder(mContext, "test")
- .addPerson(person)
- .setStyle(new Notification.MessagingStyle(""))
- .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true)
- .build();
-
- StatusBarNotification sbn = new StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
- notification, mContext.getUser(), "", 0);
-
- NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_LOW);
- channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-
- Bundle override = new Bundle();
- override.putParcelable(OVERRIDE_CHANNEL, channel);
- mNotificationData.rankingOverrides.put(sbn.getKey(), override);
-
- assertFalse(mNotificationData.isHighPriority(sbn));
- }
-
- @Test
- public void testSort_highPriorityTrumpsNMSRank() {
- // NMS rank says A and then B. But A is not high priority and B is, so B should sort in
- // front
- Notification aN = new Notification.Builder(mContext, "test")
- .setStyle(new Notification.MessagingStyle(""))
- .build();
- NotificationEntry a = new NotificationEntryBuilder()
- .setPkg("pkg")
- .setOpPkg("pkg")
- .setTag("tag")
- .setNotification(aN)
- .setUser(mContext.getUser())
- .setOverrideGroupKey("")
- .build();
- a.setRow(mock(ExpandableNotificationRow.class));
- a.setIsHighPriority(false);
-
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_LOW);
- override.putInt(OVERRIDE_RANK, 1);
- mNotificationData.rankingOverrides.put(a.getKey(), override);
-
- Notification bN = new Notification.Builder(mContext, "test")
- .setStyle(new Notification.MessagingStyle(""))
- .build();
- NotificationEntry b = new NotificationEntryBuilder()
- .setPkg("pkg2")
- .setOpPkg("pkg2")
- .setTag("tag")
- .setNotification(bN)
- .setUser(mContext.getUser())
- .setOverrideGroupKey("")
- .build();
- b.setIsHighPriority(true);
- b.setRow(mock(ExpandableNotificationRow.class));
-
- Bundle bOverride = new Bundle();
- bOverride.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_LOW);
- bOverride.putInt(OVERRIDE_RANK, 2);
- mNotificationData.rankingOverrides.put(b.getKey(), bOverride);
-
- assertEquals(1, mNotificationData.mRankingComparator.compare(a, b));
- }
-
- @Test
- public void testSort_samePriorityUsesNMSRank() {
- // NMS rank says A and then B, and they are the same priority so use that rank
- Notification aN = new Notification.Builder(mContext, "test")
- .setStyle(new Notification.MessagingStyle(""))
- .build();
- NotificationEntry a = new NotificationEntryBuilder()
- .setPkg("pkg")
- .setOpPkg("pkg")
- .setTag("tag")
- .setNotification(aN)
- .setUser(mContext.getUser())
- .setOverrideGroupKey("")
- .build();
- a.setRow(mock(ExpandableNotificationRow.class));
- a.setIsHighPriority(false);
-
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_LOW);
- override.putInt(OVERRIDE_RANK, 1);
- mNotificationData.rankingOverrides.put(a.getKey(), override);
-
- Notification bN = new Notification.Builder(mContext, "test")
- .setStyle(new Notification.MessagingStyle(""))
- .build();
- NotificationEntry b = new NotificationEntryBuilder()
- .setPkg("pkg2")
- .setOpPkg("pkg2")
- .setTag("tag")
- .setNotification(bN)
- .setUser(mContext.getUser())
- .setOverrideGroupKey("")
- .build();
- b.setRow(mock(ExpandableNotificationRow.class));
- b.setIsHighPriority(false);
-
- Bundle bOverride = new Bundle();
- bOverride.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_LOW);
- bOverride.putInt(OVERRIDE_RANK, 2);
- mNotificationData.rankingOverrides.put(b.getKey(), bOverride);
-
- assertEquals(-1, mNotificationData.mRankingComparator.compare(a, b));
- }
-
- @Test
- public void testSort_properlySetsAlertingBucket() {
- Notification notification = new Notification.Builder(mContext, "test")
- .build();
- NotificationEntry entry = new NotificationEntryBuilder()
- .setPkg("pkg")
- .setOpPkg("pkg")
- .setTag("tag")
- .setNotification(notification)
- .setUser(mContext.getUser())
- .setOverrideGroupKey("")
- .build();
-
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_DEFAULT);
- mNotificationData.rankingOverrides.put(entry.getKey(), override);
-
- entry.setRow(mRow);
- mNotificationData.add(entry);
-
- assertEquals(entry.getBucket(), BUCKET_ALERTING);
- }
-
- @Test
- public void testSort_properlySetsSilentBucket() {
- Notification notification = new Notification.Builder(mContext, "test")
- .build();
-
- NotificationEntry entry = new NotificationEntryBuilder()
- .setPkg("pkg")
- .setOpPkg("pkg")
- .setTag("tag")
- .setNotification(notification)
- .setUser(mContext.getUser())
- .setOverrideGroupKey("")
- .build();
-
- Bundle override = new Bundle();
- override.putInt(OVERRIDE_IMPORTANCE, IMPORTANCE_LOW);
- mNotificationData.rankingOverrides.put(entry.getKey(), override);
-
- entry.setRow(mRow);
- mNotificationData.add(entry);
-
- assertEquals(entry.getBucket(), BUCKET_SILENT);
- }
-
- private void initStatusBarNotification(boolean allowDuringSetup) {
- Bundle bundle = new Bundle();
- bundle.putBoolean(Notification.EXTRA_ALLOW_DURING_SETUP, allowDuringSetup);
- Notification notification = new Notification.Builder(mContext, "test")
- .addExtras(bundle)
- .build();
- modifySbn(mEntry)
- .setNotification(notification)
- .build();
- }
-
- public static class TestableNotificationData extends NotificationData {
- public TestableNotificationData(NotificationSectionsFeatureManager sectionsFeatureManager) {
- super(
- sectionsFeatureManager,
- mock(NotifLog.class),
- mock(PeopleNotificationIdentifier.class));
- }
-
- public static final String OVERRIDE_RANK = "r";
- public static final String OVERRIDE_DND = "dnd";
- public static final String OVERRIDE_VIS_OVERRIDE = "vo";
- public static final String OVERRIDE_VIS_EFFECTS = "ve";
- public static final String OVERRIDE_IMPORTANCE = "i";
- public static final String OVERRIDE_IMP_EXP = "ie";
- public static final String OVERRIDE_GROUP = "g";
- public static final String OVERRIDE_CHANNEL = "c";
- public static final String OVERRIDE_PEOPLE = "p";
- public static final String OVERRIDE_SNOOZE_CRITERIA = "sc";
- public static final String OVERRIDE_BADGE = "b";
- public static final String OVERRIDE_USER_SENTIMENT = "us";
- public static final String OVERRIDE_HIDDEN = "h";
- public static final String OVERRIDE_LAST_ALERTED = "la";
- public static final String OVERRIDE_NOISY = "n";
- public static final String OVERRIDE_SMART_ACTIONS = "sa";
- public static final String OVERRIDE_SMART_REPLIES = "sr";
- public static final String OVERRIDE_BUBBLE = "cb";
- public static final String OVERRIDE_VISUALLY_INTERRUPTIVE = "vi";
-
- public Map<String, Bundle> rankingOverrides = new HashMap<>();
-
- @Override
- protected boolean getRanking(String key, Ranking outRanking) {
- super.getRanking(key, outRanking);
-
- ArrayList<String> currentAdditionalPeople = new ArrayList<>();
- if (outRanking.getAdditionalPeople() != null) {
- currentAdditionalPeople.addAll(outRanking.getAdditionalPeople());
- }
-
- ArrayList<SnoozeCriterion> currentSnooze = new ArrayList<>();
- if (outRanking.getSnoozeCriteria() != null) {
- currentSnooze.addAll(outRanking.getSnoozeCriteria());
- }
-
- ArrayList<Notification.Action> currentActions = new ArrayList<>();
- if (outRanking.getSmartActions() != null) {
- currentActions.addAll(outRanking.getSmartActions());
- }
-
- ArrayList<CharSequence> currentReplies = new ArrayList<>();
- if (outRanking.getSmartReplies() != null) {
- currentReplies.addAll(outRanking.getSmartReplies());
- }
-
- if (rankingOverrides.get(key) != null) {
- Bundle overrides = rankingOverrides.get(key);
- outRanking.populate(key,
- overrides.getInt(OVERRIDE_RANK, outRanking.getRank()),
- overrides.getBoolean(OVERRIDE_DND, outRanking.matchesInterruptionFilter()),
- overrides.getInt(OVERRIDE_VIS_OVERRIDE, outRanking.getVisibilityOverride()),
- overrides.getInt(OVERRIDE_VIS_EFFECTS,
- outRanking.getSuppressedVisualEffects()),
- overrides.getInt(OVERRIDE_IMPORTANCE, outRanking.getImportance()),
- overrides.getCharSequence(OVERRIDE_IMP_EXP,
- outRanking.getImportanceExplanation()),
- overrides.getString(OVERRIDE_GROUP, outRanking.getOverrideGroupKey()),
- overrides.containsKey(OVERRIDE_CHANNEL)
- ? (NotificationChannel) overrides.getParcelable(OVERRIDE_CHANNEL)
- : outRanking.getChannel(),
- overrides.containsKey(OVERRIDE_PEOPLE)
- ? overrides.getStringArrayList(OVERRIDE_PEOPLE)
- : currentAdditionalPeople,
- overrides.containsKey(OVERRIDE_SNOOZE_CRITERIA)
- ? overrides.getParcelableArrayList(OVERRIDE_SNOOZE_CRITERIA)
- : currentSnooze,
- overrides.getBoolean(OVERRIDE_BADGE, outRanking.canShowBadge()),
- overrides.getInt(OVERRIDE_USER_SENTIMENT, outRanking.getUserSentiment()),
- overrides.getBoolean(OVERRIDE_HIDDEN, outRanking.isSuspended()),
- overrides.getLong(OVERRIDE_LAST_ALERTED,
- outRanking.getLastAudiblyAlertedMillis()),
- overrides.getBoolean(OVERRIDE_NOISY, outRanking.isNoisy()),
- overrides.containsKey(OVERRIDE_SMART_ACTIONS)
- ? overrides.getParcelableArrayList(OVERRIDE_SMART_ACTIONS)
- : currentActions,
- overrides.containsKey(OVERRIDE_SMART_REPLIES)
- ? overrides.getCharSequenceArrayList(OVERRIDE_SMART_REPLIES)
- : currentReplies,
- overrides.getBoolean(OVERRIDE_BUBBLE, outRanking.canBubble()),
- overrides.getBoolean(OVERRIDE_VISUALLY_INTERRUPTIVE,
- outRanking.visuallyInterruptive()));
- } else {
- outRanking.populate(
- new RankingBuilder()
- .setKey(key)
- .build());
- }
- return true;
- }
- }
-
- private Notification.Action createContextualAction(String title) {
- return new Notification.Action.Builder(
- Icon.createWithResource(getContext(), android.R.drawable.sym_def_app_icon),
- title,
- PendingIntent.getBroadcast(getContext(), 0, new Intent("Action"), 0))
- .setContextual(true)
- .build();
- }
-
- private Notification.Action createAction(String title) {
- return new Notification.Action.Builder(
- Icon.createWithResource(getContext(), android.R.drawable.sym_def_app_icon),
- title,
- PendingIntent.getBroadcast(getContext(), 0, new Intent("Action"), 0)).build();
- }
-
- private ArrayList<Notification.Action> createActions(String... titles) {
- ArrayList<Notification.Action> actions = new ArrayList<>();
- for (String title : titles) {
- actions.add(createAction(title));
- }
- return actions;
- }
-}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryTest.java
new file mode 100644
index 0000000..536aeb4
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryTest.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection;
+
+import static android.app.Notification.CATEGORY_ALARM;
+import static android.app.Notification.CATEGORY_CALL;
+import static android.app.Notification.CATEGORY_EVENT;
+import static android.app.Notification.CATEGORY_MESSAGE;
+import static android.app.Notification.CATEGORY_REMINDER;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
+
+import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking;
+import static com.android.systemui.statusbar.NotificationEntryHelper.modifySbn;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import android.app.ActivityManager;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.PendingIntent;
+import android.app.Person;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.media.session.MediaSession;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.service.notification.NotificationListenerService.Ranking;
+import android.service.notification.SnoozeCriterion;
+import android.service.notification.StatusBarNotification;
+import android.testing.AndroidTestingRunner;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.systemui.R;
+import com.android.systemui.SysuiTestCase;
+import com.android.systemui.statusbar.NotificationEntryBuilder;
+import com.android.systemui.statusbar.RankingBuilder;
+import com.android.systemui.statusbar.SbnBuilder;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+
+@SmallTest
+@RunWith(AndroidTestingRunner.class)
+public class NotificationEntryTest extends SysuiTestCase {
+ private static final String TEST_PACKAGE_NAME = "test";
+ private static final int TEST_UID = 0;
+ private static final int UID_NORMAL = 123;
+ private static final NotificationChannel NOTIFICATION_CHANNEL =
+ new NotificationChannel("id", "name", NotificationChannel.USER_LOCKED_IMPORTANCE);
+
+ private int mId;
+
+ private NotificationEntry mEntry;
+
+ @Before
+ public void setup() {
+ Notification.Builder n = new Notification.Builder(mContext, "")
+ .setSmallIcon(R.drawable.ic_person)
+ .setContentTitle("Title")
+ .setContentText("Text");
+
+ mEntry = new NotificationEntryBuilder()
+ .setPkg(TEST_PACKAGE_NAME)
+ .setOpPkg(TEST_PACKAGE_NAME)
+ .setUid(TEST_UID)
+ .setId(mId++)
+ .setNotification(n.build())
+ .setUser(new UserHandle(ActivityManager.getCurrentUser()))
+ .build();
+ }
+
+ @Test
+ public void testIsExemptFromDndVisualSuppression_foreground() {
+ mEntry.getSbn().getNotification().flags = Notification.FLAG_FOREGROUND_SERVICE;
+
+ assertTrue(mEntry.isExemptFromDndVisualSuppression());
+ assertFalse(mEntry.shouldSuppressAmbient());
+ }
+
+ @Test
+ public void testIsExemptFromDndVisualSuppression_media() {
+ Notification.Builder n = new Notification.Builder(mContext, "")
+ .setStyle(new Notification.MediaStyle()
+ .setMediaSession(mock(MediaSession.Token.class)))
+ .setSmallIcon(R.drawable.ic_person)
+ .setContentTitle("Title")
+ .setContentText("Text");
+ NotificationEntry e1 = new NotificationEntryBuilder()
+ .setNotification(n.build())
+ .build();
+
+ assertTrue(e1.isExemptFromDndVisualSuppression());
+ assertFalse(e1.shouldSuppressAmbient());
+ }
+
+ @Test
+ public void testIsExemptFromDndVisualSuppression_system() {
+ mEntry.mIsSystemNotification = true;
+
+ assertTrue(mEntry.isExemptFromDndVisualSuppression());
+ assertFalse(mEntry.shouldSuppressAmbient());
+ }
+
+ @Test
+ public void testIsNotExemptFromDndVisualSuppression_hiddenCategories() {
+ NotificationEntry entry = new NotificationEntryBuilder()
+ .setUid(UID_NORMAL)
+ .build();
+ entry.mIsSystemNotification = true;
+ modifyRanking(entry).setSuppressedVisualEffects(SUPPRESSED_EFFECT_AMBIENT).build();
+
+ modifySbn(entry)
+ .setNotification(
+ new Notification.Builder(mContext, "").setCategory(CATEGORY_CALL).build())
+ .build();
+ assertFalse(entry.isExemptFromDndVisualSuppression());
+ assertTrue(entry.shouldSuppressAmbient());
+
+ modifySbn(entry)
+ .setNotification(
+ new Notification.Builder(mContext, "")
+ .setCategory(CATEGORY_REMINDER)
+ .build())
+ .build();
+ assertFalse(entry.isExemptFromDndVisualSuppression());
+
+ modifySbn(entry)
+ .setNotification(
+ new Notification.Builder(mContext, "").setCategory(CATEGORY_ALARM).build())
+ .build();
+ assertFalse(entry.isExemptFromDndVisualSuppression());
+
+ modifySbn(entry)
+ .setNotification(
+ new Notification.Builder(mContext, "").setCategory(CATEGORY_EVENT).build())
+ .build();
+ assertFalse(entry.isExemptFromDndVisualSuppression());
+
+ modifySbn(entry)
+ .setNotification(
+ new Notification.Builder(mContext, "")
+ .setCategory(CATEGORY_MESSAGE)
+ .build())
+ .build();
+ assertFalse(entry.isExemptFromDndVisualSuppression());
+ }
+
+ @Test
+ public void testCreateNotificationDataEntry_RankingUpdate() {
+ StatusBarNotification sbn = new SbnBuilder().build();
+ sbn.getNotification().actions =
+ new Notification.Action[]{createContextualAction("appGeneratedAction")};
+
+ ArrayList<Notification.Action> systemGeneratedSmartActions =
+ createActions("systemGeneratedAction");
+
+ SnoozeCriterion snoozeCriterion = new SnoozeCriterion("id", "explanation", "confirmation");
+ ArrayList<SnoozeCriterion> snoozeCriterions = new ArrayList<>();
+ snoozeCriterions.add(snoozeCriterion);
+
+ Ranking ranking = new RankingBuilder()
+ .setKey(sbn.getKey())
+ .setSmartActions(systemGeneratedSmartActions)
+ .setChannel(NOTIFICATION_CHANNEL)
+ .setUserSentiment(Ranking.USER_SENTIMENT_NEGATIVE)
+ .setSnoozeCriteria(snoozeCriterions)
+ .build();
+
+ NotificationEntry entry =
+ new NotificationEntry(sbn, ranking);
+
+ assertEquals(systemGeneratedSmartActions, entry.getSmartActions());
+ assertEquals(NOTIFICATION_CHANNEL, entry.getChannel());
+ assertEquals(Ranking.USER_SENTIMENT_NEGATIVE, entry.getUserSentiment());
+ assertEquals(snoozeCriterions, entry.getSnoozeCriteria());
+ }
+
+ @Test
+ public void notificationDataEntry_testIsLastMessageFromReply() {
+ Person.Builder person = new Person.Builder()
+ .setName("name")
+ .setKey("abc")
+ .setUri("uri")
+ .setBot(true);
+
+ // EXTRA_MESSAGING_PERSON is the same Person as the sender in last message in EXTRA_MESSAGES
+ Bundle bundle = new Bundle();
+ bundle.putParcelable(Notification.EXTRA_MESSAGING_PERSON, person.build());
+ Bundle[] messagesBundle = new Bundle[]{new Notification.MessagingStyle.Message(
+ "text", 0, person.build()).toBundle()};
+ bundle.putParcelableArray(Notification.EXTRA_MESSAGES, messagesBundle);
+
+ Notification notification = new Notification.Builder(mContext, "test")
+ .addExtras(bundle)
+ .build();
+
+ NotificationEntry entry = new NotificationEntryBuilder()
+ .setPkg("pkg")
+ .setOpPkg("pkg")
+ .setTag("tag")
+ .setNotification(notification)
+ .setUser(mContext.getUser())
+ .setOverrideGroupKey("")
+ .build();
+ entry.setHasSentReply();
+
+ assertTrue(entry.isLastMessageFromReply());
+ }
+
+ private Notification.Action createContextualAction(String title) {
+ return new Notification.Action.Builder(
+ Icon.createWithResource(getContext(), android.R.drawable.sym_def_app_icon),
+ title,
+ PendingIntent.getBroadcast(getContext(), 0, new Intent("Action"), 0))
+ .setContextual(true)
+ .build();
+ }
+
+ private Notification.Action createAction(String title) {
+ return new Notification.Action.Builder(
+ Icon.createWithResource(getContext(), android.R.drawable.sym_def_app_icon),
+ title,
+ PendingIntent.getBroadcast(getContext(), 0, new Intent("Action"), 0)).build();
+ }
+
+ private ArrayList<Notification.Action> createActions(String... titles) {
+ ArrayList<Notification.Action> actions = new ArrayList<>();
+ for (String title : titles) {
+ actions.add(createAction(title));
+ }
+ return actions;
+ }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManagerTest.kt
new file mode 100644
index 0000000..01b2f89
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManagerTest.kt
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.notification.collection
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager.IMPORTANCE_DEFAULT
+import android.app.NotificationManager.IMPORTANCE_LOW
+import android.app.Person
+import android.service.notification.NotificationListenerService.RankingMap
+import android.service.notification.StatusBarNotification
+import android.testing.AndroidTestingRunner
+
+import org.junit.runner.RunWith
+
+import androidx.test.filters.SmallTest
+
+import com.android.systemui.SysuiTestCase
+import com.android.systemui.statusbar.NotificationEntryBuilder
+import com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking
+import com.android.systemui.statusbar.NotificationMediaManager
+import com.android.systemui.statusbar.notification.NotificationFilter
+import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager
+import com.android.systemui.statusbar.notification.logging.NotifLog
+import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_ALERTING
+import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_SILENT
+import com.android.systemui.statusbar.phone.NotificationGroupManager
+import com.android.systemui.statusbar.policy.HeadsUpManager
+import dagger.Lazy
+import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertFalse
+import junit.framework.Assert.assertTrue
+
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.mock
+
+@SmallTest
+@RunWith(AndroidTestingRunner::class)
+class NotificationRankingManagerTest
+ : SysuiTestCase() {
+
+ private var lazyMedia: Lazy<NotificationMediaManager> = Lazy {
+ mock<NotificationMediaManager>(NotificationMediaManager::class.java)
+ }
+
+ private val rankingManager = TestableNotificationRankingManager(
+ lazyMedia,
+ mock<NotificationGroupManager>(NotificationGroupManager::class.java),
+ mock<HeadsUpManager>(HeadsUpManager::class.java),
+ mock<NotificationFilter>(NotificationFilter::class.java),
+ mock<NotifLog>(NotifLog::class.java),
+ mock<NotificationSectionsFeatureManager>(NotificationSectionsFeatureManager::class.java)
+ )
+
+ @Before
+ fun setup() {
+ }
+
+ @Test
+ fun testPeopleNotification_isHighPriority() {
+ val person = Person.Builder()
+ .setName("name")
+ .setKey("abc")
+ .setUri("uri")
+ .setBot(true)
+ .build()
+
+ val notification = Notification.Builder(mContext, "test")
+ .addPerson(person)
+ .build()
+
+ val sbn = StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
+ notification, mContext.user, "", 0)
+
+ val e = NotificationEntryBuilder()
+ .setNotification(notification)
+ .setSbn(sbn)
+ .build()
+
+ assertTrue(rankingManager.isHighPriority2(e))
+ }
+
+ @Test
+ fun messagingStyleHighPriority() {
+
+ val notif = Notification.Builder(mContext, "test")
+ .setStyle(Notification.MessagingStyle(""))
+ .build()
+
+ val sbn = StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
+ notif, mContext.getUser(), "", 0)
+
+ val e = NotificationEntryBuilder()
+ .setNotification(notif)
+ .setSbn(sbn)
+ .build()
+
+ assertTrue(rankingManager.isHighPriority2(e))
+ }
+
+ @Test
+ fun lowForegroundHighPriority() {
+ val notification = mock(Notification::class.java)
+ `when`<Boolean>(notification.isForegroundService).thenReturn(true)
+
+ val sbn = StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
+ notification, mContext.user, "", 0)
+
+ val e = NotificationEntryBuilder()
+ .setNotification(notification)
+ .setSbn(sbn)
+ .build()
+
+ modifyRanking(e)
+ .setImportance(IMPORTANCE_LOW)
+ .build()
+
+ assertTrue(rankingManager.isHighPriority2(e))
+ }
+
+ @Test
+ fun userChangeTrumpsHighPriorityCharacteristics() {
+ val person = Person.Builder()
+ .setName("name")
+ .setKey("abc")
+ .setUri("uri")
+ .setBot(true)
+ .build()
+
+ val notification = Notification.Builder(mContext, "test")
+ .addPerson(person)
+ .setStyle(Notification.MessagingStyle(""))
+ .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true)
+ .build()
+
+ val sbn = StatusBarNotification("pkg", "pkg", 0, "tag", 0, 0,
+ notification, mContext.user, "", 0)
+
+ val channel = NotificationChannel("a", "a", IMPORTANCE_LOW)
+ channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE)
+
+ val e = NotificationEntryBuilder()
+ .setSbn(sbn)
+ .setChannel(channel)
+ .build()
+
+ assertFalse(rankingManager.isHighPriority2(e))
+ }
+
+ @Test
+ fun testSort_highPriorityTrumpsNMSRank() {
+ // NMS rank says A and then B. But A is not high priority and B is, so B should sort in
+ // front
+ val aN = Notification.Builder(mContext, "test")
+ .setStyle(Notification.MessagingStyle(""))
+ .build()
+ val a = NotificationEntryBuilder()
+ .setPkg("pkg")
+ .setOpPkg("pkg")
+ .setTag("tag")
+ .setNotification(aN)
+ .setUser(mContext.getUser())
+ .setOverrideGroupKey("")
+ .build()
+
+ a.setIsHighPriority(false)
+
+ modifyRanking(a)
+ .setImportance(IMPORTANCE_LOW)
+ .setRank(1)
+ .build()
+
+ val bN = Notification.Builder(mContext, "test")
+ .setStyle(Notification.MessagingStyle(""))
+ .build()
+ val b = NotificationEntryBuilder()
+ .setPkg("pkg2")
+ .setOpPkg("pkg2")
+ .setTag("tag")
+ .setNotification(bN)
+ .setUser(mContext.getUser())
+ .setOverrideGroupKey("")
+ .build()
+ b.setIsHighPriority(true)
+
+ modifyRanking(b)
+ .setImportance(IMPORTANCE_LOW)
+ .setRank(2)
+ .build()
+
+ assertEquals(
+ listOf(b, a),
+ rankingManager.updateRanking(null, listOf(a, b), "test"))
+ }
+
+ @Test
+ fun testSort_samePriorityUsesNMSRank() {
+ // NMS rank says A and then B, and they are the same priority so use that rank
+ val aN = Notification.Builder(mContext, "test")
+ .setStyle(Notification.MessagingStyle(""))
+ .build()
+ val a = NotificationEntryBuilder()
+ .setPkg("pkg")
+ .setOpPkg("pkg")
+ .setTag("tag")
+ .setNotification(aN)
+ .setUser(mContext.getUser())
+ .setOverrideGroupKey("")
+ .build()
+ a.setIsHighPriority(false)
+
+ modifyRanking(a)
+ .setImportance(IMPORTANCE_LOW)
+ .setRank(1)
+ .build()
+
+ val bN = Notification.Builder(mContext, "test")
+ .setStyle(Notification.MessagingStyle(""))
+ .build()
+ val b = NotificationEntryBuilder()
+ .setPkg("pkg2")
+ .setOpPkg("pkg2")
+ .setTag("tag")
+ .setNotification(bN)
+ .setUser(mContext.getUser())
+ .setOverrideGroupKey("")
+ .build()
+ b.setIsHighPriority(false)
+
+ modifyRanking(b)
+ .setImportance(IMPORTANCE_LOW)
+ .setRank(2)
+ .build()
+
+ assertEquals(
+ listOf(a, b),
+ rankingManager.updateRanking(null, listOf(a, b), "test"))
+ }
+
+ @Test
+ fun testSort_properlySetsAlertingBucket() {
+ val notif = Notification.Builder(mContext, "test") .build()
+
+ val e = NotificationEntryBuilder()
+ .setPkg("pkg")
+ .setOpPkg("pkg")
+ .setTag("tag")
+ .setNotification(notif)
+ .setUser(mContext.user)
+ .setOverrideGroupKey("")
+ .build()
+
+ modifyRanking(e).setImportance(IMPORTANCE_DEFAULT) .build()
+
+ rankingManager.updateRanking(RankingMap(arrayOf(e.ranking)), listOf(e), "test")
+ assertEquals(e.bucket, BUCKET_ALERTING)
+ }
+
+ @Test
+ fun testSort_properlySetsSilentBucket() {
+ val notif = Notification.Builder(mContext, "test") .build()
+
+ val e = NotificationEntryBuilder()
+ .setPkg("pkg")
+ .setOpPkg("pkg")
+ .setTag("tag")
+ .setNotification(notif)
+ .setUser(mContext.user)
+ .setOverrideGroupKey("")
+ .build()
+
+ modifyRanking(e).setImportance(IMPORTANCE_LOW).build()
+
+ rankingManager.updateRanking(RankingMap(arrayOf(e.ranking)), listOf(e), "test")
+ assertEquals(e.bucket, BUCKET_SILENT)
+ }
+
+ internal class TestableNotificationRankingManager(
+ mediaManager: Lazy<NotificationMediaManager>,
+ groupManager: NotificationGroupManager,
+ headsUpManager: HeadsUpManager,
+ filter: NotificationFilter,
+ notifLog: NotifLog,
+ sectionsFeatureManager: NotificationSectionsFeatureManager
+ ) : NotificationRankingManager(
+ mediaManager,
+ groupManager,
+ headsUpManager,
+ filter,
+ notifLog,
+ sectionsFeatureManager
+ ) {
+
+ fun isHighPriority2(e: NotificationEntry): Boolean {
+ return isHighPriority(e)
+ }
+
+ fun applyTestRankingMap(r: RankingMap) {
+ rankingMap = r
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java
index 47c17ad..d139866 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java
@@ -44,7 +44,6 @@
import com.android.systemui.statusbar.StatusBarStateControllerImpl;
import com.android.systemui.statusbar.notification.NotificationEntryListener;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
@@ -71,7 +70,6 @@
@Mock private NotificationListContainer mListContainer;
@Mock private IStatusBarService mBarService;
- @Mock private NotificationData mNotificationData;
@Mock private ExpandableNotificationRow mRow;
@Mock private NotificationLogger.ExpansionStateLogger mExpansionStateLogger;
@@ -91,8 +89,6 @@
mDependency.injectTestDependency(NotificationEntryManager.class, mEntryManager);
mDependency.injectTestDependency(NotificationListener.class, mListener);
- when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
-
mEntry = new NotificationEntryBuilder()
.setPkg(TEST_PACKAGE_NAME)
.setOpPkg(TEST_PACKAGE_NAME)
@@ -131,7 +127,7 @@
any(NotificationVisibility[].class));
when(mListContainer.isInVisibleLocation(any())).thenReturn(true);
- when(mNotificationData.getActiveNotifications()).thenReturn(Lists.newArrayList(mEntry));
+ when(mEntryManager.getVisibleNotifications()).thenReturn(Lists.newArrayList(mEntry));
mLogger.getChildLocationsChangedListenerForTest().onChildLocationsChanged();
TestableLooper.get(this).processAllMessages();
waitForUiOffloadThread();
@@ -153,7 +149,7 @@
public void testStoppingNotificationLoggingReportsCurrentNotifications()
throws Exception {
when(mListContainer.isInVisibleLocation(any())).thenReturn(true);
- when(mNotificationData.getActiveNotifications()).thenReturn(Lists.newArrayList(mEntry));
+ when(mEntryManager.getVisibleNotifications()).thenReturn(Lists.newArrayList(mEntry));
mLogger.getChildLocationsChangedListenerForTest().onChildLocationsChanged();
TestableLooper.get(this).processAllMessages();
waitForUiOffloadThread();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java
index 71c2e11..ba28879 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java
@@ -139,7 +139,7 @@
@Test
public void testInflationThrowsErrorDoesntCallUpdated() throws Exception {
mRow.getPrivateLayout().removeAllViews();
- mRow.getStatusBarNotification().getNotification().contentView
+ mRow.getEntry().getSbn().getNotification().contentView
= new RemoteViews(mContext.getPackageName(), R.layout.status_bar);
runThenWaitForInflation(() -> mNotificationInflater.inflateNotificationViews(),
true /* expectingException */, mNotificationInflater);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java
index bc616c5..749dae5 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java
@@ -320,7 +320,8 @@
.setUserSentiment(USER_SENTIMENT_NEGATIVE)
.build();
when(row.getIsNonblockable()).thenReturn(false);
- StatusBarNotification statusBarNotification = row.getStatusBarNotification();
+ StatusBarNotification statusBarNotification = row.getEntry().getSbn();
+ NotificationEntry entry = row.getEntry();
mGutsManager.initializeNotificationInfo(row, notificationInfoView);
@@ -331,7 +332,7 @@
eq(statusBarNotification.getPackageName()),
any(NotificationChannel.class),
anySet(),
- eq(statusBarNotification),
+ eq(entry),
any(NotificationInfo.CheckSaveListener.class),
any(NotificationInfo.OnSettingsClickListener.class),
any(NotificationInfo.OnAppSettingsClickListener.class),
@@ -351,7 +352,8 @@
.setUserSentiment(USER_SENTIMENT_NEGATIVE)
.build();
when(row.getIsNonblockable()).thenReturn(false);
- StatusBarNotification statusBarNotification = row.getStatusBarNotification();
+ StatusBarNotification statusBarNotification = row.getEntry().getSbn();
+ NotificationEntry entry = row.getEntry();
mGutsManager.initializeNotificationInfo(row, notificationInfoView);
@@ -362,7 +364,7 @@
eq(statusBarNotification.getPackageName()),
any(NotificationChannel.class),
anySet(),
- eq(statusBarNotification),
+ eq(entry),
any(NotificationInfo.CheckSaveListener.class),
any(NotificationInfo.OnSettingsClickListener.class),
any(NotificationInfo.OnAppSettingsClickListener.class),
@@ -384,7 +386,8 @@
.build();
row.getEntry().setIsHighPriority(true);
when(row.getIsNonblockable()).thenReturn(false);
- StatusBarNotification statusBarNotification = row.getStatusBarNotification();
+ StatusBarNotification statusBarNotification = row.getEntry().getSbn();
+ NotificationEntry entry = row.getEntry();
mGutsManager.initializeNotificationInfo(row, notificationInfoView);
@@ -395,7 +398,7 @@
eq(statusBarNotification.getPackageName()),
any(NotificationChannel.class),
anySet(),
- eq(statusBarNotification),
+ eq(entry),
any(NotificationInfo.CheckSaveListener.class),
any(NotificationInfo.OnSettingsClickListener.class),
any(NotificationInfo.OnAppSettingsClickListener.class),
@@ -415,7 +418,9 @@
.setUserSentiment(USER_SENTIMENT_NEGATIVE)
.build();
when(row.getIsNonblockable()).thenReturn(false);
- StatusBarNotification statusBarNotification = row.getStatusBarNotification();
+ StatusBarNotification statusBarNotification = row.getEntry().getSbn();
+ NotificationEntry entry = row.getEntry();
+
when(mDeviceProvisionedController.isDeviceProvisioned()).thenReturn(true);
mGutsManager.initializeNotificationInfo(row, notificationInfoView);
@@ -427,7 +432,7 @@
eq(statusBarNotification.getPackageName()),
any(NotificationChannel.class),
anySet(),
- eq(statusBarNotification),
+ eq(entry),
any(NotificationInfo.CheckSaveListener.class),
any(NotificationInfo.OnSettingsClickListener.class),
any(NotificationInfo.OnAppSettingsClickListener.class),
@@ -447,7 +452,8 @@
.setUserSentiment(USER_SENTIMENT_NEGATIVE)
.build();
when(row.getIsNonblockable()).thenReturn(false);
- StatusBarNotification statusBarNotification = row.getStatusBarNotification();
+ StatusBarNotification statusBarNotification = row.getEntry().getSbn();
+ NotificationEntry entry = row.getEntry();
mGutsManager.initializeNotificationInfo(row, notificationInfoView);
@@ -458,7 +464,7 @@
eq(statusBarNotification.getPackageName()),
any(NotificationChannel.class),
anySet(),
- eq(statusBarNotification),
+ eq(entry),
any(NotificationInfo.CheckSaveListener.class),
any(NotificationInfo.OnSettingsClickListener.class),
any(NotificationInfo.OnAppSettingsClickListener.class),
@@ -524,7 +530,7 @@
private NotificationMenuRowPlugin.MenuItem createTestMenuItem(ExpandableNotificationRow row) {
NotificationMenuRowPlugin menuRow = new NotificationMenuRow(mContext);
- menuRow.createMenu(row, row.getStatusBarNotification());
+ menuRow.createMenu(row, row.getEntry().getSbn());
NotificationMenuRowPlugin.MenuItem menuItem = menuRow.getLongpressMenuItem(mContext);
assertNotNull(menuItem);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java
index 703adf7..bdca7ef 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java
@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.notification.row;
+import static android.app.Notification.FLAG_BUBBLE;
import static android.app.NotificationChannel.USER_LOCKED_IMPORTANCE;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -49,10 +50,13 @@
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationChannelGroup;
+import android.app.PendingIntent;
+import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
import android.os.IBinder;
import android.os.UserHandle;
import android.provider.Settings;
@@ -72,7 +76,12 @@
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
+import com.android.systemui.bubbles.BubbleController;
+import com.android.systemui.bubbles.BubblesTestActivity;
+import com.android.systemui.statusbar.NotificationEntryBuilder;
+import com.android.systemui.statusbar.SbnBuilder;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import org.junit.After;
import org.junit.Before;
@@ -106,6 +115,9 @@
private Set<NotificationChannel> mNotificationChannelSet = new HashSet<>();
private Set<NotificationChannel> mDefaultNotificationChannelSet = new HashSet<>();
private StatusBarNotification mSbn;
+ private NotificationEntry mEntry;
+ private StatusBarNotification mBubbleSbn;
+ private NotificationEntry mBubbleEntry;
@Rule
public MockitoRule mockito = MockitoJUnit.rule();
@@ -119,6 +131,8 @@
private NotificationBlockingHelperManager mBlockingHelperManager;
@Mock
private VisualStabilityManager mVisualStabilityManager;
+ @Mock
+ private BubbleController mBubbleController;
@Before
public void setUp() throws Exception {
@@ -126,13 +140,18 @@
NotificationBlockingHelperManager.class,
mBlockingHelperManager);
mTestableLooper = TestableLooper.get(this);
+
mDependency.injectTestDependency(Dependency.BG_LOOPER, mTestableLooper.getLooper());
mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);
+ mDependency.injectTestDependency(BubbleController.class, mBubbleController);
// Inflate the layout
final LayoutInflater layoutInflater = LayoutInflater.from(mContext);
mNotificationInfo = (NotificationInfo) layoutInflater.inflate(R.layout.notification_info,
null);
mNotificationInfo.setGutsParent(mock(NotificationGuts.class));
+ // Our view is never attached to a window so the View#post methods in NotificationInfo never
+ // get called. Setting this will skip the post and do the action immediately.
+ mNotificationInfo.mSkipPost = true;
// PackageManager must return a packageInfo and applicationInfo.
final PackageInfo packageInfo = new PackageInfo();
@@ -164,6 +183,16 @@
mDefaultNotificationChannelSet.add(mDefaultNotificationChannel);
mSbn = new StatusBarNotification(TEST_PACKAGE_NAME, TEST_PACKAGE_NAME, 0, null, TEST_UID, 0,
new Notification(), UserHandle.CURRENT, null, 0);
+ mEntry = new NotificationEntryBuilder().setSbn(mSbn).build();
+
+ PendingIntent bubbleIntent = PendingIntent.getActivity(mContext, 0,
+ new Intent(mContext, BubblesTestActivity.class), 0);
+ mBubbleSbn = new SbnBuilder(mSbn).setBubbleMetadata(
+ new Notification.BubbleMetadata.Builder()
+ .setIntent(bubbleIntent)
+ .setIcon(Icon.createWithResource(mContext, R.drawable.android)).build())
+ .build();
+ mBubbleEntry = new NotificationEntryBuilder().setSbn(mBubbleSbn).build();
Settings.Secure.putInt(mContext.getContentResolver(),
NOTIFICATION_NEW_INTERRUPTION_MODEL, 1);
@@ -182,17 +211,6 @@
() -> VISIBLE == mNotificationInfo.findViewById(R.id.confirmation).getVisibility());
}
- private void ensureNoUndoButton() {
- PollingCheck.waitFor(1000,
- () -> GONE == mNotificationInfo.findViewById(R.id.confirmation).getVisibility()
- && !mNotificationInfo.isAnimating());
- }
-
- private void waitForStopButton() {
- PollingCheck.waitFor(1000,
- () -> VISIBLE == mNotificationInfo.findViewById(R.id.prompt).getVisibility());
- }
-
@Test
public void testBindNotification_SetsTextApplicationName() throws Exception {
when(mMockPackageManager.getApplicationLabel(any())).thenReturn("App Name");
@@ -203,7 +221,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -228,7 +246,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -249,7 +267,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -273,6 +291,7 @@
applicationInfo);
when(mMockPackageManager.getApplicationLabel(any())).thenReturn("Other");
+ NotificationEntry entry = new NotificationEntryBuilder().setSbn(mSbn).build();
mNotificationInfo.bindNotification(
mMockPackageManager,
mMockINotificationManager,
@@ -280,7 +299,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ entry,
null,
null,
null,
@@ -304,7 +323,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -331,7 +350,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -353,7 +372,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -374,7 +393,7 @@
TEST_PACKAGE_NAME,
mDefaultNotificationChannel,
mDefaultNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -399,7 +418,7 @@
TEST_PACKAGE_NAME,
mDefaultNotificationChannel,
mDefaultNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -420,7 +439,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -441,7 +460,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
mock(NotificationInfo.OnSettingsClickListener.class),
null,
@@ -468,7 +487,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
(View v, NotificationChannel c, int appUid) -> {
assertEquals(mNotificationChannel, c);
@@ -495,7 +514,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -517,7 +536,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
(View v, NotificationChannel c, int appUid) -> {
assertEquals(mNotificationChannel, c);
@@ -540,7 +559,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -555,7 +574,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
(View v, NotificationChannel c, int appUid) -> { },
null,
@@ -576,7 +595,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -600,7 +619,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -625,7 +644,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -647,7 +666,7 @@
mVisualStabilityManager,
TEST_PACKAGE_NAME, mNotificationChannel,
createMultipleChannelSet(MULTIPLE_CHANNEL_COUNT),
- mSbn,
+ mEntry,
null,
(View v, NotificationChannel c, int appUid) -> {
assertEquals(null, c);
@@ -675,7 +694,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
createMultipleChannelSet(MULTIPLE_CHANNEL_COUNT),
- mSbn,
+ mEntry,
null,
null,
null,
@@ -698,7 +717,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
createMultipleChannelSet(MULTIPLE_CHANNEL_COUNT),
- mSbn,
+ mEntry,
null,
null,
null,
@@ -721,7 +740,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -738,6 +757,202 @@
}
@Test
+ public void testBindNotification_alertIsSelected() throws Exception {
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mBubbleEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ true);
+ assertTrue(mNotificationInfo.findViewById(R.id.alert).isSelected());
+ }
+
+ @Test
+ public void testBindNotification_silenceIsSelected() throws Exception {
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mBubbleEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ false);
+ assertTrue(mNotificationInfo.findViewById(R.id.silence).isSelected());
+ }
+
+ @Test
+ public void testBindNotification_bubbleIsSelected() throws Exception {
+ mBubbleEntry.getSbn().getNotification().flags |= FLAG_BUBBLE;
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mBubbleEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ true);
+
+ View bubbleView = mNotificationInfo.findViewById(R.id.bubble);
+ assertEquals(View.VISIBLE, bubbleView.getVisibility());
+ assertTrue(bubbleView.isSelected());
+ }
+
+ @Test
+ public void testBindNotification_whenCanBubble() throws Exception {
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mBubbleEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ true);
+
+ View bubbleView = mNotificationInfo.findViewById(R.id.bubble);
+ assertEquals(View.VISIBLE, bubbleView.getVisibility());
+ assertFalse(bubbleView.isSelected());
+ }
+
+ @Test
+ public void testBindNotification_whenCantBubble() throws Exception {
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ true);
+ View bubbleView = mNotificationInfo.findViewById(R.id.bubble);
+ assertEquals(View.GONE, bubbleView.getVisibility());
+ }
+
+ @Test
+ public void testBubble_promotesBubble() throws Exception {
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mBubbleEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ true);
+
+ assertFalse(mBubbleEntry.isBubble());
+
+ // Promote it
+ mNotificationInfo.findViewById(R.id.bubble).performClick();
+ mNotificationInfo.findViewById(R.id.done).performClick();
+ mNotificationInfo.handleCloseControls(true, false);
+
+ verify(mBubbleController, times(1)).onUserCreatedBubbleFromNotification(mBubbleEntry);
+ }
+
+ @Test
+ public void testAlert_demotesBubble() throws Exception {
+ mBubbleEntry.getSbn().getNotification().flags |= FLAG_BUBBLE;
+
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mBubbleEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ true);
+
+ assertTrue(mBubbleEntry.isBubble());
+
+ // Demote it
+ mNotificationInfo.findViewById(R.id.alert).performClick();
+ mNotificationInfo.findViewById(R.id.done).performClick();
+ mNotificationInfo.handleCloseControls(true, false);
+
+ verify(mBubbleController, times(1)).onUserDemotedBubbleFromNotification(mBubbleEntry);
+ }
+
+ @Test
+ public void testSilence_demotesBubble() throws Exception {
+ mBubbleEntry.getSbn().getNotification().flags |= FLAG_BUBBLE;
+
+ mNotificationInfo.bindNotification(
+ mMockPackageManager,
+ mMockINotificationManager,
+ mVisualStabilityManager,
+ TEST_PACKAGE_NAME,
+ mNotificationChannel,
+ mNotificationChannelSet,
+ mBubbleEntry,
+ null,
+ null,
+ null,
+ true,
+ false,
+ IMPORTANCE_DEFAULT,
+ true);
+
+ assertTrue(mBubbleEntry.isBubble());
+
+ // Demote it
+ mNotificationInfo.findViewById(R.id.silence).performClick();
+ mNotificationInfo.findViewById(R.id.done).performClick();
+ mNotificationInfo.handleCloseControls(true, false);
+
+ verify(mBubbleController, times(1)).onUserDemotedBubbleFromNotification(mBubbleEntry);
+ }
+
+ @Test
public void testBindNotification_DoesNotUpdateNotificationChannel() throws Exception {
mNotificationInfo.bindNotification(
mMockPackageManager,
@@ -746,7 +961,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -769,7 +984,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -795,7 +1010,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -821,7 +1036,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -848,7 +1063,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -878,7 +1093,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel /* notificationChannel */,
createMultipleChannelSet(10) /* numUniqueChannelsInRow */,
- mSbn,
+ mEntry,
listener /* checkSaveListener */,
null /* onSettingsClick */,
null /* onAppSettingsClick */,
@@ -917,7 +1132,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel /* notificationChannel */,
createMultipleChannelSet(10) /* numUniqueChannelsInRow */,
- mSbn,
+ mEntry,
listener /* checkSaveListener */,
null /* onSettingsClick */,
null /* onAppSettingsClick */,
@@ -945,7 +1160,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel /* notificationChannel */,
createMultipleChannelSet(10) /* numUniqueChannelsInRow */,
- mSbn,
+ mEntry,
listener /* checkSaveListener */,
null /* onSettingsClick */,
null /* onAppSettingsClick */,
@@ -970,7 +1185,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet /* numChannels */,
- mSbn,
+ mEntry,
null /* checkSaveListener */,
null /* onSettingsClick */,
null /* onAppSettingsClick */,
@@ -999,7 +1214,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet /* numChannels */,
- mSbn,
+ mEntry,
null /* checkSaveListener */,
null /* onSettingsClick */,
null /* onAppSettingsClick */,
@@ -1033,7 +1248,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1064,7 +1279,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1094,7 +1309,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1127,7 +1342,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1161,7 +1376,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1195,7 +1410,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1232,7 +1447,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1268,7 +1483,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1295,7 +1510,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1325,7 +1540,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1358,7 +1573,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
null,
null,
null,
@@ -1386,7 +1601,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
(Runnable saveImportance, StatusBarNotification sbn) -> {
saveImportance.run();
},
@@ -1421,7 +1636,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
(Runnable saveImportance, StatusBarNotification sbn) -> {
saveImportance.run();
},
@@ -1449,7 +1664,7 @@
TEST_PACKAGE_NAME,
mNotificationChannel,
mNotificationChannelSet,
- mSbn,
+ mEntry,
(Runnable saveImportance, StatusBarNotification sbn) -> {
saveImportance.run();
},
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
index 6f52e4a..d20a37a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
@@ -20,7 +20,6 @@
import static junit.framework.Assert.assertNull;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -56,7 +55,9 @@
import com.android.systemui.classifier.FalsingManagerFake;
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
import com.android.systemui.statusbar.EmptyShadeView;
+import com.android.systemui.statusbar.NotificationEntryBuilder;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
+import com.android.systemui.statusbar.NotificationMediaManager;
import com.android.systemui.statusbar.NotificationPresenter;
import com.android.systemui.statusbar.NotificationRemoteInputManager;
import com.android.systemui.statusbar.NotificationShelf;
@@ -65,9 +66,13 @@
import com.android.systemui.statusbar.SysuiStatusBarStateController;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
+import com.android.systemui.statusbar.notification.NotificationFilter;
import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
+import com.android.systemui.statusbar.notification.TestableNotificationEntryManager;
+import com.android.systemui.statusbar.notification.VisualStabilityManager;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+import com.android.systemui.statusbar.notification.collection.NotificationRankingManager;
+import com.android.systemui.statusbar.notification.logging.NotifLog;
import com.android.systemui.statusbar.notification.people.PeopleHubSectionFooterViewAdapter;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.notification.row.FooterView;
@@ -80,7 +85,6 @@
import com.android.systemui.statusbar.phone.ScrimController;
import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.phone.StatusBar;
-import com.android.systemui.statusbar.phone.StatusBarTest.TestableNotificationEntryManager;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.ZenModeController;
import com.android.systemui.util.DeviceConfigProxyFake;
@@ -97,6 +101,7 @@
import org.mockito.junit.MockitoRule;
import java.util.ArrayList;
+import java.util.List;
/**
* Tests for {@link NotificationStackScrollLayout}.
@@ -117,7 +122,6 @@
@Mock private NotificationGroupManager mGroupManager;
@Mock private ExpandHelper mExpandHelper;
@Mock private EmptyShadeView mEmptyShadeView;
- @Mock private NotificationData mNotificationData;
@Mock private NotificationRemoteInputManager mRemoteInputManager;
@Mock private RemoteInputController mRemoteInputController;
@Mock private NotificationIconAreaController mNotificationIconAreaController;
@@ -140,6 +144,7 @@
NOTIFICATION_NEW_INTERRUPTION_MODEL, 1);
// Inject dependencies before initializing the layout
+ mDependency.injectMockDependency(VisualStabilityManager.class);
mDependency.injectTestDependency(
NotificationBlockingHelperManager.class,
mBlockingHelperManager);
@@ -150,7 +155,18 @@
mDependency.injectMockDependency(ShadeController.class);
when(mRemoteInputManager.getController()).thenReturn(mRemoteInputController);
- mEntryManager = new TestableNotificationEntryManager(mNotificationData);
+ mEntryManager = new TestableNotificationEntryManager(
+ mock(NotifLog.class),
+ mock(NotificationGroupManager.class),
+ new NotificationRankingManager(
+ () -> mock(NotificationMediaManager.class),
+ mGroupManager,
+ mHeadsUpManager,
+ mock(NotificationFilter.class),
+ mock(NotifLog.class),
+ mock(NotificationSectionsFeatureManager.class)
+ ),
+ mock(NotificationEntryManager.KeyguardEnvironment.class));
mDependency.injectTestDependency(NotificationEntryManager.class, mEntryManager);
Dependency.get(InitController.class).executePostInitTasks();
mEntryManager.setUpForTest(mock(NotificationPresenter.class), null, mHeadsUpManager);
@@ -161,8 +177,8 @@
// The actual class under test. You may need to work with this class directly when
// testing anonymous class members of mStackScroller, like mMenuEventListener,
// which refer to members of NotificationStackScrollLayout. The spy
- // holds a copy of the CUT's instances of these classes, so they still refer to the CUT's
- // member variables, not the spy's member variables.
+ // holds a copy of the CUT's instances of these KeyguardBypassController, so they still
+ // refer to the CUT's member variables, not the spy's member variables.
mStackScrollerInternal = new NotificationStackScrollLayout(getContext(), null,
true /* allowLongPress */, mNotificationRoundnessManager,
mock(DynamicPrivacyController.class),
@@ -293,7 +309,7 @@
@Test
public void testUpdateFooter_noNotifications() {
setBarStateForTest(StatusBarState.SHADE);
- assertEquals(0, mNotificationData.getActiveNotifications().size());
+ assertEquals(0, mEntryManager.getActiveNotificationsCount());
mStackScroller.updateFooter();
verify(mStackScroller, atLeastOnce()).updateFooterView(false, false);
@@ -303,8 +319,8 @@
public void testUpdateFooter_remoteInput() {
setBarStateForTest(StatusBarState.SHADE);
ArrayList<NotificationEntry> entries = new ArrayList<>();
- entries.add(mock(NotificationEntry.class));
- when(mNotificationData.getActiveNotifications()).thenReturn(entries);
+ entries.add(new NotificationEntryBuilder().build());
+ addEntriesToEntryManager(entries);
ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);
when(row.canViewBeDismissed()).thenReturn(true);
@@ -319,9 +335,10 @@
@Test
public void testUpdateFooter_oneClearableNotification() {
setBarStateForTest(StatusBarState.SHADE);
+
ArrayList<NotificationEntry> entries = new ArrayList<>();
- entries.add(mock(NotificationEntry.class));
- when(mNotificationData.getActiveNotifications()).thenReturn(entries);
+ entries.add(new NotificationEntryBuilder().build());
+ addEntriesToEntryManager(entries);
ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);
when(row.canViewBeDismissed()).thenReturn(true);
@@ -335,10 +352,10 @@
@Test
public void testUpdateFooter_oneNonClearableNotification() {
setBarStateForTest(StatusBarState.SHADE);
+
ArrayList<NotificationEntry> entries = new ArrayList<>();
- entries.add(mock(NotificationEntry.class));
- when(mEntryManager.getNotificationData().getActiveNotifications()).thenReturn(entries);
- assertTrue(mEntryManager.getNotificationData().getActiveNotifications().size() != 0);
+ entries.add(new NotificationEntryBuilder().build());
+ addEntriesToEntryManager(entries);
mStackScroller.updateFooter();
verify(mStackScroller).updateFooterView(true, false);
@@ -431,12 +448,12 @@
mock(ExpandableNotificationRow.LongPressListener.class));
ExpandableNotificationRow row = mock(ExpandableNotificationRow.class, RETURNS_DEEP_STUBS);
- when(row.getStatusBarNotification().getLogMaker()).thenReturn(new LogMaker(
+ when(row.getEntry().getSbn().getLogMaker()).thenReturn(new LogMaker(
MetricsProto.MetricsEvent.VIEW_UNKNOWN));
mStackScroller.mMenuEventListener.onMenuClicked(row, 0, 0, mock(
NotificationMenuRowPlugin.MenuItem.class));
- verify(row.getStatusBarNotification()).getLogMaker(); // This writes most of the log data
+ verify(row.getEntry().getSbn()).getLogMaker(); // This writes most of the log data
verify(mMetricsLogger).write(logMatcher(MetricsProto.MetricsEvent.ACTION_TOUCH_GEAR,
MetricsProto.MetricsEvent.TYPE_ACTION));
}
@@ -446,11 +463,11 @@
public void testOnMenuShownLogging() { ;
ExpandableNotificationRow row = mock(ExpandableNotificationRow.class, RETURNS_DEEP_STUBS);
- when(row.getStatusBarNotification().getLogMaker()).thenReturn(new LogMaker(
+ when(row.getEntry().getSbn().getLogMaker()).thenReturn(new LogMaker(
MetricsProto.MetricsEvent.VIEW_UNKNOWN));
mStackScroller.mMenuEventListener.onMenuShown(row);
- verify(row.getStatusBarNotification()).getLogMaker(); // This writes most of the log data
+ verify(row.getEntry().getSbn()).getLogMaker(); // This writes most of the log data
verify(mMetricsLogger).write(logMatcher(MetricsProto.MetricsEvent.ACTION_REVEAL_GEAR,
MetricsProto.MetricsEvent.TYPE_ACTION));
}
@@ -460,4 +477,14 @@
// rather than the mock because the spy just coppied the anonymous inner /shruggie.
mStackScroller.setStatusBarState(state);
}
+
+ private void addEntriesToEntryManager(List<NotificationEntry> entries) {
+ for (NotificationEntry e : entries) {
+ mEntryManager.addActiveNotificationForTest(e);
+ }
+ }
+
+ private void addActiveNotificationsToManager(List<NotificationEntry> entries) {
+ mEntryManager.setActiveNotificationList(entries);
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java
index bc4e401..8decae3 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java
@@ -34,8 +34,6 @@
import com.android.systemui.R;
import com.android.systemui.SysuiBaseFragmentTest;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
-import com.android.systemui.statusbar.CommandQueue;
-import com.android.systemui.tuner.TunerService;
import org.junit.Before;
import org.junit.Test;
@@ -58,10 +56,8 @@
@Before
public void setup() {
- mSysuiContext.putComponent(CommandQueue.class, mock(CommandQueue.class));
StatusBar statusBar = mock(StatusBar.class);
mDependency.injectTestDependency(StatusBar.class, statusBar);
- mSysuiContext.putComponent(TunerService.class, mock(TunerService.class));
mStatusBarStateController = mDependency
.injectMockDependency(StatusBarStateController.class);
injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java
index 5af1e14..105dbad 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java
@@ -158,26 +158,6 @@
verify(mStatusBar).updateScrimController();
}
-
- @Test
- public void testPulseWhileDozingWithDockingReason_suppressWakeUpGesture() {
- // Keep track of callback to be able to stop the pulse
- final DozeHost.PulseCallback[] pulseCallback = new DozeHost.PulseCallback[1];
- doAnswer(invocation -> {
- pulseCallback[0] = invocation.getArgument(0);
- return null;
- }).when(mDozeScrimController).pulse(any(), anyInt());
-
- // Starting a pulse while docking should suppress wakeup gesture
- mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class),
- DozeEvent.PULSE_REASON_DOCKING);
- verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(true));
-
- // Ending a pulse should restore wakeup gesture
- pulseCallback[0].onPulseFinished();
- verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(false));
- }
-
@Test
public void testPulseWhileDozing_notifyAuthInterrupt() {
HashSet<Integer> reasonsWantingAuth = new HashSet<>(
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java
index 64c1b51..a024454 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java
@@ -40,7 +40,6 @@
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.notification.NotificationEntryListener;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import org.junit.Before;
@@ -51,8 +50,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import java.util.ArrayList;
-
@SmallTest
@RunWith(AndroidTestingRunner.class)
@RunWithLooper
@@ -61,7 +58,6 @@
private static final int LIGHTS_OUT = APPEARANCE_LOW_PROFILE_BARS;
@Mock private NotificationEntryManager mEntryManager;
- @Mock private NotificationData mNotificationData;
@Mock private CommandQueue mCommandQueue;
@Mock private WindowManager mWindowManager;
@Mock private Display mDisplay;
@@ -71,7 +67,6 @@
private View mLightsOutView;
private LightsOutNotifController mLightsOutNotifController;
- private ArrayList<NotificationEntry> mActiveNotifications = new ArrayList<>();
private int mDisplayId;
private NotificationEntryListener mEntryListener;
private CommandQueue.Callbacks mCallbacks;
@@ -81,8 +76,6 @@
MockitoAnnotations.initMocks(this);
mDisplayId = mContext.getDisplayId();
mLightsOutView = new View(mContext);
- when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
- when(mNotificationData.getActiveNotifications()).thenReturn(mActiveNotifications);
when(mWindowManager.getDefaultDisplay()).thenReturn(mDisplay);
when(mDisplay.getDisplayId()).thenReturn(mDisplayId);
@@ -136,7 +129,7 @@
@Test
public void testLightsOut_withNotifs_onSystemBarAppearanceChanged() {
// GIVEN active visible notifications
- mActiveNotifications.add(mock(NotificationEntry.class));
+ when(mEntryManager.hasActiveNotifications()).thenReturn(true);
// WHEN lights out
mCallbacks.onSystemBarAppearanceChanged(
@@ -153,7 +146,7 @@
@Test
public void testLightsOut_withoutNotifs_onSystemBarAppearanceChanged() {
// GIVEN no active visible notifications
- mActiveNotifications.clear();
+ when(mEntryManager.hasActiveNotifications()).thenReturn(false);
// WHEN lights out
mCallbacks.onSystemBarAppearanceChanged(
@@ -170,7 +163,7 @@
@Test
public void testLightsOn_afterLightsOut_onSystemBarAppearanceChanged() {
// GIVEN active visible notifications
- mActiveNotifications.add(mock(NotificationEntry.class));
+ when(mEntryManager.hasActiveNotifications()).thenReturn(true);
// WHEN lights on
mCallbacks.onSystemBarAppearanceChanged(
@@ -187,13 +180,13 @@
@Test
public void testEntryAdded() {
// GIVEN no visible notifications and lights out
- mActiveNotifications.clear();
+ when(mEntryManager.hasActiveNotifications()).thenReturn(false);
mLightsOutNotifController.mAppearance = LIGHTS_OUT;
mLightsOutNotifController.updateLightsOutView();
assertIsShowingDot(false);
// WHEN an active notification is added
- mActiveNotifications.add(mock(NotificationEntry.class));
+ when(mEntryManager.hasActiveNotifications()).thenReturn(true);
assertTrue(mLightsOutNotifController.shouldShowDot());
mEntryListener.onNotificationAdded(mock(NotificationEntry.class));
@@ -204,13 +197,13 @@
@Test
public void testEntryRemoved() {
// GIVEN a visible notification and lights out
- mActiveNotifications.add(mock(NotificationEntry.class));
+ when(mEntryManager.hasActiveNotifications()).thenReturn(true);
mLightsOutNotifController.mAppearance = LIGHTS_OUT;
mLightsOutNotifController.updateLightsOutView();
assertIsShowingDot(true);
// WHEN all active notifications are removed
- mActiveNotifications.clear();
+ when(mEntryManager.hasActiveNotifications()).thenReturn(false);
assertFalse(mLightsOutNotifController.shouldShowDot());
mEntryListener.onEntryRemoved(mock(NotificationEntry.class), null, false);
@@ -221,13 +214,13 @@
@Test
public void testEntryUpdated() {
// GIVEN no visible notifications and lights out
- mActiveNotifications.clear();
+ when(mEntryManager.hasActiveNotifications()).thenReturn(false);
mLightsOutNotifController.mAppearance = LIGHTS_OUT;
mLightsOutNotifController.updateLightsOutView();
assertIsShowingDot(false);
// WHEN an active notification is added
- mActiveNotifications.add(mock(NotificationEntry.class));
+ when(mEntryManager.hasActiveNotifications()).thenReturn(true);
assertTrue(mLightsOutNotifController.shouldShowDot());
mEntryListener.onPostEntryUpdated(mock(NotificationEntry.class));
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarButtonTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarButtonTest.java
index 098a69f..aae0757 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarButtonTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarButtonTest.java
@@ -18,7 +18,6 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
import android.graphics.PixelFormat;
import android.hardware.display.DisplayManager;
@@ -37,7 +36,6 @@
import com.android.systemui.SysuiTestableContext;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.recents.OverviewProxyService;
-import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import org.junit.After;
@@ -60,11 +58,9 @@
@Before
public void setup() {
- mContext.putComponent(CommandQueue.class, mock(CommandQueue.class));
final Display display = createVirtualDisplay();
final SysuiTestableContext context =
(SysuiTestableContext) mContext.createDisplayContext(display);
- context.putComponent(CommandQueue.class, mock(CommandQueue.class));
mDependency.injectMockDependency(AssistManager.class);
mDependency.injectMockDependency(OverviewProxyService.class);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarInflaterViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarInflaterViewTest.java
index 991e495..80e33fb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarInflaterViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarInflaterViewTest.java
@@ -33,7 +33,6 @@
import com.android.systemui.SysuiTestCase;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.recents.OverviewProxyService;
-import com.android.systemui.statusbar.CommandQueue;
import org.junit.After;
import org.junit.Before;
@@ -52,7 +51,6 @@
@Before
public void setUp() {
- mContext.putComponent(CommandQueue.class, mock(CommandQueue.class));
mDependency.injectMockDependency(AssistManager.class);
mDependency.injectMockDependency(OverviewProxyService.class);
mDependency.injectMockDependency(NavigationModeController.class);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupTestHelper.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupTestHelper.java
index a49ae35..3ad1e39 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupTestHelper.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupTestHelper.java
@@ -87,7 +87,6 @@
ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);
entry.setRow(row);
when(row.getEntry()).thenReturn(entry);
- when(row.getStatusBarNotification()).thenReturn(entry.getSbn());
when(row.isInflationFlagSet(anyInt())).thenReturn(true);
return entry;
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java
index 280cc90..c165e56 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java
@@ -54,11 +54,9 @@
import com.android.systemui.statusbar.SysuiStatusBarStateController;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
-import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager;
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
+import com.android.systemui.statusbar.notification.collection.NotificationRankingManager;
import com.android.systemui.statusbar.notification.logging.NotifLog;
-import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier;
import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager;
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -239,11 +237,10 @@
mock(ShadeController.class),
mock(NotificationLockscreenUserManager.class),
new NotificationEntryManager(
- new NotificationData(
- mock(NotificationSectionsFeatureManager.class),
- mock(NotifLog.class),
- mock(PeopleNotificationIdentifier.class)),
- mock(NotifLog.class)),
+ mock(NotifLog.class),
+ mock(NotificationGroupManager.class),
+ mock(NotificationRankingManager.class),
+ mock(NotificationEntryManager.KeyguardEnvironment.class)),
mock(KeyguardStateController.class),
statusBarStateController,
mock(DozeLog.class),
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
index 85c247e..4d6ff1f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
@@ -50,6 +50,7 @@
import com.android.systemui.DejankUtils;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.colorextraction.SysuiColorExtractor;
+import com.android.systemui.dock.DockManager;
import com.android.systemui.statusbar.ScrimView;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.util.wakelock.DelayedWakeLock;
@@ -101,6 +102,8 @@
KeyguardUpdateMonitor mKeyguardUpdateMonitor;
@Mock
private SysuiColorExtractor mSysuiColorExtractor;
+ @Mock
+ private DockManager mDockManager;
private static class AnimatorListener implements Animator.AnimatorListener {
@@ -210,10 +213,13 @@
when(mSysuiColorExtractor.getNeutralColors()).thenReturn(new GradientColors());
+ when(mDockManager.isDocked()).thenReturn(false);
+
mScrimController = new ScrimController(mLightBarController,
mDozeParamenters, mAlarmManager, mKeyguardStateController,
mResources, mDelayedWakeLockBuilder,
- new FakeHandler(mLooper.getLooper()), mKeyguardUpdateMonitor, mSysuiColorExtractor);
+ new FakeHandler(mLooper.getLooper()), mKeyguardUpdateMonitor, mSysuiColorExtractor,
+ mDockManager);
mScrimController.setScrimVisibleListener(visible -> mScrimVisibility = visible);
mScrimController.attachViews(mScrimBehind, mScrimInFront, mScrimForBubble);
mScrimController.setAnimatorListener(mAnimatorListener);
@@ -372,6 +378,45 @@
}
@Test
+ public void transitionToAod_afterDocked_ignoresAlwaysOnAndUpdatesFrontAlpha() {
+ // Assert that setting the AOD front scrim alpha doesn't take effect in a non-AOD state.
+ mScrimController.transitionTo(ScrimState.KEYGUARD);
+ mScrimController.setAodFrontScrimAlpha(0.5f);
+ finishAnimationsImmediately();
+
+ assertScrimAlpha(TRANSPARENT /* front */,
+ SEMI_TRANSPARENT /* back */,
+ TRANSPARENT /* bubble */);
+
+ // ... and doesn't take effect when disabled always_on
+ mAlwaysOnEnabled = false;
+ mScrimController.transitionTo(ScrimState.AOD);
+ finishAnimationsImmediately();
+ assertScrimAlpha(OPAQUE /* front */,
+ OPAQUE /* back */,
+ TRANSPARENT /* bubble */);
+
+ // ... but will take effect after docked
+ when(mDockManager.isDocked()).thenReturn(true);
+ mScrimController.transitionTo(ScrimState.KEYGUARD);
+ mScrimController.setAodFrontScrimAlpha(0.5f);
+ mScrimController.transitionTo(ScrimState.AOD);
+
+ assertScrimAlpha(SEMI_TRANSPARENT /* front */,
+ OPAQUE /* back */,
+ TRANSPARENT /* bubble */);
+
+ // ... and that if we set it while we're in AOD, it does take immediate effect after docked.
+ mScrimController.setAodFrontScrimAlpha(1f);
+ assertScrimAlpha(OPAQUE /* front */,
+ OPAQUE /* back */,
+ TRANSPARENT /* bubble */);
+
+ // Reset value since enums are static.
+ mScrimController.setAodFrontScrimAlpha(0f);
+ }
+
+ @Test
public void transitionToPulsing_withFrontAlphaUpdates() {
// Pre-condition
// Need to go to AoD first because PULSING doesn't change
@@ -715,38 +760,6 @@
}
@Test
- public void transitionToPulsing_withTimeoutWallpaperCallback_willHideWallpaper() {
- mScrimController.setWallpaperSupportsAmbientMode(true);
-
- mScrimController.transitionTo(ScrimState.PULSING, new ScrimController.Callback() {
- @Override
- public boolean shouldTimeoutWallpaper() {
- return true;
- }
- });
-
- verify(mAlarmManager).setExact(anyInt(), anyLong(), any(), any(), any());
- }
-
- @Test
- public void transitionToPulsing_withDefaultCallback_wontHideWallpaper() {
- mScrimController.setWallpaperSupportsAmbientMode(true);
-
- mScrimController.transitionTo(ScrimState.PULSING, new ScrimController.Callback() {});
-
- verify(mAlarmManager, never()).setExact(anyInt(), anyLong(), any(), any(), any());
- }
-
- @Test
- public void transitionToPulsing_withoutCallback_wontHideWallpaper() {
- mScrimController.setWallpaperSupportsAmbientMode(true);
-
- mScrimController.transitionTo(ScrimState.PULSING);
-
- verify(mAlarmManager, never()).setExact(anyInt(), anyLong(), any(), any(), any());
- }
-
- @Test
public void testConservesExpansionOpacityAfterTransition() {
mScrimController.transitionTo(ScrimState.UNLOCKED);
mScrimController.setPanelExpansion(0.5f);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java
index d8a68b0..07be0d7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java
@@ -68,7 +68,6 @@
import com.android.systemui.statusbar.notification.NotificationActivityStarter;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -117,7 +116,6 @@
@Mock
private Intent mContentIntentInner;
@Mock
- private NotificationData mNotificationData;
private NotificationActivityStarter mNotificationActivityStarter;
@@ -134,7 +132,6 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
when(mRemoteInputManager.getController()).thenReturn(mRemoteInputController);
- when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
when(mContentIntent.isActivity()).thenReturn(true);
when(mContentIntent.getCreatorUserHandle()).thenReturn(UserHandle.of(1));
@@ -144,20 +141,20 @@
// Create standard notification with contentIntent
mNotificationRow = mNotificationTestHelper.createRow();
- StatusBarNotification sbn = mNotificationRow.getStatusBarNotification();
+ StatusBarNotification sbn = mNotificationRow.getEntry().getSbn();
sbn.getNotification().contentIntent = mContentIntent;
sbn.getNotification().flags |= Notification.FLAG_AUTO_CANCEL;
// Create bubble notification row with contentIntent
mBubbleNotificationRow = mNotificationTestHelper.createBubble();
- StatusBarNotification bubbleSbn = mBubbleNotificationRow.getStatusBarNotification();
+ StatusBarNotification bubbleSbn = mBubbleNotificationRow.getEntry().getSbn();
bubbleSbn.getNotification().contentIntent = mContentIntent;
bubbleSbn.getNotification().flags |= Notification.FLAG_AUTO_CANCEL;
mActiveNotifications = new ArrayList<>();
mActiveNotifications.add(mNotificationRow.getEntry());
mActiveNotifications.add(mBubbleNotificationRow.getEntry());
- when(mNotificationData.getActiveNotifications()).thenReturn(mActiveNotifications);
+ when(mEntryManager.getVisibleNotifications()).thenReturn(mActiveNotifications);
when(mStatusBarStateController.getState()).thenReturn(StatusBarState.SHADE);
mNotificationActivityStarter = new StatusBarNotificationActivityStarter(getContext(),
@@ -197,7 +194,7 @@
public void testOnNotificationClicked_keyGuardShowing()
throws PendingIntent.CanceledException, RemoteException {
// Given
- StatusBarNotification sbn = mNotificationRow.getStatusBarNotification();
+ StatusBarNotification sbn = mNotificationRow.getEntry().getSbn();
sbn.getNotification().contentIntent = mContentIntent;
sbn.getNotification().flags |= Notification.FLAG_AUTO_CANCEL;
@@ -231,7 +228,7 @@
@Test
public void testOnNotificationClicked_bubble_noContentIntent_noKeyGuard()
throws RemoteException {
- StatusBarNotification sbn = mBubbleNotificationRow.getStatusBarNotification();
+ StatusBarNotification sbn = mBubbleNotificationRow.getEntry().getSbn();
// Given
sbn.getNotification().contentIntent = null;
@@ -260,7 +257,7 @@
@Test
public void testOnNotificationClicked_bubble_noContentIntent_keyGuardShowing()
throws RemoteException {
- StatusBarNotification sbn = mBubbleNotificationRow.getStatusBarNotification();
+ StatusBarNotification sbn = mBubbleNotificationRow.getEntry().getSbn();
// Given
sbn.getNotification().contentIntent = null;
@@ -290,7 +287,7 @@
@Test
public void testOnNotificationClicked_bubble_withContentIntent_keyGuardShowing()
throws RemoteException {
- StatusBarNotification sbn = mBubbleNotificationRow.getStatusBarNotification();
+ StatusBarNotification sbn = mBubbleNotificationRow.getEntry().getSbn();
// Given
sbn.getNotification().contentIntent = mContentIntent;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java
index de87d31..1c02b60 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java
@@ -52,7 +52,6 @@
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl;
import com.android.systemui.statusbar.notification.row.ActivatableNotificationView;
@@ -100,11 +99,9 @@
mDependency.injectMockDependency(NotificationGutsManager.class);
mDependency.injectMockDependency(StatusBarWindowController.class);
mDependency.injectMockDependency(InitController.class);
- NotificationData notificationData = mock(NotificationData.class);
- when(notificationData.getNotificationsForCurrentUser()).thenReturn(new ArrayList<>());
NotificationEntryManager entryManager =
mDependency.injectMockDependency(NotificationEntryManager.class);
- when(entryManager.getNotificationData()).thenReturn(notificationData);
+ when(entryManager.getActiveNotificationsForCurrentUser()).thenReturn(new ArrayList<>());
StatusBarWindowView statusBarWindowView = mock(StatusBarWindowView.class);
when(statusBarWindowView.getResources()).thenReturn(mContext.getResources());
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
index f327378..1f2df65 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
@@ -101,7 +101,6 @@
import com.android.systemui.statusbar.NotificationListener;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
import com.android.systemui.statusbar.NotificationMediaManager;
-import com.android.systemui.statusbar.NotificationPresenter;
import com.android.systemui.statusbar.NotificationRemoteInputManager;
import com.android.systemui.statusbar.NotificationViewHierarchyManager;
import com.android.systemui.statusbar.PulseExpansionHandler;
@@ -112,7 +111,6 @@
import com.android.systemui.statusbar.VibratorHelper;
import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
-import com.android.systemui.statusbar.notification.NewNotifPipeline;
import com.android.systemui.statusbar.notification.NotificationAlertingManager;
import com.android.systemui.statusbar.notification.NotificationEntryListener;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
@@ -120,12 +118,10 @@
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
-import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
-import com.android.systemui.statusbar.notification.logging.NotifLog;
+import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
-import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -177,7 +173,6 @@
@Mock private ArrayList<NotificationEntry> mNotificationList;
@Mock private Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy;
@Mock private BiometricUnlockController mBiometricUnlockController;
- @Mock private NotificationData mNotificationData;
@Mock private NotificationInterruptionStateProvider.HeadsUpSuppressor mHeadsUpSuppressor;
@Mock private VisualStabilityManager mVisualStabilityManager;
@Mock private NotificationListener mNotificationListener;
@@ -240,6 +235,7 @@
@Mock private ViewMediatorCallback mViewMediatorCallback;
@Mock private DismissCallbackRegistry mDismissCallbackRegistry;
@Mock private ScreenPinningRequest mScreenPinningRequest;
+ @Mock private NotificationEntryManager mEntryManager;
@Before
public void setup() throws Exception {
@@ -260,10 +256,8 @@
mContext.addMockSystemService(FingerprintManager.class, mock(FingerprintManager.class));
mMetricsLogger = new FakeMetricsLogger();
- TestableNotificationEntryManager entryManager = new TestableNotificationEntryManager(
- mNotificationData);
NotificationLogger notificationLogger = new NotificationLogger(mNotificationListener,
- Dependency.get(UiOffloadThread.class), entryManager, mStatusBarStateController,
+ Dependency.get(UiOffloadThread.class), mEntryManager, mStatusBarStateController,
mExpansionStateLogger);
notificationLogger.setVisibilityReporter(mock(Runnable.class));
@@ -332,7 +326,7 @@
),
mNotificationGutsManager,
notificationLogger,
- entryManager,
+ mEntryManager,
mNotificationInterruptionStateProvider,
mNotificationViewHierarchyManager,
mKeyguardViewMediator,
@@ -395,7 +389,6 @@
// TODO: we should be able to call mStatusBar.start() and have all the below values
// initialized automatically.
- mStatusBar.mComponents = mContext.getComponents();
mStatusBar.mStatusBarWindow = mStatusBarWindowView;
mStatusBar.mNotificationPanel = mNotificationPanelView;
mStatusBar.mDozeScrimController = mDozeScrimController;
@@ -407,9 +400,6 @@
mStatusBar.mStatusBarWindowViewController = mStatusBarWindowViewController;
mStatusBar.startKeyguard();
Dependency.get(InitController.class).executePostInitTasks();
- entryManager.setUpForTest(mock(NotificationPresenter.class), mStackScroller,
- mHeadsUpManager);
- entryManager.addNotificationEntryListener(mEntryListener);
notificationLogger.setUpWithContainer(mStackScroller);
}
@@ -645,8 +635,7 @@
public void testPanelOpenForHeadsUp() {
when(mDeviceProvisionedController.isDeviceProvisioned()).thenReturn(true);
when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(true);
- when(mNotificationData.getActiveNotifications()).thenReturn(mNotificationList);
- when(mNotificationList.size()).thenReturn(5);
+ when(mEntryManager.getActiveNotificationsCount()).thenReturn(5);
when(mNotificationPresenter.isPresenterFullyCollapsed()).thenReturn(true);
mStatusBar.setBarStateForTest(StatusBarState.SHADE);
@@ -664,8 +653,8 @@
@Test
public void testPanelOpenAndClear() {
when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(false);
- when(mNotificationData.getActiveNotifications()).thenReturn(mNotificationList);
- when(mNotificationList.size()).thenReturn(5);
+ when(mEntryManager.getActiveNotificationsCount()).thenReturn(5);
+
when(mNotificationPresenter.isPresenterFullyCollapsed()).thenReturn(false);
mStatusBar.setBarStateForTest(StatusBarState.SHADE);
@@ -683,8 +672,7 @@
@Test
public void testPanelOpenAndNoClear() {
when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(false);
- when(mNotificationData.getActiveNotifications()).thenReturn(mNotificationList);
- when(mNotificationList.size()).thenReturn(5);
+ when(mEntryManager.getActiveNotificationsCount()).thenReturn(5);
when(mNotificationPresenter.isPresenterFullyCollapsed()).thenReturn(false);
mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD);
@@ -842,19 +830,6 @@
any(UserHandle.class));
}
- public static class TestableNotificationEntryManager extends NotificationEntryManager {
-
- public TestableNotificationEntryManager(NotificationData notificationData) {
- super(notificationData, mock(NotifLog.class));
- }
-
- public void setUpForTest(NotificationPresenter presenter,
- NotificationListContainer listContainer,
- HeadsUpManagerPhone headsUpManager) {
- super.setUpWithPresenter(presenter, listContainer, headsUpManager);
- }
- }
-
public static class TestableNotificationInterruptionStateProvider extends
NotificationInterruptionStateProvider {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java
index bf81325..e08551a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java
@@ -29,6 +29,7 @@
import com.android.systemui.SystemUIFactory;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.classifier.FalsingManagerFake;
+import com.android.systemui.dock.DockManager;
import com.android.systemui.doze.DozeLog;
import com.android.systemui.shared.plugins.PluginManager;
import com.android.systemui.statusbar.CommandQueue;
@@ -74,17 +75,18 @@
@Mock private DozeLog mDozeLog;
@Mock private DozeParameters mDozeParameters;
@Mock private SuperStatusBarViewFactory mSuperStatusBarViewFactory;
+ @Mock private DockManager mDockManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mView = new StatusBarWindowView(getContext(), null);
- mContext.putComponent(StatusBar.class, mStatusBar);
when(mStatusBar.isDozing()).thenReturn(false);
mDependency.injectTestDependency(ShadeController.class, mShadeController);
when(mSuperStatusBarViewFactory.getStatusBarWindowView()).thenReturn(mView);
+ when(mDockManager.isDocked()).thenReturn(false);
mController = new StatusBarWindowViewController.Builder(
new InjectionInflationController(
@@ -103,7 +105,8 @@
mDozeLog,
mDozeParameters,
new CommandQueue(mContext),
- mSuperStatusBarViewFactory)
+ mSuperStatusBarViewFactory,
+ mDockManager)
.setShadeController(mShadeController)
.build();
mController.setService(mStatusBar);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java
index 0d1e1bd..811e6a0 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java
@@ -70,11 +70,11 @@
mContext.addMockSystemService(WifiManager.class, mWifiManager);
doAnswer((InvocationOnMock invocation) -> {
- ((WifiManager.SoftApCallback) invocation.getArgument(0))
+ ((WifiManager.SoftApCallback) invocation.getArgument(1))
.onConnectedClientsChanged(new ArrayList<>());
return null;
- }).when(mWifiManager).registerSoftApCallback(any(WifiManager.SoftApCallback.class),
- any(Executor.class));
+ }).when(mWifiManager).registerSoftApCallback(any(Executor.class),
+ any(WifiManager.SoftApCallback.class));
mController = new HotspotControllerImpl(mContext, new Handler(mLooper.getLooper()));
mController.handleSetListening(true);
@@ -85,7 +85,7 @@
mController.addCallback(mCallback1);
mController.addCallback(mCallback2);
- verify(mWifiManager, times(1)).registerSoftApCallback(eq(mController), any());
+ verify(mWifiManager, times(1)).registerSoftApCallback(any(), eq(mController));
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java b/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java
index 0bc7868a..e15ca1d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java
@@ -64,7 +64,8 @@
.getDefaultSensor(Sensor.TYPE_PROXIMITY);
if (proxSensor == null) {
// No prox? Let's create a fake one!
- proxSensor = createSensor(Sensor.TYPE_PROXIMITY, null);
+ proxSensor =
+ createSensor(Sensor.TYPE_PROXIMITY, null, 1 /* SENSOR_FLAG_WAKE_UP_SENSOR */);
}
mSensors = new FakeGenericSensor[]{
@@ -92,18 +93,6 @@
if (s != null) {
return s;
}
- switch(type) {
- case Sensor.TYPE_PROXIMITY:
- try {
- return createSensor(Sensor.TYPE_PROXIMITY, null);
- } catch (Exception e) {
- // fall through
- }
- break;
- default:
- break;
-
- }
// Our mock sensors aren't wakeup, and it's a pain to create them that way. Instead, just
// return non-wakeup sensors if we can't find a wakeup sensor.
return getDefaultSensor(type, false /* wakeup */);
@@ -208,6 +197,10 @@
}
private Sensor createSensor(int type, @Nullable String stringType) throws Exception {
+ return createSensor(type, stringType, 0 /* flags */);
+ }
+
+ private Sensor createSensor(int type, @Nullable String stringType, int flags) throws Exception {
Constructor<Sensor> constr = Sensor.class.getDeclaredConstructor();
constr.setAccessible(true);
Sensor sensor = constr.newInstance();
@@ -225,7 +218,7 @@
setSensorField(sensor, "mPower", 1);
setSensorField(sensor, "mMinDelay", 1000);
setSensorField(sensor, "mMaxDelay", 1000000000);
- setSensorField(sensor, "mFlags", 0);
+ setSensorField(sensor, "mFlags", flags);
setSensorField(sensor, "mId", -1);
return sensor;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/time/FakeSystemClock.java b/packages/SystemUI/tests/src/com/android/systemui/util/time/FakeSystemClock.java
new file mode 100644
index 0000000..7b5417c
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/util/time/FakeSystemClock.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.util.time;
+
+public class FakeSystemClock implements SystemClock {
+ private boolean mAutoIncrement = true;
+
+ private long mUptimeMillis;
+ private long mElapsedRealtime;
+ private long mElapsedRealtimeNanos;
+ private long mCurrentThreadTimeMillis;
+ private long mCurrentThreadTimeMicro;
+ private long mCurrentTimeMicro;
+
+ @Override
+ public long uptimeMillis() {
+ long value = mUptimeMillis;
+ if (mAutoIncrement) {
+ mUptimeMillis++;
+ }
+ return value;
+ }
+
+ @Override
+ public long elapsedRealtime() {
+ long value = mElapsedRealtime;
+ if (mAutoIncrement) {
+ mElapsedRealtime++;
+ }
+ return value;
+ }
+
+ @Override
+ public long elapsedRealtimeNanos() {
+ long value = mElapsedRealtimeNanos;
+ if (mAutoIncrement) {
+ mElapsedRealtimeNanos++;
+ }
+ return value;
+ }
+
+ @Override
+ public long currentThreadTimeMillis() {
+ long value = mCurrentThreadTimeMillis;
+ if (mAutoIncrement) {
+ mCurrentThreadTimeMillis++;
+ }
+ return value;
+ }
+
+ @Override
+ public long currentThreadTimeMicro() {
+ long value = mCurrentThreadTimeMicro;
+ if (mAutoIncrement) {
+ mCurrentThreadTimeMicro++;
+ }
+ return value;
+ }
+
+ @Override
+ public long currentTimeMicro() {
+ long value = mCurrentTimeMicro;
+ if (mAutoIncrement) {
+ mCurrentTimeMicro++;
+ }
+ return value;
+ }
+
+ public void setUptimeMillis(long uptimeMillis) {
+ mUptimeMillis = uptimeMillis;
+ }
+
+ public void setElapsedRealtime(long elapsedRealtime) {
+ mElapsedRealtime = elapsedRealtime;
+ }
+
+ public void setElapsedRealtimeNanos(long elapsedRealtimeNanos) {
+ mElapsedRealtimeNanos = elapsedRealtimeNanos;
+ }
+
+ public void setCurrentThreadTimeMillis(long currentThreadTimeMillis) {
+ mCurrentThreadTimeMillis = currentThreadTimeMillis;
+ }
+
+ public void setCurrentThreadTimeMicro(long currentThreadTimeMicro) {
+ mCurrentThreadTimeMicro = currentThreadTimeMicro;
+ }
+
+ public void setCurrentTimeMicro(long currentTimeMicro) {
+ mCurrentTimeMicro = currentTimeMicro;
+ }
+
+ /** If true, each call to get____ will be one higher than the previous call to that method. */
+ public void setAutoIncrement(boolean autoIncrement) {
+ mAutoIncrement = autoIncrement;
+ }
+}
diff --git a/packages/WallpaperBackup/Android.bp b/packages/WallpaperBackup/Android.bp
index 56020cd..748eb40 100644
--- a/packages/WallpaperBackup/Android.bp
+++ b/packages/WallpaperBackup/Android.bp
@@ -24,3 +24,27 @@
certificate: "platform",
privileged: false,
}
+
+android_test {
+ name: "WallpaperBackupAgentTests",
+ manifest: "test/AndroidManifest.xml",
+ test_config: "test/AndroidTest.xml",
+ srcs: [
+ // Include the app source code because the app runs as the system user on-device.
+ "src/**/*.java",
+ "test/src/**/*.java"
+ ],
+ libs: [
+ "android.test.base",
+ "android.test.runner",
+ ],
+ static_libs: [
+ "androidx.test.core",
+ "androidx.test.rules",
+ "mockito-target-minus-junit4",
+ "truth-prebuilt",
+ ],
+ certificate: "platform",
+ platform_apis: true,
+ test_suites: ["device-tests"]
+}
diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
index da90189..1c2c640 100644
--- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
+++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
@@ -39,6 +39,8 @@
import android.util.Slog;
import android.util.Xml;
+import com.android.internal.annotations.VisibleForTesting;
+
import libcore.io.IoUtils;
import org.xmlpull.v1.XmlPullParser;
@@ -89,7 +91,7 @@
Slog.v(TAG, "onCreate()");
}
- File wallpaperDir = Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM);
+ File wallpaperDir = getWallpaperDir();
mWallpaperInfo = new File(wallpaperDir, WALLPAPER_INFO);
mWallpaperFile = new File(wallpaperDir, WALLPAPER);
mLockWallpaperFile = new File(wallpaperDir, WALLPAPER_LOCK);
@@ -102,6 +104,11 @@
}
}
+ @VisibleForTesting
+ protected File getWallpaperDir() {
+ return Environment.getUserSystemDirectory(UserHandle.USER_SYSTEM);
+ }
+
@Override
public void onFullBackup(FullBackupDataOutput data) throws IOException {
// To avoid data duplication and disk churn, use links as the stage.
@@ -119,7 +126,7 @@
FileOutputStream touch = new FileOutputStream(empty);
touch.close();
}
- fullBackupFile(empty, data);
+ backupFile(empty, data);
SharedPreferences prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
final int lastSysGeneration = prefs.getInt(SYSTEM_GENERATION, -1);
@@ -155,7 +162,7 @@
FileUtils.copyFileOrThrow(mWallpaperInfo, infoStage);
}
if (DEBUG) Slog.v(TAG, "Storing wallpaper metadata");
- fullBackupFile(infoStage, data);
+ backupFile(infoStage, data);
}
if (sysEligible && mWallpaperFile.exists()) {
if (sysChanged || !imageStage.exists()) {
@@ -163,7 +170,7 @@
FileUtils.copyFileOrThrow(mWallpaperFile, imageStage);
}
if (DEBUG) Slog.v(TAG, "Storing system wallpaper image");
- fullBackupFile(imageStage, data);
+ backupFile(imageStage, data);
prefs.edit().putInt(SYSTEM_GENERATION, sysGeneration).apply();
}
@@ -174,7 +181,7 @@
FileUtils.copyFileOrThrow(mLockWallpaperFile, lockImageStage);
}
if (DEBUG) Slog.v(TAG, "Storing lock wallpaper image");
- fullBackupFile(lockImageStage, data);
+ backupFile(lockImageStage, data);
prefs.edit().putInt(LOCK_GENERATION, lockGeneration).apply();
}
} catch (Exception e) {
@@ -189,6 +196,12 @@
}
}
+ @VisibleForTesting
+ // fullBackupFile is final, so we intercept backups here in tests.
+ protected void backupFile(File file, FullBackupDataOutput data) {
+ fullBackupFile(file, data);
+ }
+
@Override
public void onQuotaExceeded(long backupDataBytes, long quotaBytes) {
if (DEBUG) {
diff --git a/packages/WallpaperBackup/test/AndroidManifest.xml b/packages/WallpaperBackup/test/AndroidManifest.xml
new file mode 100644
index 0000000..44ab1b6
--- /dev/null
+++ b/packages/WallpaperBackup/test/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.wallpaperbackup.tests">
+
+ <application android:label="WallpaperBackup Tests">
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.wallpaperbackup.tests"
+ android:label="WallpaperBackup Tests"/>
+</manifest>
+
diff --git a/packages/WallpaperBackup/test/AndroidTest.xml b/packages/WallpaperBackup/test/AndroidTest.xml
new file mode 100644
index 0000000..f2e7782
--- /dev/null
+++ b/packages/WallpaperBackup/test/AndroidTest.xml
@@ -0,0 +1,27 @@
+<!-- Copyright (C) 2019 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.
+-->
+<configuration description="Runs sample instrumentation test.">
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-file-name" value="WallpaperBackupAgentTests.apk" />
+ </target_preparer>
+
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-tag" value="WallpaperBackupAgentTests" />
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.wallpaperbackup.tests" />
+ <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+ <option name="hidden-api-checks" value="false"/>
+ </test>
+</configuration>
diff --git a/packages/WallpaperBackup/test/src/com/android/wallpaperbackup/tests/WallpaperBackupAgentTest.java b/packages/WallpaperBackup/test/src/com/android/wallpaperbackup/tests/WallpaperBackupAgentTest.java
new file mode 100644
index 0000000..46a7dfe
--- /dev/null
+++ b/packages/WallpaperBackup/test/src/com/android/wallpaperbackup/tests/WallpaperBackupAgentTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2019 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.wallpaperbackup.tests;
+
+import static android.app.WallpaperManager.FLAG_LOCK;
+import static android.app.WallpaperManager.FLAG_SYSTEM;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.WallpaperManager;
+import android.app.backup.FullBackupDataOutput;
+import android.content.SharedPreferences;
+import android.os.UserHandle;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.wallpaperbackup.WallpaperBackupAgent;
+import com.android.wallpaperbackup.utils.ContextWithServiceOverrides;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class WallpaperBackupAgentTest {
+ private static final String SYSTEM_GENERATION = "system_gen";
+ private static final String LOCK_GENERATION = "lock_gen";
+
+ @Mock private FullBackupDataOutput mOutput;
+ @Mock private WallpaperManager mWallpaperManager;
+ @Mock private SharedPreferences mSharedPreferences;
+
+ @Rule public TemporaryFolder mTemporaryFolder = new TemporaryFolder();
+
+ private ContextWithServiceOverrides mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = new ContextWithServiceOverrides(ApplicationProvider.getApplicationContext());
+ mContext.injectSystemService(WallpaperManager.class, mWallpaperManager);
+ mContext.setSharedPreferencesOverride(mSharedPreferences);
+ }
+
+ @Test
+ public void testOnFullBackup_withNoChanges_onlyBacksUpEmptyFile() throws IOException {
+ WallpaperBackupAgent wallpaperBackupAgent = new WallpaperBackupAgent();
+ initialiseAgent(wallpaperBackupAgent);
+
+ when(mWallpaperManager.getWallpaperIdForUser(eq(FLAG_SYSTEM), eq(UserHandle.USER_SYSTEM)))
+ .thenReturn(1);
+ when(mWallpaperManager.getWallpaperIdForUser(eq(FLAG_LOCK), eq(UserHandle.USER_SYSTEM)))
+ .thenReturn(1);
+ when(mSharedPreferences.getInt(eq(SYSTEM_GENERATION), eq(-1))).thenReturn(1);
+ when(mSharedPreferences.getInt(eq(LOCK_GENERATION), eq(-1))).thenReturn(1);
+
+ wallpaperBackupAgent.onFullBackup(mOutput);
+
+ verify(mOutput); // Backup of empty file only
+ }
+
+ @Test
+ public void testOnFullBackup_withOnlyChangedSystem_updatesTheSharedPreferences()
+ throws IOException {
+ // Create a system wallpaper file
+ mTemporaryFolder.newFile("wallpaper_orig");
+ // Create stageing file to simulate he wallpaper being ready to back up
+ new File(mContext.getFilesDir(), "wallpaper-stage").createNewFile();
+
+ WallpaperBackupAgent wallpaperBackupAgent =
+ new IsolatedWallpaperBackupAgent(mTemporaryFolder.getRoot());
+ initialiseAgent(wallpaperBackupAgent);
+
+ SharedPreferences.Editor preferenceEditor = mock(SharedPreferences.Editor.class);
+
+ when(mWallpaperManager.getWallpaperIdForUser(eq(FLAG_SYSTEM), eq(UserHandle.USER_SYSTEM)))
+ .thenReturn(2);
+ when(mWallpaperManager.getWallpaperIdForUser(eq(FLAG_LOCK), eq(UserHandle.USER_SYSTEM)))
+ .thenReturn(1);
+ when(mWallpaperManager.isWallpaperBackupEligible(eq(FLAG_SYSTEM))).thenReturn(true);
+ when(mWallpaperManager.isWallpaperBackupEligible(eq(FLAG_LOCK))).thenReturn(true);
+ when(mSharedPreferences.getInt(eq(SYSTEM_GENERATION), eq(-1))).thenReturn(1);
+ when(mSharedPreferences.getInt(eq(LOCK_GENERATION), eq(-1))).thenReturn(1);
+ when(mSharedPreferences.edit()).thenReturn(preferenceEditor);
+ when(preferenceEditor.putInt(eq(SYSTEM_GENERATION), eq(2))).thenReturn(preferenceEditor);
+
+ wallpaperBackupAgent.onFullBackup(mOutput);
+
+ verify(preferenceEditor).putInt(eq(SYSTEM_GENERATION), eq(2));
+ }
+
+ private void initialiseAgent(WallpaperBackupAgent agent) {
+ agent.attach(mContext);
+ agent.onCreate();
+ }
+
+ private static class IsolatedWallpaperBackupAgent extends WallpaperBackupAgent {
+ File mWallpaperBaseDirectory;
+ List<File> mBackedUpFiles = new ArrayList();
+
+ IsolatedWallpaperBackupAgent(File wallpaperBaseDirectory) {
+ mWallpaperBaseDirectory = wallpaperBaseDirectory;
+ }
+
+ @Override
+ protected File getWallpaperDir() {
+ return mWallpaperBaseDirectory;
+ }
+
+ @Override
+ protected void backupFile(File file, FullBackupDataOutput data) {
+ mBackedUpFiles.add(file);
+ }
+ }
+}
diff --git a/packages/WallpaperBackup/test/src/com/android/wallpaperbackup/utils/ContextWithServiceOverrides.java b/packages/WallpaperBackup/test/src/com/android/wallpaperbackup/utils/ContextWithServiceOverrides.java
new file mode 100644
index 0000000..df5d74a
--- /dev/null
+++ b/packages/WallpaperBackup/test/src/com/android/wallpaperbackup/utils/ContextWithServiceOverrides.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2019 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.wallpaperbackup.utils;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.SharedPreferences;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContextWithServiceOverrides extends ContextWrapper {
+ private static final String TAG = "ContextWithOverrides";
+
+ private Map<String, Object> mInjectedSystemServices = new HashMap<>();
+ private SharedPreferences mSharedPreferencesOverride;
+
+ public ContextWithServiceOverrides(Context base) {
+ super(base);
+ }
+
+ public <S> void injectSystemService(Class<S> cls, S service) {
+ final String name = getSystemServiceName(cls);
+ mInjectedSystemServices.put(name, service);
+ }
+
+ @Override
+ public Context getApplicationContext() {
+ return this;
+ }
+
+ @Override
+ public Object getSystemService(String name) {
+ if (mInjectedSystemServices.containsKey(name)) {
+ return mInjectedSystemServices.get(name);
+ }
+ return super.getSystemService(name);
+ }
+
+ public void setSharedPreferencesOverride(SharedPreferences override) {
+ mSharedPreferencesOverride = override;
+ }
+
+ @Override
+ public SharedPreferences getSharedPreferences(String name, int mode) {
+ return mSharedPreferencesOverride == null
+ ? super.getSharedPreferences(name, mode)
+ : mSharedPreferencesOverride;
+ }
+}
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 6f43529..7fdd83b 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -98,6 +98,7 @@
import com.android.internal.util.IntPair;
import com.android.server.LocalServices;
import com.android.server.SystemService;
+import com.android.server.wm.ActivityTaskManagerInternal;
import com.android.server.wm.WindowManagerInternal;
import org.xmlpull.v1.XmlPullParserException;
@@ -179,6 +180,8 @@
private final AccessibilityDisplayListener mA11yDisplayListener;
+ private final ActivityTaskManagerInternal mActivityTaskManagerService;
+
private final MainHandler mMainHandler;
private final SystemActionPerformer mSystemActionPerformer;
@@ -260,6 +263,7 @@
mWindowManagerService, this, mSecurityPolicy, this);
mA11yDisplayListener = new AccessibilityDisplayListener(mContext, mMainHandler);
mSecurityPolicy.setAccessibilityWindowManager(mA11yWindowManager);
+ mActivityTaskManagerService = LocalServices.getService(ActivityTaskManagerInternal.class);
registerBroadcastReceivers();
new AccessibilityContentObserver(mMainHandler).register(
@@ -1435,7 +1439,7 @@
service = new AccessibilityServiceConnection(userState, mContext, componentName,
installedService, sIdCounter++, mMainHandler, mLock, mSecurityPolicy,
this, mWindowManagerService, mSystemActionPerformer,
- mA11yWindowManager);
+ mA11yWindowManager, mActivityTaskManagerService);
} else if (userState.mBoundServices.contains(service)) {
continue;
}
@@ -2411,7 +2415,7 @@
userState, mContext,
COMPONENT_NAME, info, sIdCounter++, mMainHandler, mLock, mSecurityPolicy,
AccessibilityManagerService.this, mWindowManagerService,
- mSystemActionPerformer, mA11yWindowManager) {
+ mSystemActionPerformer, mA11yWindowManager, mActivityTaskManagerService) {
@Override
public boolean supportsFlagForNotImportantViews(AccessibilityServiceInfo info) {
return true;
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
index a0a755a..6cadb6d 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
@@ -35,6 +35,7 @@
import android.util.Slog;
import android.view.Display;
+import com.android.server.wm.ActivityTaskManagerInternal;
import com.android.server.wm.WindowManagerInternal;
import java.lang.ref.WeakReference;
@@ -59,6 +60,7 @@
*/
final WeakReference<AccessibilityUserState> mUserStateWeakReference;
final Intent mIntent;
+ final ActivityTaskManagerInternal mActivityTaskManagerService;
private final Handler mMainHandler;
@@ -67,7 +69,8 @@
AccessibilityServiceInfo accessibilityServiceInfo, int id, Handler mainHandler,
Object lock, AccessibilitySecurityPolicy securityPolicy, SystemSupport systemSupport,
WindowManagerInternal windowManagerInternal,
- SystemActionPerformer systemActionPerfomer, AccessibilityWindowManager awm) {
+ SystemActionPerformer systemActionPerfomer, AccessibilityWindowManager awm,
+ ActivityTaskManagerInternal activityTaskManagerService) {
super(context, componentName, accessibilityServiceInfo, id, mainHandler, lock,
securityPolicy, systemSupport, windowManagerInternal, systemActionPerfomer, awm);
mUserStateWeakReference = new WeakReference<AccessibilityUserState>(userState);
@@ -75,6 +78,7 @@
mMainHandler = mainHandler;
mIntent.putExtra(Intent.EXTRA_CLIENT_LABEL,
com.android.internal.R.string.accessibility_binding_label);
+ mActivityTaskManagerService = activityTaskManagerService;
final long identity = Binder.clearCallingIdentity();
try {
mIntent.putExtra(Intent.EXTRA_CLIENT_INTENT, mSystemSupport.getPendingIntentActivity(
@@ -101,6 +105,9 @@
} finally {
Binder.restoreCallingIdentity(identity);
}
+ mActivityTaskManagerService.setAllowAppSwitches(mComponentName.flattenToString(),
+ mAccessibilityServiceInfo.getResolveInfo().serviceInfo.applicationInfo.uid,
+ userState.mUserId);
}
public void unbindLocked() {
@@ -109,6 +116,8 @@
if (userState == null) return;
userState.removeServiceLocked(this);
mSystemSupport.getMagnificationController().resetAllIfNeeded(mId);
+ mActivityTaskManagerService.setAllowAppSwitches(mComponentName.flattenToString(), -1,
+ userState.mUserId);
resetLocked();
}
@@ -207,6 +216,11 @@
@Override
public void onServiceDisconnected(ComponentName componentName) {
binderDied();
+ AccessibilityUserState userState = mUserStateWeakReference.get();
+ if (userState != null) {
+ mActivityTaskManagerService.setAllowAppSwitches(mComponentName.flattenToString(), -1,
+ userState.mUserId);
+ }
}
@Override
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 770de09..c6bc106 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -91,6 +91,7 @@
"android.hardware.light-V2.0-java",
"android.hardware.power-V1.0-java",
"android.hardware.tv.cec-V1.0-java",
+ "app-compat-annotations",
],
required: [
diff --git a/services/core/java/android/os/UserManagerInternal.java b/services/core/java/android/os/UserManagerInternal.java
index e5f8b49..9a7cb3f 100644
--- a/services/core/java/android/os/UserManagerInternal.java
+++ b/services/core/java/android/os/UserManagerInternal.java
@@ -143,8 +143,8 @@
* <p>Called by the {@link com.android.server.devicepolicy.DevicePolicyManagerService} when
* createAndManageUser is called by the device owner.
*/
- public abstract UserInfo createUserEvenWhenDisallowed(String name, int flags,
- String[] disallowedPackages);
+ public abstract UserInfo createUserEvenWhenDisallowed(String name, String userType,
+ int flags, String[] disallowedPackages);
/**
* Same as {@link UserManager#removeUser(int userId)}, but bypasses the check for
@@ -202,8 +202,7 @@
/**
* Checks if the {@code callingUserId} and {@code targetUserId} are same or in same group
- * and that the {@code callingUserId} is not a managed profile and
- * {@code targetUserId} is enabled.
+ * and that the {@code callingUserId} is not a profile and {@code targetUserId} is enabled.
*
* @return TRUE if the {@code callingUserId} can access {@code targetUserId}. FALSE
* otherwise
@@ -215,8 +214,7 @@
String debugMsg, boolean throwSecurityException);
/**
- * If {@code userId} is of a managed profile, return the parent user ID. Otherwise return
- * itself.
+ * If {@code userId} is of a profile, return the parent user ID. Otherwise return itself.
*/
public abstract int getProfileParentId(int userId);
diff --git a/services/core/java/com/android/server/DynamicSystemService.java b/services/core/java/com/android/server/DynamicSystemService.java
index 190e6cf..7b02b6e 100644
--- a/services/core/java/com/android/server/DynamicSystemService.java
+++ b/services/core/java/com/android/server/DynamicSystemService.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.content.pm.PackageManager;
-import android.gsi.GsiInstallParams;
import android.gsi.GsiProgress;
import android.gsi.IGsiService;
import android.gsi.IGsid;
@@ -47,6 +46,7 @@
private static final int GSID_ROUGH_TIMEOUT_MS = 8192;
private static final String PATH_DEFAULT = "/data/gsi";
private Context mContext;
+ private String mInstallPath;
private volatile IGsiService mGsiService;
DynamicSystemService(Context context) {
@@ -115,8 +115,8 @@
}
@Override
- public boolean startInstallation(String name, long size, boolean readOnly)
- throws RemoteException {
+ public boolean startInstallation() throws RemoteException {
+ IGsiService service = getGsiService();
// priority from high to low: sysprop -> sdcard -> /data
String path = SystemProperties.get("os.aot.path");
if (path.isEmpty()) {
@@ -138,14 +138,19 @@
}
Slog.i(TAG, "startInstallation -> " + path);
}
+ mInstallPath = path;
+ if (service.openInstall(path) != 0) {
+ Slog.i(TAG, "Failed to open " + path);
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public boolean createPartition(String name, long size, boolean readOnly)
+ throws RemoteException {
IGsiService service = getGsiService();
- GsiInstallParams installParams = new GsiInstallParams();
- installParams.installDir = path;
- installParams.name = name;
- installParams.size = size;
- installParams.wipe = readOnly;
- installParams.readOnly = readOnly;
- if (service.beginGsiInstall(installParams) != 0) {
+ if (service.createPartition(name, size, readOnly) != 0) {
Slog.i(TAG, "Failed to install " + name);
return false;
}
@@ -153,6 +158,16 @@
}
@Override
+ public boolean finishInstallation() throws RemoteException {
+ IGsiService service = getGsiService();
+ if (service.closeInstall() != 0) {
+ Slog.i(TAG, "Failed to finish installation");
+ return false;
+ }
+ return true;
+ }
+
+ @Override
public GsiProgress getInstallationProgress() throws RemoteException {
return getGsiService().getInstallProgress();
}
@@ -190,6 +205,8 @@
@Override
public boolean remove() throws RemoteException {
+ IGsiService gsiService = getGsiService();
+ String install_dir = gsiService.getInstalledGsiImageDir();
return getGsiService().removeGsi();
}
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 3916f0d..dcc690f 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -141,6 +141,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.server.storage.AppFuseBridge;
import com.android.server.storage.StorageSessionController;
+import com.android.server.storage.StorageSessionController.ExternalStorageServiceException;
import com.android.server.wm.ActivityTaskManagerInternal;
import com.android.server.wm.ActivityTaskManagerInternal.ScreenObserver;
@@ -196,9 +197,6 @@
private static final String ZRAM_ENABLED_PROPERTY =
"persist.sys.zram_enabled";
- private static final boolean IS_FUSE_ENABLED =
- SystemProperties.getBoolean(StorageManager.PROP_FUSE, false);
-
private static final boolean ENABLE_ISOLATED_STORAGE = StorageManager.hasIsolatedStorage();
/**
@@ -350,6 +348,10 @@
@GuardedBy("mLock")
private ArrayMap<String, CountDownLatch> mDiskScanLatches = new ArrayMap<>();
+ /** Map from volume ID to latches */
+ @GuardedBy("mLock")
+ private ArrayMap<String, CountDownLatch> mFuseVolumeReadyLatches = new ArrayMap<>();
+
@GuardedBy("mLock")
private IPackageMoveObserver mMoveCallback;
@GuardedBy("mLock")
@@ -419,7 +421,7 @@
private @Nullable VolumeInfo findStorageForUuid(String volumeUuid) {
final StorageManager storage = mContext.getSystemService(StorageManager.class);
if (Objects.equals(StorageManager.UUID_PRIVATE_INTERNAL, volumeUuid)) {
- return storage.findVolumeById(VolumeInfo.ID_EMULATED_INTERNAL);
+ return storage.findVolumeById(VolumeInfo.ID_EMULATED_INTERNAL + ";" + 0);
} else if (Objects.equals(StorageManager.UUID_PRIMARY_PHYSICAL, volumeUuid)) {
return storage.getPrimaryPhysicalVolume();
} else {
@@ -462,6 +464,17 @@
}
}
+ private CountDownLatch findOrCreateFuseVolumeReadyLatch(String volId) {
+ synchronized (mLock) {
+ CountDownLatch latch = mFuseVolumeReadyLatches.get(volId);
+ if (latch == null) {
+ latch = new CountDownLatch(1);
+ mFuseVolumeReadyLatches.put(volId, latch);
+ }
+ return latch;
+ }
+ }
+
/** List of crypto types.
* These must match CRYPT_TYPE_XXX in cryptfs.h AND their
* corresponding commands in CommandListener.cpp */
@@ -514,6 +527,8 @@
// Not guarded by a lock.
private final StorageSessionController mStorageSessionController;
+ private final boolean mIsFuseEnabled;
+
class ObbState implements IBinder.DeathRecipient {
public ObbState(String rawPath, String canonicalPath, int callingUid,
IObbActionListener token, int nonce, String volId) {
@@ -597,6 +612,7 @@
private static final int H_ABORT_IDLE_MAINT = 12;
private static final int H_BOOT_COMPLETED = 13;
private static final int H_COMPLETE_UNLOCK_USER = 14;
+ private static final int H_VOLUME_READY = 15;
class StorageManagerServiceHandler extends Handler {
public StorageManagerServiceHandler(Looper looper) {
@@ -657,6 +673,22 @@
}
break;
}
+ case H_VOLUME_READY: {
+ final VolumeInfo vol = (VolumeInfo) msg.obj;
+ try {
+ mStorageSessionController.onVolumeReady(vol);
+
+ synchronized (mLock) {
+ CountDownLatch latch = mFuseVolumeReadyLatches.remove(vol.id);
+ if (latch != null) {
+ latch.countDown();
+ }
+ }
+ } catch (IllegalStateException | ExternalStorageServiceException e) {
+ Slog.i(TAG, "Failed to initialise volume " + vol, e);
+ }
+ break;
+ }
case H_VOLUME_MOUNT: {
final VolumeInfo vol = (VolumeInfo) msg.obj;
if (isMountDisallowed(vol)) {
@@ -664,19 +696,12 @@
break;
}
- // TODO(b/135341433): Remove paranoid logging when FUSE is stable
- Slog.i(TAG, "Mounting volume " + vol);
- // TODO(b/135341433): Update to use new vold API that gets or mounts fuse fd
- // Ensure that we can pass user of a volume to the new API
- mStorageSessionController.onVolumeMounted(mCurrentUserId, mount(vol), vol);
- Slog.i(TAG, "Mounted volume " + vol);
-
+ mount(vol);
break;
}
case H_VOLUME_UNMOUNT: {
final VolumeInfo vol = (VolumeInfo) msg.obj;
unmount(vol);
- mStorageSessionController.onVolumeUnmounted(mCurrentUserId, vol);
break;
}
case H_VOLUME_BROADCAST: {
@@ -757,7 +782,6 @@
}
}
mVold.onUserRemoved(userId);
- mStorageSessionController.onUserRemoved(userId);
}
} catch (Exception e) {
Slog.wtf(TAG, e);
@@ -978,7 +1002,12 @@
+ ", mDaemonConnected=" + mDaemonConnected);
if (mBootCompleted && mDaemonConnected) {
final List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();
- killMediaProvider(users);
+
+ if (mIsFuseEnabled) {
+ mStorageSessionController.onReset(mVold, mHandler);
+ } else {
+ killMediaProvider(users);
+ }
final int[] systemUnlockedUsers;
synchronized (mLock) {
@@ -992,7 +1021,7 @@
try {
// TODO(b/135341433): Remove paranoid logging when FUSE is stable
- Slog.i(TAG, "Resetting vold");
+ Slog.i(TAG, "Resetting vold...");
mVold.reset();
Slog.i(TAG, "Reset vold");
@@ -1019,7 +1048,7 @@
// staging area is ready so it's ready for zygote-forked apps to
// bind mount against.
try {
- mStorageSessionController.onUserStarted(userId);
+ mStorageSessionController.onUnlockUser(userId);
mVold.onUserStarted(userId);
mStoraged.onUserStarted(userId);
} catch (Exception e) {
@@ -1201,10 +1230,12 @@
}
@Override
- public void onVolumeCreated(String volId, int type, String diskId, String partGuid) {
+ public void onVolumeCreated(String volId, int type, String diskId, String partGuid,
+ int userId) {
synchronized (mLock) {
final DiskInfo disk = mDisks.get(diskId);
final VolumeInfo vol = new VolumeInfo(volId, type, disk, partGuid);
+ vol.mountUserId = userId;
mVolumes.put(volId, vol);
onVolumeCreatedLocked(vol);
}
@@ -1258,8 +1289,13 @@
@Override
public void onVolumeDestroyed(String volId) {
+ VolumeInfo vol = null;
synchronized (mLock) {
- mVolumes.remove(volId);
+ vol = mVolumes.remove(volId);
+ }
+
+ if (vol != null) {
+ mStorageSessionController.onVolumeRemove(vol);
}
}
};
@@ -1395,6 +1431,13 @@
writeSettingsLocked();
}
+ if (mIsFuseEnabled && newState == VolumeInfo.STATE_MOUNTED
+ && (vol.type == VolumeInfo.TYPE_PUBLIC || vol.type == VolumeInfo.TYPE_EMULATED)) {
+ Slog.i(TAG, "Initialising volume " + vol + " ...");
+ // TODO(b/144275217): Delay broadcasts till mount is really ready
+ mHandler.obtainMessage(H_VOLUME_READY, vol).sendToTarget();
+ }
+
mCallbacks.notifyVolumeStateChanged(vol, oldState, newState);
// Do not broadcast before boot has completed to avoid launching the
@@ -1546,13 +1589,12 @@
// Snapshot feature flag used for this boot
SystemProperties.set(StorageManager.PROP_ISOLATED_STORAGE_SNAPSHOT, Boolean.toString(
SystemProperties.getBoolean(StorageManager.PROP_ISOLATED_STORAGE, true)));
-
SystemProperties.set(StorageManager.PROP_FUSE_SNAPSHOT, Boolean.toString(
SystemProperties.getBoolean(StorageManager.PROP_FUSE, false)));
+ mIsFuseEnabled = SystemProperties.getBoolean(StorageManager.PROP_FUSE_SNAPSHOT, false);
mContext = context;
mResolver = mContext.getContentResolver();
-
mCallbacks = new Callbacks(FgThread.get().getLooper());
mLockPatternUtils = new LockPatternUtils(mContext);
@@ -1563,11 +1605,7 @@
// Add OBB Action Handler to StorageManagerService thread.
mObbActionHandler = new ObbActionHandler(IoThread.get().getLooper());
- mStorageSessionController = new StorageSessionController(mContext,
- userId -> {
- Slog.i(TAG, "Storage session ended for user: " + userId + ". Resetting...");
- mHandler.obtainMessage(H_RESET).sendToTarget();
- });
+ mStorageSessionController = new StorageSessionController(mContext, mIsFuseEnabled);
// Initialize the last-fstrim tracking if necessary
File dataDir = Environment.getDataDirectory();
@@ -1873,21 +1911,36 @@
if (isMountDisallowed(vol)) {
throw new SecurityException("Mounting " + volId + " restricted by policy");
}
+
+ CountDownLatch latch = null;
+ if (mIsFuseEnabled && StorageSessionController.isEmulatedOrPublic(vol)) {
+ latch = findOrCreateFuseVolumeReadyLatch(volId);
+ }
+
mount(vol);
+
+ if (latch != null) {
+ try {
+ waitForLatch(latch, "mount " + volId, 3 * DateUtils.MINUTE_IN_MILLIS);
+ } catch (TimeoutException e) {
+ Slog.wtf(TAG, e);
+ } finally {
+ synchronized (mLock) {
+ mFuseVolumeReadyLatches.remove(volId);
+ }
+ }
+ }
}
- private FileDescriptor mount(VolumeInfo vol) {
+ private void mount(VolumeInfo vol) {
try {
- // TODO(b/135341433): Now, emulated (and private?) volumes are shared across users
- // This means the mountUserId on such volumes is USER_NULL. This breaks fuse which
- // requires a valid user to mount a volume. Create individual volumes per user in vold
- // and remove this property check
- int userId = SystemProperties.getBoolean(StorageManager.PROP_FUSE_SNAPSHOT, false)
- ? mCurrentUserId : vol.mountUserId;
- return mVold.mount(vol.id, vol.mountFlags, userId);
+ // TODO(b/135341433): Remove paranoid logging when FUSE is stable
+ Slog.i(TAG, "Mounting volume " + vol);
+ FileDescriptor fd = mVold.mount(vol.id, vol.mountFlags, vol.mountUserId);
+ Slog.i(TAG, "Mounted volume " + vol);
+ mStorageSessionController.onVolumeMount(fd, vol);
} catch (Exception e) {
Slog.wtf(TAG, e);
- return null;
}
}
@@ -1902,6 +1955,7 @@
private void unmount(VolumeInfo vol) {
try {
mVold.unmount(vol.id);
+ mStorageSessionController.onVolumeUnmount(vol);
} catch (Exception e) {
Slog.wtf(TAG, e);
}
@@ -3040,6 +3094,14 @@
@Override
public void mkdirs(String callingPkg, String appPath) {
+ if (mIsFuseEnabled) {
+ // TODO(b/144332951): Calling into Vold is risky because the FUSE daemon can go down
+ // anytime and Vold will hang forever. We should either remove this call
+ // or at least call into the FUSE daemon to mkdir instead
+ Slog.w(TAG, "Not making dir for package " + callingPkg + " with path " + appPath);
+ return;
+ }
+
final int callingUid = Binder.getCallingUid();
final int userId = UserHandle.getUserId(callingUid);
final UserEnvironment userEnv = new UserEnvironment(userId);
@@ -3121,8 +3183,12 @@
switch (vol.getType()) {
case VolumeInfo.TYPE_PUBLIC:
case VolumeInfo.TYPE_STUB:
- case VolumeInfo.TYPE_EMULATED:
break;
+ case VolumeInfo.TYPE_EMULATED:
+ if (vol.getMountUserId() == userId) {
+ break;
+ }
+ // Skip if emulated volume not for userId
default:
continue;
}
@@ -3711,7 +3777,7 @@
return Zygote.MOUNT_EXTERNAL_NONE;
}
- if (IS_FUSE_ENABLED && packageName.equals(mMediaStoreAuthorityPackageName)) {
+ if (mIsFuseEnabled && packageName.equals(mMediaStoreAuthorityPackageName)) {
// Determine if caller requires pass_through mount
return Zygote.MOUNT_EXTERNAL_PASS_THROUGH;
}
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index f8b0072..dc61261 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -20,6 +20,7 @@
import static java.util.Arrays.copyOf;
+import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.AppOpsManager;
import android.content.BroadcastReceiver;
@@ -112,6 +113,7 @@
Context context;
String callingPackage;
+ String callingFeatureId;
IBinder binder;
@@ -145,7 +147,7 @@
boolean canReadCallLog() {
try {
return TelephonyPermissions.checkReadCallLog(
- context, subId, callerPid, callerUid, callingPackage);
+ context, subId, callerPid, callerUid, callingPackage, callingFeatureId);
} catch (SecurityException e) {
return false;
}
@@ -578,7 +580,7 @@
}
@Override
- public void addOnSubscriptionsChangedListener(String callingPackage,
+ public void addOnSubscriptionsChangedListener(String callingPackage, String callingFeatureId,
IOnSubscriptionsChangedListener callback) {
int callerUserId = UserHandle.getCallingUserId();
mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
@@ -600,6 +602,7 @@
r.context = mContext;
r.onSubscriptionsChangedListenerCallback = callback;
r.callingPackage = callingPackage;
+ r.callingFeatureId = callingFeatureId;
r.callerUid = Binder.getCallingUid();
r.callerPid = Binder.getCallingPid();
r.events = 0;
@@ -632,7 +635,7 @@
@Override
public void addOnOpportunisticSubscriptionsChangedListener(String callingPackage,
- IOnSubscriptionsChangedListener callback) {
+ String callingFeatureId, IOnSubscriptionsChangedListener callback) {
int callerUserId = UserHandle.getCallingUserId();
mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
if (VDBG) {
@@ -653,6 +656,7 @@
r.context = mContext;
r.onOpportunisticSubscriptionsChangedListenerCallback = callback;
r.callingPackage = callingPackage;
+ r.callingFeatureId = callingFeatureId;
r.callerUid = Binder.getCallingUid();
r.callerPid = Binder.getCallingPid();
r.events = 0;
@@ -728,21 +732,28 @@
}
}
+ @Deprecated
@Override
- public void listen(String pkgForDebug, IPhoneStateListener callback, int events,
+ public void listen(String callingPackage, IPhoneStateListener callback, int events,
boolean notifyNow) {
- listenForSubscriber(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, pkgForDebug, callback,
- events, notifyNow);
+ listenWithFeature(callingPackage, null, callback, events, notifyNow);
}
@Override
- public void listenForSubscriber(int subId, String pkgForDebug, IPhoneStateListener callback,
- int events, boolean notifyNow) {
- listen(pkgForDebug, callback, events, notifyNow, subId);
+ public void listenWithFeature(String callingPackage, String callingFeatureId,
+ IPhoneStateListener callback, int events, boolean notifyNow) {
+ listenForSubscriber(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, callingPackage,
+ callingFeatureId, callback, events, notifyNow);
}
- private void listen(String callingPackage, IPhoneStateListener callback, int events,
- boolean notifyNow, int subId) {
+ @Override
+ public void listenForSubscriber(int subId, String callingPackage, String callingFeatureId,
+ IPhoneStateListener callback, int events, boolean notifyNow) {
+ listen(callingPackage, callingFeatureId, callback, events, notifyNow, subId);
+ }
+
+ private void listen(String callingPackage, @Nullable String callingFeatureId,
+ IPhoneStateListener callback, int events, boolean notifyNow, int subId) {
int callerUserId = UserHandle.getCallingUserId();
mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
String str = "listen: E pkg=" + callingPackage + " events=0x" + Integer.toHexString(events)
@@ -757,7 +768,8 @@
// Checks permission and throws SecurityException for disallowed operations. For pre-M
// apps whose runtime permission has been revoked, we return immediately to skip sending
// events to the app without crashing it.
- if (!checkListenerPermission(events, subId, callingPackage, "listen")) {
+ if (!checkListenerPermission(events, subId, callingPackage, callingFeatureId,
+ "listen")) {
return;
}
@@ -774,6 +786,7 @@
r.context = mContext;
r.callback = callback;
r.callingPackage = callingPackage;
+ r.callingFeatureId = callingFeatureId;
r.callerUid = Binder.getCallingUid();
r.callerPid = Binder.getCallingPid();
// Legacy applications pass SubscriptionManager.DEFAULT_SUB_ID,
@@ -2374,8 +2387,8 @@
== PackageManager.PERMISSION_GRANTED;
}
- private boolean checkListenerPermission(
- int events, int subId, String callingPackage, String message) {
+ private boolean checkListenerPermission(int events, int subId, String callingPackage,
+ @Nullable String callingFeatureId, String message) {
LocationAccessPolicy.LocationPermissionQuery.Builder locationQueryBuilder =
new LocationAccessPolicy.LocationPermissionQuery.Builder()
.setCallingPackage(callingPackage)
@@ -2410,7 +2423,7 @@
if ((events & ENFORCE_PHONE_STATE_PERMISSION_MASK) != 0) {
if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
- mContext, subId, callingPackage, message)) {
+ mContext, subId, callingPackage, callingFeatureId, message)) {
return false;
}
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index aeff9ea..4bb29f0 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -24,6 +24,7 @@
import static android.Manifest.permission.REMOVE_TASKS;
import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;
import static android.app.ActivityManager.INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS;
+import static android.app.ActivityManager.INSTR_FLAG_DISABLE_TEST_API_CHECKS;
import static android.app.ActivityManager.INSTR_FLAG_MOUNT_EXTERNAL_STORAGE_FULL;
import static android.app.ActivityManager.PROCESS_STATE_LAST_ACTIVITY;
import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;
@@ -16060,13 +16061,12 @@
boolean disableHiddenApiChecks = ai.usesNonSdkApi()
|| (flags & INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;
- if (disableHiddenApiChecks) {
+ boolean disableTestApiChecks = disableHiddenApiChecks
+ || (flags & INSTR_FLAG_DISABLE_TEST_API_CHECKS) != 0;
+ if (disableHiddenApiChecks || disableTestApiChecks) {
enforceCallingPermission(android.Manifest.permission.DISABLE_HIDDEN_API_CHECKS,
"disable hidden API checks");
}
- // Allow instrumented processes access to test APIs.
- // TODO(satayev): make this configurable via testing framework.
- boolean disableTestApiChecks = true;
final boolean mountExtStorageFull = isCallerShell()
&& (flags & INSTR_FLAG_MOUNT_EXTERNAL_STORAGE_FULL) != 0;
diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
index 59acdcf..1f56176 100644
--- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
+++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
@@ -3028,7 +3028,8 @@
pw.println(" --allow-background-activity-starts: The receiver may start activities");
pw.println(" even if in the background.");
pw.println(" instrument [-r] [-e <NAME> <VALUE>] [-p <FILE>] [-w]");
- pw.println(" [--user <USER_ID> | current] [--no-hidden-api-checks]");
+ pw.println(" [--user <USER_ID> | current]");
+ pw.println(" [--no-hidden-api-checks [--no-test-api-checks]]");
pw.println(" [--no-isolated-storage]");
pw.println(" [--no-window-animation] [--abi <ABI>] <COMPONENT>");
pw.println(" Start an Instrumentation. Typically this target <COMPONENT> is in the");
@@ -3048,6 +3049,8 @@
pw.println(" --user <USER_ID> | current: Specify user instrumentation runs in;");
pw.println(" current user if not specified.");
pw.println(" --no-hidden-api-checks: disable restrictions on use of hidden API.");
+ pw.println(" --no-test-api-checks: disable restrictions to test APIs, if hidden");
+ pw.println(" API checks are enabled.");
pw.println(" --no-isolated-storage: don't use isolated storage sandbox and ");
pw.println(" mount full external storage");
pw.println(" --no-window-animation: turn off window animations while running.");
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 4361676..31ceb38 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -384,7 +384,7 @@
// We need to delay unlocking managed profiles until the parent user
// is also unlocked.
- if (mInjector.getUserManager().isManagedProfile(userId)) {
+ if (mInjector.getUserManager().isProfile(userId)) {
final UserInfo parent = mInjector.getUserManager().getProfileParent(userId);
if (parent != null
&& isUserRunning(parent.id, ActivityManager.FLAG_AND_UNLOCKED)) {
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index d09139c..9a92778 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -772,6 +772,8 @@
readAndSetLowRamDevice();
+ mIsCallScreeningModeSupported = AudioSystem.isCallScreeningModeSupported();
+
// Call setRingerModeInt() to apply correct mute
// state on streams affected by ringer mode.
mRingerAndZenModeMutedStreams = 0;
@@ -965,6 +967,8 @@
readAndSetLowRamDevice();
+ mIsCallScreeningModeSupported = AudioSystem.isCallScreeningModeSupported();
+
// Restore device connection states, BT state
mDeviceBroker.onAudioServerDied();
@@ -1469,10 +1473,13 @@
}
if (!TextUtils.isEmpty(packageName)) {
PackageManager pm = mContext.getPackageManager();
+ ActivityManager am =
+ (ActivityManager) mContext.getSystemService(mContext.ACTIVITY_SERVICE);
+
if (pm.checkPermission(Manifest.permission.CAPTURE_AUDIO_HOTWORD, packageName)
== PackageManager.PERMISSION_GRANTED) {
try {
- assistantUid = pm.getPackageUid(packageName, 0);
+ assistantUid = pm.getPackageUidAsUser(packageName, am.getCurrentUser());
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG,
"updateAssistantUId() could not find UID for package: " + packageName);
@@ -2790,10 +2797,6 @@
setSystemAudioMute(mute);
AudioSystem.setMasterMute(mute);
sendMasterMuteUpdate(mute, flags);
-
- Intent intent = new Intent(AudioManager.MASTER_MUTE_CHANGED_ACTION);
- intent.putExtra(AudioManager.EXTRA_MASTER_VOLUME_MUTED, mute);
- sendBroadcastToAll(intent);
}
}
}
@@ -2912,11 +2915,14 @@
final boolean currentMute = AudioSystem.isMicrophoneMuted();
final long identity = Binder.clearCallingIdentity();
AudioSystem.muteMicrophone(muted);
- Binder.restoreCallingIdentity(identity);
- if (muted != currentMute) {
- mContext.sendBroadcastAsUser(
+ try {
+ if (muted != currentMute) {
+ mContext.sendBroadcastAsUser(
new Intent(AudioManager.ACTION_MICROPHONE_MUTE_CHANGED)
.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY), UserHandle.ALL);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
}
}
}
@@ -3287,6 +3293,12 @@
return;
}
+ if (mode == AudioSystem.MODE_CALL_SCREENING && !mIsCallScreeningModeSupported) {
+ Log.w(TAG, "setMode(MODE_CALL_SCREENING) not permitted "
+ + "when call screening is not supported");
+ return;
+ }
+
if (mode < AudioSystem.MODE_CURRENT || mode >= AudioSystem.NUM_MODES) {
return;
}
@@ -3417,6 +3429,14 @@
return mMode;
}
+ /** cached value read from audiopolicy manager after initialization. */
+ private boolean mIsCallScreeningModeSupported = false;
+
+ /** @see AudioManager#isCallScreeningModeSupported() */
+ public boolean isCallScreeningModeSupported() {
+ return mIsCallScreeningModeSupported;
+ }
+
//==========================================================================================
// Sound Effects
//==========================================================================================
@@ -6149,6 +6169,7 @@
pw.print(" mHdmiPlaybackClient="); pw.println(mHdmiPlaybackClient);
pw.print(" mHdmiTvClient="); pw.println(mHdmiTvClient);
pw.print(" mHdmiSystemAudioSupported="); pw.println(mHdmiSystemAudioSupported);
+ pw.print(" mIsCallScreeningModeSupported="); pw.println(mIsCallScreeningModeSupported);
dumpAudioPolicies(pw);
mDynPolicyLogger.dump(pw);
diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java
index 4a62bc5..bc7307b 100644
--- a/services/core/java/com/android/server/content/ContentService.java
+++ b/services/core/java/com/android/server/content/ContentService.java
@@ -394,6 +394,15 @@
* allowed.
*/
@Override
+ public void notifyChange(Uri[] uris, IContentObserver observer,
+ boolean observerWantsSelfNotifications, int flags, int userHandle,
+ int targetSdkVersion, String callingPackage) {
+ for (Uri uri : uris) {
+ notifyChange(uri, observer, observerWantsSelfNotifications, flags, userHandle,
+ targetSdkVersion, callingPackage);
+ }
+ }
+
public void notifyChange(Uri uri, IContentObserver observer,
boolean observerWantsSelfNotifications, int flags, int userHandle,
int targetSdkVersion, String callingPackage) {
diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java
index ebaa5a1..dea47db 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -51,6 +51,8 @@
import android.util.Slog;
import android.util.SparseArray;
import android.util.Xml;
+import android.util.proto.ProtoInputStream;
+import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
@@ -64,6 +66,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Calendar;
@@ -428,7 +433,8 @@
}
// Primary list of all syncable authorities. Also our global lock.
- private final SparseArray<AuthorityInfo> mAuthorities =
+ @VisibleForTesting
+ final SparseArray<AuthorityInfo> mAuthorities =
new SparseArray<AuthorityInfo>();
private final HashMap<AccountAndUser, AccountInfo> mAccounts
@@ -437,7 +443,8 @@
private final SparseArray<ArrayList<SyncInfo>> mCurrentSyncs
= new SparseArray<ArrayList<SyncInfo>>();
- private final SparseArray<SyncStatusInfo> mSyncStatus =
+ @VisibleForTesting
+ final SparseArray<SyncStatusInfo> mSyncStatus =
new SparseArray<SyncStatusInfo>();
private final ArrayList<SyncHistoryItem> mSyncHistory =
@@ -453,7 +460,8 @@
private int mNextAuthorityId = 0;
// We keep 4 weeks of stats.
- private final DayStats[] mDayStats = new DayStats[7*4];
+ @VisibleForTesting
+ final DayStats[] mDayStats = new DayStats[7*4];
private final Calendar mCal;
private int mYear;
private int mYearInDays;
@@ -464,6 +472,18 @@
private int mSyncRandomOffset;
+ // STOPSHIP: b/143656271 this should be true on launch
+ private static final boolean DELETE_LEGACY_PARCEL_FILES = false;
+ private static final String LEGACY_STATUS_FILE_NAME = "status.bin";
+ private static final String LEGACY_STATISTICS_FILE_NAME = "stats.bin";
+
+ private static final String SYNC_DIR_NAME = "sync";
+ private static final String ACCOUNT_INFO_FILE_NAME = "accounts.xml";
+ private static final String STATUS_FILE_NAME = "status";
+ private static final String STATISTICS_FILE_NAME = "stats";
+
+ private File mSyncDir;
+
/**
* This file contains the core engine state: all accounts and the
* settings for them. It must never be lost, and should be changed
@@ -508,14 +528,15 @@
com.android.internal.R.bool.config_syncstorageengine_masterSyncAutomatically);
File systemDir = new File(dataDir, "system");
- File syncDir = new File(systemDir, "sync");
- syncDir.mkdirs();
+ mSyncDir = new File(systemDir, SYNC_DIR_NAME);
+ mSyncDir.mkdirs();
- maybeDeleteLegacyPendingInfoLocked(syncDir);
+ maybeDeleteLegacyPendingInfoLocked(mSyncDir);
- mAccountInfoFile = new AtomicFile(new File(syncDir, "accounts.xml"), "sync-accounts");
- mStatusFile = new AtomicFile(new File(syncDir, "status.bin"), "sync-status");
- mStatisticsFile = new AtomicFile(new File(syncDir, "stats.bin"), "sync-stats");
+ mAccountInfoFile = new AtomicFile(new File(mSyncDir, ACCOUNT_INFO_FILE_NAME),
+ "sync-accounts");
+ mStatusFile = new AtomicFile(new File(mSyncDir, STATUS_FILE_NAME), "sync-status");
+ mStatisticsFile = new AtomicFile(new File(mSyncDir, STATISTICS_FILE_NAME), "sync-stats");
readAccountInfoLocked();
readStatusLocked();
@@ -2017,15 +2038,10 @@
public static final int STATUS_FILE_END = 0;
public static final int STATUS_FILE_ITEM = 100;
- /**
- * Read all sync status back in to the initial engine state.
- */
- private void readStatusLocked() {
- if (Log.isLoggable(TAG_FILE, Log.VERBOSE)) {
- Slog.v(TAG_FILE, "Reading " + mStatusFile.getBaseFile());
- }
+ private void readStatusParcelLocked(File parcel) {
try {
- byte[] data = mStatusFile.readFully();
+ final AtomicFile parcelFile = new AtomicFile(parcel);
+ byte[] data = parcelFile.readFully();
Parcel in = Parcel.obtain();
in.unmarshall(data, 0, data.length);
in.setDataPosition(0);
@@ -2036,9 +2052,6 @@
SyncStatusInfo status = new SyncStatusInfo(in);
if (mAuthorities.indexOfKey(status.authorityId) >= 0) {
status.pending = false;
- if (Log.isLoggable(TAG_FILE, Log.VERBOSE)) {
- Slog.v(TAG_FILE, "Adding status for id " + status.authorityId);
- }
mSyncStatus.put(status.authorityId, status);
}
} catch (Exception e) {
@@ -2050,15 +2063,247 @@
break;
}
}
- } catch (java.io.IOException e) {
+ } catch (IOException e) {
Slog.i(TAG, "No initial status");
}
}
+ private void upgradeStatusIfNeededLocked() {
+ final File parcelStatus = new File(mSyncDir, LEGACY_STATUS_FILE_NAME);
+ if (parcelStatus.exists() && !mStatusFile.exists()) {
+ readStatusParcelLocked(parcelStatus);
+ writeStatusLocked();
+ }
+
+ // if upgrade to proto was successful, delete parcel file
+ if (DELETE_LEGACY_PARCEL_FILES && mStatusFile.exists()) {
+ parcelStatus.delete();
+ }
+ }
+
+ /**
+ * Read all sync status back in to the initial engine state.
+ */
+ @VisibleForTesting
+ void readStatusLocked() {
+ upgradeStatusIfNeededLocked();
+
+ if (!mStatusFile.exists()) {
+ return;
+ }
+ try {
+ try (FileInputStream in = mStatusFile.openRead()) {
+ readStatusInfoLocked(in);
+ }
+ } catch (IOException e) {
+ Slog.e(TAG, "Unable to read status info file.", e);
+ }
+ }
+
+ private void readStatusInfoLocked(InputStream in) throws IOException {
+ final ProtoInputStream proto = new ProtoInputStream(in);
+ while (true) {
+ switch (proto.nextField()) {
+ case (int) SyncStatusProto.STATUS:
+ final long token = proto.start(SyncStatusProto.STATUS);
+ final SyncStatusInfo status = readSyncStatusInfoLocked(proto);
+ proto.end(token);
+ if (mAuthorities.indexOfKey(status.authorityId) >= 0) {
+ status.pending = false;
+ mSyncStatus.put(status.authorityId, status);
+ }
+ break;
+ case ProtoInputStream.NO_MORE_FIELDS:
+ return;
+ }
+ }
+ }
+
+ private SyncStatusInfo readSyncStatusInfoLocked(ProtoInputStream proto) throws IOException {
+ SyncStatusInfo status;
+ if (proto.nextField(SyncStatusProto.StatusInfo.AUTHORITY_ID)) {
+ //fast-path; this should work for most cases since the authority id is written first
+ status = new SyncStatusInfo(proto.readInt(SyncStatusProto.StatusInfo.AUTHORITY_ID));
+ } else {
+ // placeholder to read other data; assume the default authority id as 0
+ status = new SyncStatusInfo(0);
+ }
+
+ int successTimesCount = 0;
+ int failureTimesCount = 0;
+ ArrayList<Pair<Long, String>> lastEventInformation = new ArrayList<>();
+ while (true) {
+ switch (proto.nextField()) {
+ case (int) SyncStatusProto.StatusInfo.AUTHORITY_ID:
+ // fast-path failed for some reason, rebuild the status from placeholder object
+ Slog.w(TAG, "Failed to read the authority id via fast-path; "
+ + "some data might not have been read.");
+ status = new SyncStatusInfo(
+ proto.readInt(SyncStatusProto.StatusInfo.AUTHORITY_ID), status);
+ break;
+ case (int) SyncStatusProto.StatusInfo.LAST_SUCCESS_TIME:
+ status.lastSuccessTime = proto.readLong(
+ SyncStatusProto.StatusInfo.LAST_SUCCESS_TIME);
+ break;
+ case (int) SyncStatusProto.StatusInfo.LAST_SUCCESS_SOURCE:
+ status.lastSuccessSource = proto.readInt(
+ SyncStatusProto.StatusInfo.LAST_SUCCESS_SOURCE);
+ break;
+ case (int) SyncStatusProto.StatusInfo.LAST_FAILURE_TIME:
+ status.lastFailureTime = proto.readLong(
+ SyncStatusProto.StatusInfo.LAST_FAILURE_TIME);
+ break;
+ case (int) SyncStatusProto.StatusInfo.LAST_FAILURE_SOURCE:
+ status.lastFailureSource = proto.readInt(
+ SyncStatusProto.StatusInfo.LAST_FAILURE_SOURCE);
+ break;
+ case (int) SyncStatusProto.StatusInfo.LAST_FAILURE_MESSAGE:
+ status.lastFailureMesg = proto.readString(
+ SyncStatusProto.StatusInfo.LAST_FAILURE_MESSAGE);
+ break;
+ case (int) SyncStatusProto.StatusInfo.INITIAL_FAILURE_TIME:
+ status.initialFailureTime = proto.readLong(
+ SyncStatusProto.StatusInfo.INITIAL_FAILURE_TIME);
+ break;
+ case (int) SyncStatusProto.StatusInfo.PENDING:
+ status.pending = proto.readBoolean(SyncStatusProto.StatusInfo.PENDING);
+ break;
+ case (int) SyncStatusProto.StatusInfo.INITIALIZE:
+ status.initialize = proto.readBoolean(SyncStatusProto.StatusInfo.INITIALIZE);
+ break;
+ case (int) SyncStatusProto.StatusInfo.PERIODIC_SYNC_TIMES:
+ status.addPeriodicSyncTime(
+ proto.readLong(SyncStatusProto.StatusInfo.PERIODIC_SYNC_TIMES));
+ break;
+ case (int) SyncStatusProto.StatusInfo.LAST_EVENT_INFO:
+ final long eventToken = proto.start(SyncStatusProto.StatusInfo.LAST_EVENT_INFO);
+ final Pair<Long, String> lastEventInfo = parseLastEventInfoLocked(proto);
+ if (lastEventInfo != null) {
+ lastEventInformation.add(lastEventInfo);
+ }
+ proto.end(eventToken);
+ break;
+ case (int) SyncStatusProto.StatusInfo.LAST_TODAY_RESET_TIME:
+ status.lastTodayResetTime = proto.readLong(
+ SyncStatusProto.StatusInfo.LAST_TODAY_RESET_TIME);
+ break;
+ case (int) SyncStatusProto.StatusInfo.TOTAL_STATS:
+ final long totalStatsToken = proto.start(
+ SyncStatusProto.StatusInfo.TOTAL_STATS);
+ readSyncStatusStatsLocked(proto, status.totalStats);
+ proto.end(totalStatsToken);
+ break;
+ case (int) SyncStatusProto.StatusInfo.TODAY_STATS:
+ final long todayStatsToken = proto.start(
+ SyncStatusProto.StatusInfo.TODAY_STATS);
+ readSyncStatusStatsLocked(proto, status.todayStats);
+ proto.end(todayStatsToken);
+ break;
+ case (int) SyncStatusProto.StatusInfo.YESTERDAY_STATS:
+ final long yesterdayStatsToken = proto.start(
+ SyncStatusProto.StatusInfo.YESTERDAY_STATS);
+ readSyncStatusStatsLocked(proto, status.yesterdayStats);
+ proto.end(yesterdayStatsToken);
+ break;
+ case (int) SyncStatusProto.StatusInfo.PER_SOURCE_LAST_SUCCESS_TIMES:
+ final long successTime = proto.readLong(
+ SyncStatusProto.StatusInfo.PER_SOURCE_LAST_SUCCESS_TIMES);
+ if (successTimesCount == status.perSourceLastSuccessTimes.length) {
+ Slog.w(TAG, "Attempted to read more per source last success times "
+ + "than expected; data might be corrupted.");
+ break;
+ }
+ status.perSourceLastSuccessTimes[successTimesCount] = successTime;
+ successTimesCount++;
+ break;
+ case (int) SyncStatusProto.StatusInfo.PER_SOURCE_LAST_FAILURE_TIMES:
+ final long failureTime = proto.readLong(
+ SyncStatusProto.StatusInfo.PER_SOURCE_LAST_FAILURE_TIMES);
+ if (failureTimesCount == status.perSourceLastFailureTimes.length) {
+ Slog.w(TAG, "Attempted to read more per source last failure times "
+ + "than expected; data might be corrupted.");
+ break;
+ }
+ status.perSourceLastFailureTimes[failureTimesCount] = failureTime;
+ failureTimesCount++;
+ break;
+ case ProtoInputStream.NO_MORE_FIELDS:
+ status.populateLastEventsInformation(lastEventInformation);
+ return status;
+ }
+ }
+ }
+
+ private Pair<Long, String> parseLastEventInfoLocked(ProtoInputStream proto) throws IOException {
+ long time = 0;
+ String message = null;
+ while (true) {
+ switch (proto.nextField()) {
+ case (int) SyncStatusProto.StatusInfo.LastEventInfo.LAST_EVENT_TIME:
+ time = proto.readLong(SyncStatusProto.StatusInfo.LastEventInfo.LAST_EVENT_TIME);
+ break;
+ case (int) SyncStatusProto.StatusInfo.LastEventInfo.LAST_EVENT:
+ message = proto.readString(SyncStatusProto.StatusInfo.LastEventInfo.LAST_EVENT);
+ break;
+ case ProtoInputStream.NO_MORE_FIELDS:
+ return message == null ? null : new Pair<>(time, message);
+ }
+ }
+ }
+
+ private void readSyncStatusStatsLocked(ProtoInputStream proto, SyncStatusInfo.Stats stats)
+ throws IOException {
+ while (true) {
+ switch (proto.nextField()) {
+ case (int) SyncStatusProto.StatusInfo.Stats.TOTAL_ELAPSED_TIME:
+ stats.totalElapsedTime = proto.readLong(
+ SyncStatusProto.StatusInfo.Stats.TOTAL_ELAPSED_TIME);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_SYNCS:
+ stats.numSyncs = proto.readInt(SyncStatusProto.StatusInfo.Stats.NUM_SYNCS);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_FAILURES:
+ stats.numFailures = proto.readInt(
+ SyncStatusProto.StatusInfo.Stats.NUM_FAILURES);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_CANCELS:
+ stats.numCancels = proto.readInt(SyncStatusProto.StatusInfo.Stats.NUM_CANCELS);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_OTHER:
+ stats.numSourceOther = proto.readInt(
+ SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_OTHER);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_LOCAL:
+ stats.numSourceLocal = proto.readInt(
+ SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_LOCAL);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_POLL:
+ stats.numSourcePoll = proto.readInt(
+ SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_POLL);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_USER:
+ stats.numSourceUser = proto.readInt(
+ SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_USER);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_PERIODIC:
+ stats.numSourcePeriodic = proto.readInt(
+ SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_PERIODIC);
+ break;
+ case (int) SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_FEED:
+ stats.numSourceFeed = proto.readInt(
+ SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_FEED);
+ break;
+ case ProtoInputStream.NO_MORE_FIELDS:
+ return;
+ }
+ }
+ }
+
/**
* Write all sync status to the sync status file.
*/
- private void writeStatusLocked() {
+ @VisibleForTesting
+ void writeStatusLocked() {
if (Log.isLoggable(TAG_FILE, Log.VERBOSE)) {
Slog.v(TAG_FILE, "Writing new " + mStatusFile.getBaseFile());
}
@@ -2070,26 +2315,87 @@
FileOutputStream fos = null;
try {
fos = mStatusFile.startWrite();
- Parcel out = Parcel.obtain();
- final int N = mSyncStatus.size();
- for (int i=0; i<N; i++) {
- SyncStatusInfo status = mSyncStatus.valueAt(i);
- out.writeInt(STATUS_FILE_ITEM);
- status.writeToParcel(out, 0);
- }
- out.writeInt(STATUS_FILE_END);
- fos.write(out.marshall());
- out.recycle();
-
+ writeStatusInfoLocked(fos);
mStatusFile.finishWrite(fos);
- } catch (java.io.IOException e1) {
- Slog.w(TAG, "Error writing status", e1);
- if (fos != null) {
- mStatusFile.failWrite(fos);
- }
+ fos = null;
+ } catch (IOException | IllegalArgumentException e) {
+ Slog.e(TAG, "Unable to write sync status to proto.", e);
+ } finally {
+ // when fos is null (successful write), this is a no-op.
+ mStatusFile.failWrite(fos);
}
}
+ private void writeStatusInfoLocked(OutputStream out) {
+ final ProtoOutputStream proto = new ProtoOutputStream(out);
+ final int size = mSyncStatus.size();
+ for (int i = 0; i < size; i++) {
+ final SyncStatusInfo info = mSyncStatus.valueAt(i);
+ final long token = proto.start(SyncStatusProto.STATUS);
+ // authority id should be written first to take advantage of the fast path in read
+ proto.write(SyncStatusProto.StatusInfo.AUTHORITY_ID, info.authorityId);
+ proto.write(SyncStatusProto.StatusInfo.LAST_SUCCESS_TIME, info.lastSuccessTime);
+ proto.write(SyncStatusProto.StatusInfo.LAST_SUCCESS_SOURCE, info.lastSuccessSource);
+ proto.write(SyncStatusProto.StatusInfo.LAST_FAILURE_TIME, info.lastFailureTime);
+ proto.write(SyncStatusProto.StatusInfo.LAST_FAILURE_SOURCE, info.lastFailureSource);
+ proto.write(SyncStatusProto.StatusInfo.LAST_FAILURE_MESSAGE, info.lastFailureMesg);
+ proto.write(SyncStatusProto.StatusInfo.INITIAL_FAILURE_TIME, info.initialFailureTime);
+ proto.write(SyncStatusProto.StatusInfo.PENDING, info.pending);
+ proto.write(SyncStatusProto.StatusInfo.INITIALIZE, info.initialize);
+ final int periodicSyncTimesSize = info.getPeriodicSyncTimesSize();
+ for (int j = 0; j < periodicSyncTimesSize; j++) {
+ proto.write(SyncStatusProto.StatusInfo.PERIODIC_SYNC_TIMES,
+ info.getPeriodicSyncTime(j));
+ }
+ final int lastEventsSize = info.getEventCount();
+ for (int j = 0; j < lastEventsSize; j++) {
+ final long eventToken = proto.start(SyncStatusProto.StatusInfo.LAST_EVENT_INFO);
+ proto.write(SyncStatusProto.StatusInfo.LastEventInfo.LAST_EVENT_TIME,
+ info.getEventTime(j));
+ proto.write(SyncStatusProto.StatusInfo.LastEventInfo.LAST_EVENT, info.getEvent(j));
+ proto.end(eventToken);
+ }
+ proto.write(SyncStatusProto.StatusInfo.LAST_TODAY_RESET_TIME, info.lastTodayResetTime);
+
+ final long totalStatsToken = proto.start(SyncStatusProto.StatusInfo.TOTAL_STATS);
+ writeStatusStatsLocked(proto, info.totalStats);
+ proto.end(totalStatsToken);
+ final long todayStatsToken = proto.start(SyncStatusProto.StatusInfo.TODAY_STATS);
+ writeStatusStatsLocked(proto, info.todayStats);
+ proto.end(todayStatsToken);
+ final long yesterdayStatsToken = proto.start(
+ SyncStatusProto.StatusInfo.YESTERDAY_STATS);
+ writeStatusStatsLocked(proto, info.yesterdayStats);
+ proto.end(yesterdayStatsToken);
+
+ final int lastSuccessTimesSize = info.perSourceLastSuccessTimes.length;
+ for (int j = 0; j < lastSuccessTimesSize; j++) {
+ proto.write(SyncStatusProto.StatusInfo.PER_SOURCE_LAST_SUCCESS_TIMES,
+ info.perSourceLastSuccessTimes[j]);
+ }
+ final int lastFailureTimesSize = info.perSourceLastFailureTimes.length;
+ for (int j = 0; j < lastFailureTimesSize; j++) {
+ proto.write(SyncStatusProto.StatusInfo.PER_SOURCE_LAST_FAILURE_TIMES,
+ info.perSourceLastFailureTimes[j]);
+ }
+ proto.end(token);
+ }
+ proto.flush();
+ }
+
+ private void writeStatusStatsLocked(ProtoOutputStream proto, SyncStatusInfo.Stats stats) {
+ proto.write(SyncStatusProto.StatusInfo.Stats.TOTAL_ELAPSED_TIME, stats.totalElapsedTime);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_SYNCS, stats.numSyncs);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_FAILURES, stats.numFailures);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_CANCELS, stats.numCancels);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_OTHER, stats.numSourceOther);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_LOCAL, stats.numSourceLocal);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_POLL, stats.numSourcePoll);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_USER, stats.numSourceUser);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_PERIODIC, stats.numSourcePeriodic);
+ proto.write(SyncStatusProto.StatusInfo.Stats.NUM_SOURCE_FEED, stats.numSourceFeed);
+ }
+
private void requestSync(AuthorityInfo authorityInfo, int reason, Bundle extras,
@SyncExemption int syncExemptionFlag, int callingUid, int callingPid) {
if (android.os.Process.myUid() == android.os.Process.SYSTEM_UID
@@ -2126,20 +2432,17 @@
public static final int STATISTICS_FILE_ITEM_OLD = 100;
public static final int STATISTICS_FILE_ITEM = 101;
- /**
- * Read all sync statistics back in to the initial engine state.
- */
- private void readStatisticsLocked() {
+ private void readStatsParcelLocked(File parcel) {
try {
- byte[] data = mStatisticsFile.readFully();
+ final AtomicFile parcelFile = new AtomicFile(parcel);
+ byte[] data = parcelFile.readFully();
Parcel in = Parcel.obtain();
in.unmarshall(data, 0, data.length);
in.setDataPosition(0);
int token;
int index = 0;
while ((token=in.readInt()) != STATISTICS_FILE_END) {
- if (token == STATISTICS_FILE_ITEM
- || token == STATISTICS_FILE_ITEM_OLD) {
+ if (token == STATISTICS_FILE_ITEM || token == STATISTICS_FILE_ITEM_OLD) {
int day = in.readInt();
if (token == STATISTICS_FILE_ITEM_OLD) {
day = day - 2009 + 14245; // Magic!
@@ -2159,15 +2462,110 @@
break;
}
}
- } catch (java.io.IOException e) {
+ } catch (IOException e) {
Slog.i(TAG, "No initial statistics");
}
}
+ private void upgradeStatisticsIfNeededLocked() {
+ final File parcelStats = new File(mSyncDir, LEGACY_STATISTICS_FILE_NAME);
+ if (parcelStats.exists() && !mStatisticsFile.exists()) {
+ readStatsParcelLocked(parcelStats);
+ writeStatisticsLocked();
+ }
+
+ // if upgrade to proto was successful, delete parcel file
+ if (DELETE_LEGACY_PARCEL_FILES && mStatisticsFile.exists()) {
+ parcelStats.delete();
+ }
+ }
+
+ /**
+ * Read all sync statistics back in to the initial engine state.
+ */
+ private void readStatisticsLocked() {
+ upgradeStatisticsIfNeededLocked();
+
+ if (!mStatisticsFile.exists()) {
+ return;
+ }
+ try {
+ try (FileInputStream in = mStatisticsFile.openRead()) {
+ readDayStatsLocked(in);
+ }
+ } catch (IOException e) {
+ Slog.e(TAG, "Unable to read day stats file.", e);
+ }
+ }
+
+ private void readDayStatsLocked(InputStream in) throws IOException {
+ final ProtoInputStream proto = new ProtoInputStream(in);
+ int statsCount = 0;
+ while (true) {
+ switch (proto.nextField()) {
+ case (int) SyncStatisticsProto.STATS:
+ final long token = proto.start(SyncStatisticsProto.STATS);
+ final DayStats stats = readIndividualDayStatsLocked(proto);
+ proto.end(token);
+ mDayStats[statsCount] = stats;
+ statsCount++;
+ if (statsCount == mDayStats.length) {
+ return;
+ }
+ break;
+ case ProtoInputStream.NO_MORE_FIELDS:
+ return;
+ }
+ }
+ }
+
+ private DayStats readIndividualDayStatsLocked(ProtoInputStream proto) throws IOException {
+ DayStats stats;
+ if (proto.nextField(SyncStatisticsProto.DayStats.DAY)) {
+ // fast-path; this should work for most cases since the day is written first
+ stats = new DayStats(proto.readInt(SyncStatisticsProto.DayStats.DAY));
+ } else {
+ // placeholder to read other data; assume the default day as 0
+ stats = new DayStats(0);
+ }
+
+ while (true) {
+ switch (proto.nextField()) {
+ case (int) SyncStatisticsProto.DayStats.DAY:
+ // fast-path failed for some reason, rebuild stats from placeholder object
+ Slog.w(TAG, "Failed to read the day via fast-path; some data "
+ + "might not have been read.");
+ final DayStats temp = new DayStats(
+ proto.readInt(SyncStatisticsProto.DayStats.DAY));
+ temp.successCount = stats.successCount;
+ temp.successTime = stats.successTime;
+ temp.failureCount = stats.failureCount;
+ temp.failureTime = stats.failureTime;
+ stats = temp;
+ break;
+ case (int) SyncStatisticsProto.DayStats.SUCCESS_COUNT:
+ stats.successCount = proto.readInt(SyncStatisticsProto.DayStats.SUCCESS_COUNT);
+ break;
+ case (int) SyncStatisticsProto.DayStats.SUCCESS_TIME:
+ stats.successTime = proto.readLong(SyncStatisticsProto.DayStats.SUCCESS_TIME);
+ break;
+ case (int) SyncStatisticsProto.DayStats.FAILURE_COUNT:
+ stats.failureCount = proto.readInt(SyncStatisticsProto.DayStats.FAILURE_COUNT);
+ break;
+ case (int) SyncStatisticsProto.DayStats.FAILURE_TIME:
+ stats.failureTime = proto.readLong(SyncStatisticsProto.DayStats.FAILURE_TIME);
+ break;
+ case ProtoInputStream.NO_MORE_FIELDS:
+ return stats;
+ }
+ }
+ }
+
/**
* Write all sync statistics to the sync status file.
*/
- private void writeStatisticsLocked() {
+ @VisibleForTesting
+ void writeStatisticsLocked() {
if (Log.isLoggable(TAG_FILE, Log.VERBOSE)) {
Slog.v(TAG, "Writing new " + mStatisticsFile.getBaseFile());
}
@@ -2179,33 +2577,38 @@
FileOutputStream fos = null;
try {
fos = mStatisticsFile.startWrite();
- Parcel out = Parcel.obtain();
- final int N = mDayStats.length;
- for (int i=0; i<N; i++) {
- DayStats ds = mDayStats[i];
- if (ds == null) {
- break;
- }
- out.writeInt(STATISTICS_FILE_ITEM);
- out.writeInt(ds.day);
- out.writeInt(ds.successCount);
- out.writeLong(ds.successTime);
- out.writeInt(ds.failureCount);
- out.writeLong(ds.failureTime);
- }
- out.writeInt(STATISTICS_FILE_END);
- fos.write(out.marshall());
- out.recycle();
-
+ writeDayStatsLocked(fos);
mStatisticsFile.finishWrite(fos);
- } catch (java.io.IOException e1) {
- Slog.w(TAG, "Error writing stats", e1);
- if (fos != null) {
- mStatisticsFile.failWrite(fos);
- }
+ fos = null;
+ } catch (IOException | IllegalArgumentException e) {
+ Slog.e(TAG, "Unable to write day stats to proto.", e);
+ } finally {
+ // when fos is null (successful write), this is a no-op.
+ mStatisticsFile.failWrite(fos);
}
}
+ private void writeDayStatsLocked(OutputStream out)
+ throws IOException, IllegalArgumentException {
+ final ProtoOutputStream proto = new ProtoOutputStream(out);
+ final int size = mDayStats.length;
+ for (int i = 0; i < size; i++) {
+ final DayStats stats = mDayStats[i];
+ if (stats == null) {
+ break;
+ }
+ final long token = proto.start(SyncStatisticsProto.STATS);
+ // day should be written first to take advantage of the fast path in read
+ proto.write(SyncStatisticsProto.DayStats.DAY, stats.day);
+ proto.write(SyncStatisticsProto.DayStats.SUCCESS_COUNT, stats.successCount);
+ proto.write(SyncStatisticsProto.DayStats.SUCCESS_TIME, stats.successTime);
+ proto.write(SyncStatisticsProto.DayStats.FAILURE_COUNT, stats.failureCount);
+ proto.write(SyncStatisticsProto.DayStats.FAILURE_TIME, stats.failureTime);
+ proto.end(token);
+ }
+ proto.flush();
+ }
+
/**
* Let the BackupManager know that account sync settings have changed. This will trigger
* {@link com.android.server.backup.SystemBackupAgent} to run.
diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java
index a7b9051..dcef998 100644
--- a/services/core/java/com/android/server/display/LogicalDisplay.java
+++ b/services/core/java/com/android/server/display/LogicalDisplay.java
@@ -150,10 +150,6 @@
mInfo.largestNominalAppHeight = mOverrideDisplayInfo.largestNominalAppHeight;
mInfo.logicalWidth = mOverrideDisplayInfo.logicalWidth;
mInfo.logicalHeight = mOverrideDisplayInfo.logicalHeight;
- mInfo.overscanLeft = mOverrideDisplayInfo.overscanLeft;
- mInfo.overscanTop = mOverrideDisplayInfo.overscanTop;
- mInfo.overscanRight = mOverrideDisplayInfo.overscanRight;
- mInfo.overscanBottom = mOverrideDisplayInfo.overscanBottom;
mInfo.rotation = mOverrideDisplayInfo.rotation;
mInfo.displayCutout = mOverrideDisplayInfo.displayCutout;
mInfo.logicalDensityDpi = mOverrideDisplayInfo.logicalDensityDpi;
diff --git a/services/core/java/com/android/server/integrity/model/AtomicFormula.java b/services/core/java/com/android/server/integrity/model/AtomicFormula.java
index a757528..70ab98c 100644
--- a/services/core/java/com/android/server/integrity/model/AtomicFormula.java
+++ b/services/core/java/com/android/server/integrity/model/AtomicFormula.java
@@ -177,6 +177,14 @@
dest.writeInt(mOperator);
}
+ public int getValue() {
+ return mValue;
+ }
+
+ public int getOperator() {
+ return mOperator;
+ }
+
private int getMetadataValueByKey(AppInstallMetadata appInstallMetadata) {
switch (getKey()) {
case VERSION_CODE:
@@ -271,6 +279,10 @@
dest.writeStringNoHelper(mValue);
}
+ public String getValue() {
+ return mValue;
+ }
+
private String getMetadataValueByKey(AppInstallMetadata appInstallMetadata) {
switch (getKey()) {
case PACKAGE_NAME:
@@ -367,6 +379,10 @@
dest.writeByte((byte) (mValue ? 1 : 0));
}
+ public boolean getValue() {
+ return mValue;
+ }
+
private boolean getMetadataValueByKey(AppInstallMetadata appInstallMetadata) {
switch (getKey()) {
case PRE_INSTALLED:
diff --git a/services/core/java/com/android/server/integrity/parser/RuleParseException.java b/services/core/java/com/android/server/integrity/parser/RuleParseException.java
new file mode 100644
index 0000000..c0f36a6
--- /dev/null
+++ b/services/core/java/com/android/server/integrity/parser/RuleParseException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 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.integrity.parser;
+
+import android.annotation.NonNull;
+
+/**
+ * Thrown when rule parsing fails.
+ */
+public class RuleParseException extends Exception {
+ public RuleParseException(@NonNull String message) {
+ super(message);
+ }
+
+ public RuleParseException(@NonNull String message, @NonNull Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/services/core/java/com/android/server/integrity/parser/RuleParser.java b/services/core/java/com/android/server/integrity/parser/RuleParser.java
index bfffc70..08e0a5d 100644
--- a/services/core/java/com/android/server/integrity/parser/RuleParser.java
+++ b/services/core/java/com/android/server/integrity/parser/RuleParser.java
@@ -25,8 +25,8 @@
public interface RuleParser {
/** Parse rules from a string. */
- List<Rule> parse(String ruleText);
+ List<Rule> parse(String ruleText) throws RuleParseException;
/** Parse rules from an input stream. */
- List<Rule> parse(InputStream inputStream);
+ List<Rule> parse(InputStream inputStream) throws RuleParseException;
}
diff --git a/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java b/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java
index bf31bb2..23d0b40 100644
--- a/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java
+++ b/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java
@@ -16,9 +16,11 @@
package com.android.server.integrity.parser;
-import android.util.Slog;
import android.util.Xml;
+import com.android.server.integrity.model.AtomicFormula;
+import com.android.server.integrity.model.Formula;
+import com.android.server.integrity.model.OpenFormula;
import com.android.server.integrity.model.Rule;
import org.xmlpull.v1.XmlPullParser;
@@ -38,49 +40,56 @@
public static final String TAG = "RuleXmlParser";
- private static final String RULE_LIST_TAG = "RuleList";
- private static final String RULE_TAG = "Rule";
+ // TODO: Use XML attributes
+ private static final String RULE_LIST_TAG = "RL";
+ private static final String RULE_TAG = "R";
+ private static final String OPEN_FORMULA_TAG = "OF";
+ private static final String ATOMIC_FORMULA_TAG = "AF";
+ private static final String EFFECT_TAG = "E";
+ private static final String KEY_TAG = "K";
+ private static final String OPERATOR_TAG = "O";
+ private static final String VALUE_TAG = "V";
+ private static final String CONNECTOR_TAG = "C";
@Override
- public List<Rule> parse(String ruleText) {
+ public List<Rule> parse(String ruleText) throws RuleParseException {
try {
XmlPullParser xmlPullParser = Xml.newPullParser();
xmlPullParser.setInput(new StringReader(ruleText));
return parseRules(xmlPullParser);
- } catch (XmlPullParserException | IOException e) {
- Slog.e(TAG, String.format("Unable to read rules from string: %s", ruleText), e);
+ } catch (Exception e) {
+ throw new RuleParseException(e.getMessage(), e);
}
- return null;
}
@Override
- public List<Rule> parse(InputStream inputStream) {
+ public List<Rule> parse(InputStream inputStream) throws RuleParseException {
try {
XmlPullParser xmlPullParser = Xml.newPullParser();
xmlPullParser.setInput(inputStream, StandardCharsets.UTF_8.name());
return parseRules(xmlPullParser);
- } catch (XmlPullParserException | IOException e) {
- Slog.e(TAG, "Unable to read rules from stream", e);
+ } catch (Exception e) {
+ throw new RuleParseException(e.getMessage(), e);
}
- return null;
}
- private List<Rule> parseRules(XmlPullParser parser) throws IOException, XmlPullParserException {
+ private static List<Rule> parseRules(XmlPullParser parser)
+ throws IOException, XmlPullParserException {
List<Rule> rules = new ArrayList<>();
// Skipping the first event type, which is always {@link XmlPullParser.START_DOCUMENT}
parser.next();
- // Processing the first tag; which should always be a <RuleList> tag.
+ // Processing the first tag; which should always be a RuleList <RL> tag.
String nodeName = parser.getName();
- // Validating that the XML is starting with a <RuleList> tag.
+ // Validating that the XML is starting with a RuleList <RL> tag.
// Note: This is the only breaking validation to run against XML files in the platform.
// All rules inside are assumed to be validated at the server. If a rule is found to be
// corrupt in the XML, it will be skipped to the next rule.
if (!nodeName.equals(RULE_LIST_TAG)) {
throw new RuntimeException(
- String.format("Rules must start with <RuleList> tag. Found: %s at %s", nodeName,
- parser.getPositionDescription()));
+ String.format("Rules must start with RuleList <RL> tag. Found: %s at %s",
+ nodeName, parser.getPositionDescription()));
}
int eventType;
@@ -89,17 +98,150 @@
if (eventType != XmlPullParser.START_TAG || !nodeName.equals(RULE_TAG)) {
continue;
}
- Rule parsedRule = parseRule(parser);
- if (parsedRule != null) {
- rules.add(parsedRule);
- }
+ rules.add(parseRule(parser));
}
return rules;
}
- private Rule parseRule(XmlPullParser parser) {
- // TODO: Implement rule parser.
- return null;
+ private static Rule parseRule(XmlPullParser parser) throws IOException, XmlPullParserException {
+ Formula formula = null;
+ @Rule.Effect int effect = 0;
+
+ int eventType;
+ while ((eventType = parser.next()) != XmlPullParser.END_DOCUMENT) {
+ String nodeName = parser.getName();
+
+ if (eventType == XmlPullParser.END_TAG && parser.getName().equals(RULE_TAG)) {
+ break;
+ }
+
+ if (eventType == XmlPullParser.START_TAG) {
+ switch (nodeName) {
+ case OPEN_FORMULA_TAG:
+ formula = parseOpenFormula(parser);
+ break;
+ case ATOMIC_FORMULA_TAG:
+ formula = parseAtomicFormula(parser);
+ break;
+ case EFFECT_TAG:
+ effect = Integer.parseInt(extractValue(parser));
+ break;
+ default:
+ throw new RuntimeException(
+ String.format("Found unexpected tag: %s", nodeName));
+ }
+ } else {
+ throw new RuntimeException(
+ String.format("Found unexpected event type: %d", eventType));
+ }
+ }
+
+ return new Rule(formula, effect);
+ }
+
+ private static Formula parseOpenFormula(XmlPullParser parser)
+ throws IOException, XmlPullParserException {
+ @OpenFormula.Connector int connector = 0;
+ List<Formula> formulas = new ArrayList<>();
+
+ int eventType;
+ while ((eventType = parser.next()) != XmlPullParser.END_DOCUMENT) {
+ String nodeName = parser.getName();
+
+ if (eventType == XmlPullParser.END_TAG && parser.getName().equals(OPEN_FORMULA_TAG)) {
+ break;
+ }
+
+ if (eventType == XmlPullParser.START_TAG) {
+ switch (nodeName) {
+ case CONNECTOR_TAG:
+ connector = Integer.parseInt(extractValue(parser));
+ break;
+ case ATOMIC_FORMULA_TAG:
+ formulas.add(parseAtomicFormula(parser));
+ break;
+ case OPEN_FORMULA_TAG:
+ formulas.add(parseOpenFormula(parser));
+ break;
+ default:
+ throw new RuntimeException(
+ String.format("Found unexpected tag: %s", nodeName));
+ }
+ } else {
+ throw new RuntimeException(
+ String.format("Found unexpected event type: %d", eventType));
+ }
+ }
+
+ return new OpenFormula(connector, formulas);
+ }
+
+ private static Formula parseAtomicFormula(XmlPullParser parser)
+ throws IOException, XmlPullParserException {
+ @AtomicFormula.Key int key = 0;
+ @AtomicFormula.Operator int operator = 0;
+ String value = null;
+
+ int eventType;
+ while ((eventType = parser.next()) != XmlPullParser.END_DOCUMENT) {
+ String nodeName = parser.getName();
+
+ if (eventType == XmlPullParser.END_TAG && parser.getName().equals(ATOMIC_FORMULA_TAG)) {
+ break;
+ }
+
+ if (eventType == XmlPullParser.START_TAG) {
+ switch (nodeName) {
+ case KEY_TAG:
+ key = Integer.parseInt(extractValue(parser));
+ break;
+ case OPERATOR_TAG:
+ operator = Integer.parseInt(extractValue(parser));
+ break;
+ case VALUE_TAG:
+ value = extractValue(parser);
+ break;
+ default:
+ throw new RuntimeException(
+ String.format("Found unexpected tag: %s", nodeName));
+ }
+ } else {
+ throw new RuntimeException(
+ String.format("Found unexpected event type: %d", eventType));
+ }
+ }
+ return constructAtomicFormulaBasedOnKey(key, operator, value);
+ }
+
+ private static Formula constructAtomicFormulaBasedOnKey(@AtomicFormula.Key int key,
+ @AtomicFormula.Operator int operator, String value) {
+ switch (key) {
+ case AtomicFormula.PACKAGE_NAME:
+ case AtomicFormula.INSTALLER_NAME:
+ case AtomicFormula.APP_CERTIFICATE:
+ case AtomicFormula.INSTALLER_CERTIFICATE:
+ return new AtomicFormula.StringAtomicFormula(key, value);
+ case AtomicFormula.PRE_INSTALLED:
+ return new AtomicFormula.BooleanAtomicFormula(key, Boolean.parseBoolean(value));
+ case AtomicFormula.VERSION_CODE:
+ return new AtomicFormula.IntAtomicFormula(key, operator, Integer.parseInt(value));
+ default:
+ throw new RuntimeException(String.format("Found unexpected key: %d", key));
+ }
+ }
+
+ private static String extractValue(XmlPullParser parser)
+ throws IOException, XmlPullParserException {
+ String value;
+ int eventType = parser.next();
+ if (eventType == XmlPullParser.TEXT) {
+ value = parser.getText();
+ eventType = parser.next();
+ if (eventType == XmlPullParser.END_TAG) {
+ return value;
+ }
+ }
+ throw new RuntimeException(String.format("Found unexpected event type: %d", eventType));
}
}
diff --git a/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java b/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java
index ecb00a4..ee95d2b 100644
--- a/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java
+++ b/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java
@@ -19,17 +19,18 @@
import com.android.server.integrity.model.Rule;
import java.io.OutputStream;
+import java.util.List;
/** A helper class to serialize rules from the {@link Rule} model to Xml representation. */
public class RuleBinarySerializer implements RuleSerializer {
@Override
- public void serialize(Rule rule, OutputStream outputStream) {
+ public void serialize(List<Rule> rules, OutputStream outputStream) {
// TODO: Implement stream serializer.
}
@Override
- public String serialize(Rule rule) {
+ public String serialize(List<Rule> rules) {
// TODO: Implement text serializer.
return null;
}
diff --git a/services/core/java/com/android/server/integrity/serializer/RuleSerializeException.java b/services/core/java/com/android/server/integrity/serializer/RuleSerializeException.java
new file mode 100644
index 0000000..60cfc48
--- /dev/null
+++ b/services/core/java/com/android/server/integrity/serializer/RuleSerializeException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 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.integrity.serializer;
+
+import android.annotation.NonNull;
+
+/**
+ * Thrown when rule serialization fails.
+ */
+public class RuleSerializeException extends Exception {
+ public RuleSerializeException(@NonNull String message) {
+ super(message);
+ }
+
+ public RuleSerializeException(@NonNull String message, @NonNull Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java b/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java
index 07a912f..5c99c5a 100644
--- a/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java
+++ b/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java
@@ -19,13 +19,14 @@
import com.android.server.integrity.model.Rule;
import java.io.OutputStream;
+import java.util.List;
/** A helper class to serialize rules from the {@link Rule} model. */
public interface RuleSerializer {
- /** Serialize a rule to an output stream */
- void serialize(Rule rule, OutputStream outputStream);
+ /** Serialize rules to an output stream */
+ void serialize(List<Rule> rules, OutputStream outputStream) throws RuleSerializeException;
- /** Serialize a rule to a string. */
- String serialize(Rule rule);
+ /** Serialize rules to a string. */
+ String serialize(List<Rule> rule) throws RuleSerializeException;
}
diff --git a/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java b/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java
index 62973e2..b0805fc 100644
--- a/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java
+++ b/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java
@@ -16,21 +16,142 @@
package com.android.server.integrity.serializer;
+import android.util.Xml;
+
+import com.android.server.integrity.model.AtomicFormula;
+import com.android.server.integrity.model.Formula;
+import com.android.server.integrity.model.OpenFormula;
import com.android.server.integrity.model.Rule;
-import java.io.OutputStream;
+import org.xmlpull.v1.XmlSerializer;
-/** A helper class to serialize rules from the {@link Rule} model to Xml representation. */
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+/**
+ * A helper class to serialize rules from the {@link Rule} model to Xml representation.
+ */
public class RuleXmlSerializer implements RuleSerializer {
+ public static final String TAG = "RuleXmlSerializer";
+ private static final String NAMESPACE = "";
+
+ private static final String RULE_LIST_TAG = "RL";
+ private static final String RULE_TAG = "R";
+ private static final String OPEN_FORMULA_TAG = "OF";
+ private static final String ATOMIC_FORMULA_TAG = "AF";
+ private static final String EFFECT_TAG = "E";
+ private static final String KEY_TAG = "K";
+ private static final String OPERATOR_TAG = "O";
+ private static final String VALUE_TAG = "V";
+ private static final String CONNECTOR_TAG = "C";
+
@Override
- public void serialize(Rule rule, OutputStream outputStream) {
- // TODO: Implement stream serializer.
+ public void serialize(List<Rule> rules, OutputStream outputStream)
+ throws RuleSerializeException {
+ try {
+ XmlSerializer xmlSerializer = Xml.newSerializer();
+ xmlSerializer.setOutput(outputStream, StandardCharsets.UTF_8.name());
+ serializeRules(rules, xmlSerializer);
+ } catch (Exception e) {
+ throw new RuleSerializeException(e.getMessage(), e);
+ }
}
@Override
- public String serialize(Rule rule) {
- // TODO: Implement text serializer.
- return null;
+ public String serialize(List<Rule> rules) throws RuleSerializeException {
+ try {
+ XmlSerializer xmlSerializer = Xml.newSerializer();
+ StringWriter writer = new StringWriter();
+ xmlSerializer.setOutput(writer);
+ serializeRules(rules, xmlSerializer);
+ return writer.toString();
+ } catch (Exception e) {
+ throw new RuleSerializeException(e.getMessage(), e);
+ }
+ }
+
+ private void serializeRules(List<Rule> rules, XmlSerializer xmlSerializer) throws IOException {
+ xmlSerializer.startTag(NAMESPACE, RULE_LIST_TAG);
+ for (Rule rule : rules) {
+ serialize(rule, xmlSerializer);
+ }
+ xmlSerializer.endTag(NAMESPACE, RULE_LIST_TAG);
+ xmlSerializer.endDocument();
+ }
+
+ private void serialize(Rule rule, XmlSerializer xmlSerializer) throws IOException {
+ if (rule == null) {
+ return;
+ }
+ xmlSerializer.startTag(NAMESPACE, RULE_TAG);
+ serializeFormula(rule.getFormula(), xmlSerializer);
+ serializeValue(EFFECT_TAG, String.valueOf(rule.getEffect()), xmlSerializer);
+ xmlSerializer.endTag(NAMESPACE, RULE_TAG);
+ }
+
+ private void serializeFormula(Formula formula, XmlSerializer xmlSerializer) throws IOException {
+ if (formula instanceof AtomicFormula) {
+ serializeAtomicFormula((AtomicFormula) formula, xmlSerializer);
+ } else if (formula instanceof OpenFormula) {
+ serializeOpenFormula((OpenFormula) formula, xmlSerializer);
+ } else {
+ throw new IllegalArgumentException(
+ String.format("Invalid formula type: %s", formula.getClass()));
+ }
+ }
+
+ private void serializeOpenFormula(OpenFormula openFormula, XmlSerializer xmlSerializer)
+ throws IOException {
+ if (openFormula == null) {
+ return;
+ }
+ xmlSerializer.startTag(NAMESPACE, OPEN_FORMULA_TAG);
+ serializeValue(CONNECTOR_TAG, String.valueOf(openFormula.getConnector()), xmlSerializer);
+ for (Formula formula : openFormula.getFormulas()) {
+ serializeFormula(formula, xmlSerializer);
+ }
+ xmlSerializer.endTag(NAMESPACE, OPEN_FORMULA_TAG);
+ }
+
+ private void serializeAtomicFormula(AtomicFormula atomicFormula, XmlSerializer xmlSerializer)
+ throws IOException {
+ if (atomicFormula == null) {
+ return;
+ }
+ xmlSerializer.startTag(NAMESPACE, ATOMIC_FORMULA_TAG);
+ serializeValue(KEY_TAG, String.valueOf(atomicFormula.getKey()), xmlSerializer);
+ if (atomicFormula instanceof AtomicFormula.StringAtomicFormula) {
+ serializeValue(VALUE_TAG,
+ ((AtomicFormula.StringAtomicFormula) atomicFormula).getValue(), xmlSerializer);
+ } else if (atomicFormula instanceof AtomicFormula.IntAtomicFormula) {
+ serializeValue(OPERATOR_TAG,
+ String.valueOf(((AtomicFormula.IntAtomicFormula) atomicFormula).getOperator()),
+ xmlSerializer);
+ serializeValue(VALUE_TAG,
+ String.valueOf(((AtomicFormula.IntAtomicFormula) atomicFormula).getValue()),
+ xmlSerializer);
+ } else if (atomicFormula instanceof AtomicFormula.BooleanAtomicFormula) {
+ serializeValue(VALUE_TAG,
+ String.valueOf(((AtomicFormula.BooleanAtomicFormula) atomicFormula).getValue()),
+ xmlSerializer);
+ } else {
+ throw new IllegalArgumentException(
+ String.format("Invalid atomic formula type: %s", atomicFormula.getClass()));
+ }
+ xmlSerializer.endTag(NAMESPACE, ATOMIC_FORMULA_TAG);
+ }
+
+ private void serializeValue(String tag, String value, XmlSerializer xmlSerializer)
+ throws IOException {
+ if (value == null) {
+ return;
+ }
+ xmlSerializer.startTag(NAMESPACE, tag);
+ xmlSerializer.text(value);
+ xmlSerializer.endTag(NAMESPACE, tag);
}
}
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index fb57d69..637bcae 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -301,6 +301,7 @@
// Timeout when holding wakelocks for downloading PSDS data.
private static final long DOWNLOAD_PSDS_DATA_TIMEOUT_MS = 60 * 1000;
+ private static final long WAKELOCK_TIMEOUT_MILLIS = 30 * 1000;
private final ExponentialBackOff mPsdsBackOff = new ExponentialBackOff(RETRY_INTERVAL,
MAX_RETRY_INTERVAL);
@@ -901,13 +902,8 @@
if (mDownloadPsdsWakeLock.isHeld()) {
// This wakelock may have time-out, if a timeout was specified.
// Catch (and ignore) any timeout exceptions.
- try {
- mDownloadPsdsWakeLock.release();
- if (DEBUG) Log.d(TAG, "WakeLock released by handleDownloadPsdsData()");
- } catch (Exception e) {
- Log.i(TAG, "Wakelock timeout & release race exception in "
- + "handleDownloadPsdsData()", e);
- }
+ mDownloadPsdsWakeLock.release();
+ if (DEBUG) Log.d(TAG, "WakeLock released by handleDownloadPsdsData()");
} else {
Log.e(TAG, "WakeLock expired before release in "
+ "handleDownloadPsdsData()");
@@ -1482,39 +1478,35 @@
Log.v(TAG, "SV count: " + info.mSvCount);
}
// Calculate number of satellites used in fix.
+ GnssStatus gnssStatus = GnssStatus.wrap(
+ info.mSvCount,
+ info.mSvidWithFlags,
+ info.mCn0s,
+ info.mSvElevations,
+ info.mSvAzimuths,
+ info.mSvCarrierFreqs);
int usedInFixCount = 0;
int maxCn0 = 0;
int meanCn0 = 0;
- for (int i = 0; i < info.mSvCount; i++) {
- if ((info.mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0) {
+ for (int i = 0; i < gnssStatus.getSatelliteCount(); i++) {
+ if (gnssStatus.usedInFix(i)) {
++usedInFixCount;
- if (info.mCn0s[i] > maxCn0) {
- maxCn0 = (int) info.mCn0s[i];
+ if (gnssStatus.getCn0DbHz(i) > maxCn0) {
+ maxCn0 = (int) gnssStatus.getCn0DbHz(i);
}
- meanCn0 += info.mCn0s[i];
+ meanCn0 += gnssStatus.getCn0DbHz(i);
+ mGnssMetrics.logConstellationType(gnssStatus.getConstellationType(i));
}
if (VERBOSE) {
- Log.v(TAG, "svid: " + (info.mSvidWithFlags[i] >> GnssStatus.SVID_SHIFT_WIDTH) +
- " cn0: " + info.mCn0s[i] +
- " elev: " + info.mSvElevations[i] +
- " azimuth: " + info.mSvAzimuths[i] +
- " carrier frequency: " + info.mSvCarrierFreqs[i] +
- ((info.mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA) == 0
- ? " " : " E") +
- ((info.mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_ALMANAC_DATA) == 0
- ? " " : " A") +
- ((info.mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) == 0
- ? "" : "U") +
- ((info.mSvidWithFlags[i] &
- GnssStatus.GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY) == 0
- ? "" : "F"));
- }
-
- if ((info.mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0) {
- int constellationType =
- (info.mSvidWithFlags[i] >> GnssStatus.CONSTELLATION_TYPE_SHIFT_WIDTH)
- & GnssStatus.CONSTELLATION_TYPE_MASK;
- mGnssMetrics.logConstellationType(constellationType);
+ Log.v(TAG, "svid: " + gnssStatus.getSvid(i)
+ + " cn0: " + gnssStatus.getCn0DbHz(i)
+ + " elev: " + gnssStatus.getElevationDegrees(i)
+ + " azimuth: " + gnssStatus.getAzimuthDegrees(i)
+ + " carrier frequency: " + gnssStatus.getCn0DbHz(i)
+ + (gnssStatus.hasEphemerisData(i) ? " E" : " ")
+ + (gnssStatus.hasAlmanacData(i) ? " A" : " ")
+ + (gnssStatus.usedInFix(i) ? "U" : "")
+ + (gnssStatus.hasCarrierFrequencyHz(i) ? "F" : ""));
}
}
if (usedInFixCount > 0) {
@@ -1523,7 +1515,7 @@
// return number of sats used in fix instead of total reported
mLocationExtras.set(usedInFixCount, meanCn0, maxCn0);
- mGnssMetrics.logSvStatus(info.mSvCount, info.mSvidWithFlags, info.mSvCarrierFreqs);
+ mGnssMetrics.logSvStatus(gnssStatus);
}
@NativeEntryPoint
@@ -2013,7 +2005,7 @@
// hold a wake lock until this message is delivered
// note that this assumes the message will not be removed from the queue before
// it is handled (otherwise the wake lock would be leaked).
- mWakeLock.acquire();
+ mWakeLock.acquire(WAKELOCK_TIMEOUT_MILLIS);
if (DEBUG) {
Log.d(TAG, "WakeLock acquired by sendMessage(" + messageIdAsString(message) + ", " + arg
+ ", " + obj + ")");
diff --git a/services/core/java/com/android/server/location/NtpTimeHelper.java b/services/core/java/com/android/server/location/NtpTimeHelper.java
index 296b500..67841ac 100644
--- a/services/core/java/com/android/server/location/NtpTimeHelper.java
+++ b/services/core/java/com/android/server/location/NtpTimeHelper.java
@@ -181,11 +181,7 @@
mHandler.postDelayed(this::retrieveAndInjectNtpTime, delay);
}
}
- try {
- // release wake lock held by task
- mWakeLock.release();
- } catch (Exception e) {
- // This happens when the WakeLock is already released.
- }
+ // release wake lock held by task
+ mWakeLock.release();
}
}
diff --git a/services/core/java/com/android/server/location/TEST_MAPPING b/services/core/java/com/android/server/location/TEST_MAPPING
deleted file mode 100644
index 2e21fa6..0000000
--- a/services/core/java/com/android/server/location/TEST_MAPPING
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "presubmit": [
- {
- "name": "CtsLocationCoarseTestCases"
- },
- {
- "name": "CtsLocationNoneTestCases"
- }
- ]
-}
\ No newline at end of file
diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
index 53d922b..f23ac34 100644
--- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
+++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
@@ -721,6 +721,10 @@
}
return VerifyCredentialResponse.fromGateKeeperResponse(response);
} else if (persistentData.type == PersistentData.TYPE_SP_WEAVER) {
+ if (!isWeaverAvailable()) {
+ Slog.e(TAG, "No weaver service to verify SP-based FRP credential");
+ return VerifyCredentialResponse.ERROR;
+ }
PasswordData pwd = PasswordData.fromBytes(persistentData.payload);
byte[] pwdToken = computePasswordToken(userCredential, pwd);
int weaverSlot = persistentData.userId;
diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java
index 626bf1c..51a0df3 100644
--- a/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java
+++ b/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java
@@ -84,9 +84,9 @@
mCallback = callback;
}
- public void selectRoute(String packageName, String routeId) {
+ public void requestSelectRoute(String packageName, String routeId, int seq) {
if (mConnectionReady) {
- mActiveConnection.selectRoute(packageName, routeId);
+ mActiveConnection.requestSelectRoute(packageName, routeId, seq);
updateBinding();
}
}
@@ -328,9 +328,9 @@
mClient.dispose();
}
- public void selectRoute(String packageName, String routeId) {
+ public void requestSelectRoute(String packageName, String routeId, int seq) {
try {
- mProvider.selectRoute(packageName, routeId);
+ mProvider.requestSelectRoute(packageName, routeId, seq);
} catch (RemoteException ex) {
Slog.e(TAG, "Failed to deliver request to set discovery mode.", ex);
}
diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index 2e97f6a..adfb9cb 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -29,10 +29,13 @@
import android.media.IMediaRouterClient;
import android.media.MediaRoute2Info;
import android.media.MediaRoute2ProviderInfo;
+import android.media.MediaRouter2;
import android.os.Binder;
+import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
+import android.os.Message;
import android.os.RemoteException;
import android.os.UserHandle;
import android.text.TextUtils;
@@ -60,6 +63,7 @@
class MediaRouter2ServiceImpl {
private static final String TAG = "MR2ServiceImpl";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+ private static final long ROUTE_SELECTION_REQUEST_TIMEOUT_MS = 5000L;
private final Context mContext;
private final Object mLock = new Object();
@@ -72,6 +76,8 @@
private final ArrayMap<IBinder, ManagerRecord> mAllManagerRecords = new ArrayMap<>();
@GuardedBy("mLock")
private int mCurrentUserId = -1;
+ @GuardedBy("mLock")
+ private int mSelectRouteRequestSequenceNumber = 0;
MediaRouter2ServiceImpl(Context context) {
mContext = context;
@@ -189,12 +195,12 @@
}
}
- public void selectRoute2(@NonNull IMediaRouter2Client client,
+ public void requestSelectRoute2(@NonNull IMediaRouter2Client client,
@Nullable MediaRoute2Info route) {
final long token = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
- selectRoute2Locked(mAllClientRecords.get(client.asBinder()), route);
+ requestSelectRoute2Locked(mAllClientRecords.get(client.asBinder()), route);
}
} finally {
Binder.restoreCallingIdentity(token);
@@ -375,24 +381,38 @@
}
}
- private void selectRoute2Locked(ClientRecord clientRecord, MediaRoute2Info route) {
+ private void requestSelectRoute2Locked(ClientRecord clientRecord, MediaRoute2Info route) {
if (clientRecord != null) {
MediaRoute2Info oldRoute = clientRecord.mSelectedRoute;
- clientRecord.mSelectedRoute = route;
+ clientRecord.mSelectingRoute = route;
UserHandler handler = clientRecord.mUserRecord.mHandler;
//TODO: Handle transfer instead of unselect and select
if (oldRoute != null) {
- handler.sendMessage(
- obtainMessage(UserHandler::unselectRoute, handler, clientRecord,
- oldRoute));
+ handler.sendMessage(obtainMessage(
+ UserHandler::unselectRoute, handler, clientRecord.mPackageName, oldRoute));
}
if (route != null) {
- handler.sendMessage(
- obtainMessage(UserHandler::selectRoute, handler, clientRecord, route));
+ final int seq = mSelectRouteRequestSequenceNumber;
+ mSelectRouteRequestSequenceNumber++;
+
+ handler.sendMessage(obtainMessage(
+ UserHandler::requestSelectRoute, handler, clientRecord.mPackageName,
+ route, seq));
+
+ // Remove all previous timeout messages
+ for (int previousSeq : clientRecord.mSelectRouteSequenceNumbers) {
+ clientRecord.mUserRecord.mHandler.removeMessages(previousSeq);
+ }
+ clientRecord.mSelectRouteSequenceNumbers.clear();
+
+ // When the request is not handled in timeout, set the client's route to default.
+ Message timeoutMsg = obtainMessage(UserHandler::handleRouteSelectionTimeout,
+ handler, clientRecord.mPackageName, route);
+ timeoutMsg.what = seq; // Make the message cancelable.
+ handler.sendMessageDelayed(timeoutMsg, ROUTE_SELECTION_REQUEST_TIMEOUT_MS);
+ clientRecord.mSelectRouteSequenceNumbers.add(seq);
}
- handler.sendMessage(
- obtainMessage(UserHandler::updateClientUsage, handler, clientRecord));
}
}
@@ -473,6 +493,11 @@
userRecord.mHandler, manager));
for (ClientRecord clientRecord : userRecord.mClientRecords) {
+ // TODO: Do not use updateClientUsage since it updates all managers.
+ // Instead, Notify only to the manager that is currently being registered.
+
+ // TODO: UserRecord <-> ClientRecord, why do they reference each other?
+ // How about removing mUserRecord from clientRecord?
clientRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::updateClientUsage,
clientRecord.mUserRecord.mHandler, clientRecord));
@@ -494,12 +519,13 @@
String packageName, MediaRoute2Info route) {
ManagerRecord managerRecord = mAllManagerRecords.get(manager.asBinder());
if (managerRecord != null) {
- ClientRecord clientRecord = managerRecord.mUserRecord.findClientRecord(packageName);
+ ClientRecord clientRecord =
+ managerRecord.mUserRecord.findClientRecordLocked(packageName);
if (clientRecord == null) {
Slog.w(TAG, "Ignoring route selection for unknown client.");
}
if (clientRecord != null && managerRecord.mTrusted) {
- selectRoute2Locked(clientRecord, route);
+ requestSelectRoute2Locked(clientRecord, route);
}
}
}
@@ -598,7 +624,7 @@
mHandler = new UserHandler(MediaRouter2ServiceImpl.this, this);
}
- ClientRecord findClientRecord(String packageName) {
+ ClientRecord findClientRecordLocked(String packageName) {
for (ClientRecord clientRecord : mClientRecords) {
if (TextUtils.equals(clientRecord.mPackageName, packageName)) {
return clientRecord;
@@ -611,12 +637,15 @@
class ClientRecord {
public final UserRecord mUserRecord;
public final String mPackageName;
+ public final List<Integer> mSelectRouteSequenceNumbers;
public List<String> mControlCategories;
+ public MediaRoute2Info mSelectingRoute;
public MediaRoute2Info mSelectedRoute;
ClientRecord(UserRecord userRecord, String packageName) {
mUserRecord = userRecord;
mPackageName = packageName;
+ mSelectRouteSequenceNumbers = new ArrayList<>();
mControlCategories = Collections.emptyList();
}
}
@@ -752,6 +781,15 @@
sendMessage(PooledLambda.obtainMessage(UserHandler::updateProvider, this, provider));
}
+ // TODO: When introducing MediaRoute2ProviderService#sendControlHints(),
+ // Make this method to be called.
+ public void onRouteSelectionRequestHandled(@NonNull MediaRoute2ProviderProxy provider,
+ String clientPackageName, MediaRoute2Info route, Bundle controlHints, int seq) {
+ sendMessage(PooledLambda.obtainMessage(
+ UserHandler::updateSelectedRoute, this, provider, clientPackageName, route,
+ controlHints, seq));
+ }
+
private void updateProvider(MediaRoute2ProviderProxy provider) {
int providerIndex = getProviderInfoIndex(provider.getUniqueId());
MediaRoute2ProviderInfo providerInfo = provider.getProviderInfo();
@@ -834,24 +872,104 @@
return -1;
}
- private void selectRoute(ClientRecord clientRecord, MediaRoute2Info route) {
+ private void updateSelectedRoute(MediaRoute2ProviderProxy provider,
+ String clientPackageName, MediaRoute2Info selectedRoute, Bundle controlHints,
+ int seq) {
+ if (selectedRoute == null
+ || !TextUtils.equals(clientPackageName, selectedRoute.getClientPackageName())) {
+ Log.w(TAG, "Ignoring route selection which has non-matching clientPackageName.");
+ return;
+ }
+
+ MediaRouter2ServiceImpl service = mServiceRef.get();
+ if (service == null) {
+ return;
+ }
+
+ ClientRecord clientRecord;
+ synchronized (service.mLock) {
+ clientRecord = mUserRecord.findClientRecordLocked(clientPackageName);
+ }
+ if (!(clientRecord instanceof Client2Record)) {
+ Log.w(TAG, "Ignoring route selection for unknown client.");
+ unselectRoute(clientPackageName, selectedRoute);
+ return;
+ }
+
+ if (clientRecord.mSelectingRoute == null || !TextUtils.equals(
+ clientRecord.mSelectingRoute.getUniqueId(), selectedRoute.getUniqueId())) {
+ Log.w(TAG, "Ignoring invalid updateSelectedRoute call. selectingRoute="
+ + clientRecord.mSelectingRoute + " route=" + selectedRoute);
+ unselectRoute(clientPackageName, selectedRoute);
+ return;
+ }
+ clientRecord.mSelectingRoute = null;
+ clientRecord.mSelectedRoute = selectedRoute;
+
+ notifyRouteSelectedToClient(((Client2Record) clientRecord).mClient,
+ selectedRoute,
+ MediaRouter2.SELECT_REASON_USER_SELECTED,
+ controlHints);
+ updateClientUsage(clientRecord);
+
+ // Remove the fallback route selection message.
+ removeMessages(seq);
+ }
+
+ private void handleRouteSelectionTimeout(String clientPackageName,
+ MediaRoute2Info selectingRoute) {
+ MediaRouter2ServiceImpl service = mServiceRef.get();
+ if (service == null) {
+ return;
+ }
+
+ ClientRecord clientRecord;
+ synchronized (service.mLock) {
+ clientRecord = mUserRecord.findClientRecordLocked(clientPackageName);
+ }
+ if (!(clientRecord instanceof Client2Record)) {
+ Log.w(TAG, "Ignoring fallback route selection for unknown client.");
+ return;
+ }
+
+ if (clientRecord.mSelectingRoute == null || !TextUtils.equals(
+ clientRecord.mSelectingRoute.getUniqueId(), selectingRoute.getUniqueId())) {
+ Log.w(TAG, "Ignoring invalid selectFallbackRoute call. "
+ + "Current selectingRoute=" + clientRecord.mSelectingRoute
+ + " , original selectingRoute=" + selectingRoute);
+ return;
+ }
+
+ clientRecord.mSelectingRoute = null;
+ // TODO: When the default route is introduced, make mSelectedRoute always non-null.
+ MediaRoute2Info fallbackRoute = null;
+ clientRecord.mSelectedRoute = fallbackRoute;
+
+ notifyRouteSelectedToClient(((Client2Record) clientRecord).mClient,
+ fallbackRoute,
+ MediaRouter2.SELECT_REASON_FALLBACK,
+ Bundle.EMPTY /* controlHints */);
+ updateClientUsage(clientRecord);
+ }
+
+ private void requestSelectRoute(String clientPackageName, MediaRoute2Info route, int seq) {
if (route != null) {
MediaRoute2ProviderProxy provider = findProvider(route.getProviderId());
if (provider == null) {
Slog.w(TAG, "Ignoring to select route of unknown provider " + route);
} else {
- provider.selectRoute(clientRecord.mPackageName, route.getId());
+ provider.requestSelectRoute(clientPackageName, route.getId(), seq);
}
}
}
- private void unselectRoute(ClientRecord clientRecord, MediaRoute2Info route) {
+ private void unselectRoute(String clientPackageName, MediaRoute2Info route) {
if (route != null) {
MediaRoute2ProviderProxy provider = findProvider(route.getProviderId());
if (provider == null) {
Slog.w(TAG, "Ignoring to unselect route of unknown provider " + route);
} else {
- provider.unselectRoute(clientRecord.mPackageName, route.getId());
+ provider.unselectRoute(clientPackageName, route.getId());
}
}
}
@@ -922,6 +1040,15 @@
}
}
+ private void notifyRouteSelectedToClient(IMediaRouter2Client client,
+ MediaRoute2Info route, int reason, Bundle controlHints) {
+ try {
+ client.notifyRouteSelected(route, reason, controlHints);
+ } catch (RemoteException ex) {
+ Slog.w(TAG, "Failed to notify routes selected. Client probably died.", ex);
+ }
+ }
+
private void notifyRoutesAddedToClients(List<IMediaRouter2Client> clients,
List<MediaRoute2Info> routes) {
for (IMediaRouter2Client client : clients) {
diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java
index afd92f6..ecc1aba 100644
--- a/services/core/java/com/android/server/media/MediaRouterService.java
+++ b/services/core/java/com/android/server/media/MediaRouterService.java
@@ -459,8 +459,8 @@
// Binder call
@Override
- public void selectRoute2(IMediaRouter2Client client, MediaRoute2Info route) {
- mService2.selectRoute2(client, route);
+ public void requestSelectRoute2(IMediaRouter2Client client, MediaRoute2Info route) {
+ mService2.requestSelectRoute2(client, route);
}
// Binder call
diff --git a/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java b/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java
index 99b1ef4..f05b2bf 100644
--- a/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java
+++ b/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java
@@ -16,8 +16,15 @@
package com.android.server.notification;
+import android.app.AlarmManager;
import android.app.NotificationHistory;
import android.app.NotificationHistory.HistoricalNotification;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
import android.os.Handler;
import android.util.AtomicFile;
import android.util.Slog;
@@ -33,11 +40,15 @@
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.concurrent.TimeUnit;
/**
* Provides an interface to write and query for notification history data for a user from a Protocol
@@ -52,32 +63,48 @@
private static final String TAG = "NotiHistoryDatabase";
private static final boolean DEBUG = NotificationManagerService.DBG;
private static final int HISTORY_RETENTION_DAYS = 2;
+ private static final int HISTORY_RETENTION_MS = 24 * 60 * 60 * 1000;
private static final long WRITE_BUFFER_INTERVAL_MS = 1000 * 60 * 20;
+ private static final String ACTION_HISTORY_DELETION =
+ NotificationHistoryDatabase.class.getSimpleName() + ".CLEANUP";
+ private static final int REQUEST_CODE_DELETION = 1;
+ private static final String SCHEME_DELETION = "delete";
+ private static final String EXTRA_KEY = "key";
+
+ private final Context mContext;
+ private final AlarmManager mAlarmManager;
private final Object mLock = new Object();
private Handler mFileWriteHandler;
@VisibleForTesting
// List of files holding history information, sorted newest to oldest
final LinkedList<AtomicFile> mHistoryFiles;
- private final GregorianCalendar mCal;
private final File mHistoryDir;
private final File mVersionFile;
// Current version of the database files schema
private int mCurrentVersion;
private final WriteBufferRunnable mWriteBufferRunnable;
+ private final FileAttrProvider mFileAttrProvider;
// Object containing posted notifications that have not yet been written to disk
@VisibleForTesting
NotificationHistory mBuffer;
- public NotificationHistoryDatabase(File dir) {
+ public NotificationHistoryDatabase(Context context, File dir,
+ FileAttrProvider fileAttrProvider) {
+ mContext = context;
+ mAlarmManager = context.getSystemService(AlarmManager.class);
mCurrentVersion = DEFAULT_CURRENT_VERSION;
mVersionFile = new File(dir, "version");
mHistoryDir = new File(dir, "history");
mHistoryFiles = new LinkedList<>();
- mCal = new GregorianCalendar();
mBuffer = new NotificationHistory();
mWriteBufferRunnable = new WriteBufferRunnable();
+ mFileAttrProvider = fileAttrProvider;
+
+ IntentFilter deletionFilter = new IntentFilter(ACTION_HISTORY_DELETION);
+ deletionFilter.addDataScheme(SCHEME_DELETION);
+ mContext.registerReceiver(mFileCleaupReceiver, deletionFilter);
}
public void init(Handler fileWriteHandler) {
@@ -105,7 +132,8 @@
}
// Sort with newest files first
- Arrays.sort(files, (lhs, rhs) -> Long.compare(rhs.lastModified(), lhs.lastModified()));
+ Arrays.sort(files, (lhs, rhs) -> Long.compare(mFileAttrProvider.getCreationTime(rhs),
+ mFileAttrProvider.getCreationTime(lhs)));
for (File file : files) {
mHistoryFiles.addLast(new AtomicFile(file));
@@ -197,31 +225,48 @@
}
/**
- * Remove any files that are too old.
+ * Remove any files that are too old and schedule jobs to clean up the rest
*/
public void prune(final int retentionDays, final long currentTimeMillis) {
synchronized (mLock) {
- mCal.setTimeInMillis(currentTimeMillis);
- mCal.add(Calendar.DATE, -1 * retentionDays);
+ GregorianCalendar retentionBoundary = new GregorianCalendar();
+ retentionBoundary.setTimeInMillis(currentTimeMillis);
+ retentionBoundary.add(Calendar.DATE, -1 * retentionDays);
- while (!mHistoryFiles.isEmpty()) {
- final AtomicFile currentOldestFile = mHistoryFiles.getLast();
- final long age = currentTimeMillis
- - currentOldestFile.getBaseFile().lastModified();
- if (age > mCal.getTimeInMillis()) {
+ for (int i = mHistoryFiles.size() - 1; i >= 0; i--) {
+ final AtomicFile currentOldestFile = mHistoryFiles.get(i);
+ final long creationTime =
+ mFileAttrProvider.getCreationTime(currentOldestFile.getBaseFile());
+ if (creationTime <= retentionBoundary.getTimeInMillis()) {
if (DEBUG) {
Slog.d(TAG, "Removed " + currentOldestFile.getBaseFile().getName());
}
currentOldestFile.delete();
mHistoryFiles.removeLast();
} else {
- // all remaining files are newer than the cut off
- return;
+ // all remaining files are newer than the cut off; schedule jobs to delete
+ final long deletionTime = creationTime + (retentionDays * HISTORY_RETENTION_MS);
+ scheduleDeletion(currentOldestFile.getBaseFile(), deletionTime);
}
}
}
}
+ void scheduleDeletion(File file, long deletionTime) {
+ if (DEBUG) {
+ Slog.d(TAG, "Scheduling deletion for " + file.getName() + " at " + deletionTime);
+ }
+ final PendingIntent pi = PendingIntent.getBroadcast(mContext,
+ REQUEST_CODE_DELETION,
+ new Intent(ACTION_HISTORY_DELETION)
+ .setData(new Uri.Builder().scheme(SCHEME_DELETION)
+ .appendPath(file.getAbsolutePath()).build())
+ .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+ .putExtra(EXTRA_KEY, file.getAbsolutePath()),
+ PendingIntent.FLAG_UPDATE_CURRENT);
+ mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, deletionTime, pi);
+ }
+
private void writeLocked(AtomicFile file, NotificationHistory notifications)
throws IOException {
FileOutputStream fos = file.startWrite();
@@ -245,6 +290,25 @@
}
}
+ private final BroadcastReceiver mFileCleaupReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ if (action == null) {
+ return;
+ }
+ if (ACTION_HISTORY_DELETION.equals(action)) {
+ try {
+ final String filePath = intent.getStringExtra(EXTRA_KEY);
+ AtomicFile fileToDelete = new AtomicFile(new File(filePath));
+ fileToDelete.delete();
+ } catch (Exception e) {
+ Slog.e(TAG, "Failed to delete notification history file", e);
+ }
+ }
+ }
+ };
+
private final class WriteBufferRunnable implements Runnable {
@Override
public void run() {
@@ -277,10 +341,7 @@
// Remove packageName entries from pending history
mBuffer.removeNotificationsFromWrite(mPkg);
- // Remove packageName entries from files on disk, and rewrite them to disk
- // Since we sort by modified date, we have to update the files oldest to newest to
- // maintain the original ordering
- Iterator<AtomicFile> historyFileItr = mHistoryFiles.descendingIterator();
+ Iterator<AtomicFile> historyFileItr = mHistoryFiles.iterator();
while (historyFileItr.hasNext()) {
final AtomicFile af = historyFileItr.next();
try {
@@ -297,4 +358,24 @@
}
}
}
+
+ public static final class NotificationHistoryFileAttrProvider implements
+ NotificationHistoryDatabase.FileAttrProvider {
+ final static String TAG = "NotifHistoryFileDate";
+
+ public long getCreationTime(File file) {
+ try {
+ BasicFileAttributes attr = Files.readAttributes(FileSystems.getDefault().getPath(
+ file.getAbsolutePath()), BasicFileAttributes.class);
+ return attr.creationTime().to(TimeUnit.MILLISECONDS);
+ } catch (Exception e) {
+ Slog.w(TAG, "Cannot read creation data for file; using file name");
+ return Long.valueOf(file.getName());
+ }
+ }
+ }
+
+ interface FileAttrProvider {
+ long getCreationTime(File file);
+ }
}
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 5b39fb6..ec53157 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -7724,7 +7724,7 @@
}
private void listenForCallState() {
- TelephonyManager.from(getContext()).listen(new PhoneStateListener() {
+ getContext().getSystemService(TelephonyManager.class).listen(new PhoneStateListener() {
@Override
public void onCallStateChanged(int state, String incomingNumber) {
if (mCallState == state) return;
diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java
index 0a3c581..cbbf2a0 100644
--- a/services/core/java/com/android/server/notification/PreferencesHelper.java
+++ b/services/core/java/com/android/server/notification/PreferencesHelper.java
@@ -757,7 +757,7 @@
clearLockedFieldsLocked(channel);
channel.setImportanceLockedByOEM(r.oemLockedImportance);
if (!channel.isImportanceLockedByOEM()) {
- if (r.futureOemLockedChannels.remove(channel.getId())) {
+ if (r.oemLockedChannels.contains(channel.getId())) {
channel.setImportanceLockedByOEM(true);
}
}
@@ -952,11 +952,10 @@
NotificationChannel channel = r.channels.get(channelId);
if (channel != null) {
channel.setImportanceLockedByOEM(true);
- } else {
- // if this channel shows up in the future, make sure it'll
- // be locked immediately
- r.futureOemLockedChannels.add(channelId);
}
+ // Also store the locked channels on the record, so they aren't
+ // temporarily lost when data is cleared on the package
+ r.oemLockedChannels.add(channelId);
}
}
}
@@ -1528,9 +1527,9 @@
pw.print(" oemLocked=");
pw.print(r.oemLockedImportance);
}
- if (!r.futureOemLockedChannels.isEmpty()) {
+ if (!r.oemLockedChannels.isEmpty()) {
pw.print(" futureLockedChannels=");
- pw.print(r.futureOemLockedChannels);
+ pw.print(r.oemLockedChannels);
}
pw.println();
for (NotificationChannel channel : r.channels.values()) {
@@ -1940,7 +1939,7 @@
// these fields are loaded on boot from a different source of truth and so are not
// written to notification policy xml
boolean oemLockedImportance = DEFAULT_OEM_LOCKED_IMPORTANCE;
- List<String> futureOemLockedChannels = new ArrayList<>();
+ List<String> oemLockedChannels = new ArrayList<>();
boolean defaultAppLockedImportance = DEFAULT_APP_LOCKED_IMPORTANCE;
Delegate delegate = null;
diff --git a/services/core/java/com/android/server/os/DeviceIdentifiersPolicyService.java b/services/core/java/com/android/server/os/DeviceIdentifiersPolicyService.java
index 9c1ac34..947405e 100644
--- a/services/core/java/com/android/server/os/DeviceIdentifiersPolicyService.java
+++ b/services/core/java/com/android/server/os/DeviceIdentifiersPolicyService.java
@@ -56,16 +56,17 @@
// for any device / profile owner checks. The majority of requests for the serial number
// should use the getSerialForPackage method with the calling package specified.
if (!TelephonyPermissions.checkCallingOrSelfReadDeviceIdentifiers(mContext,
- /* callingPackage */ null, "getSerial")) {
+ /* callingPackage */ null, null, "getSerial")) {
return Build.UNKNOWN;
}
return SystemProperties.get("ro.serialno", Build.UNKNOWN);
}
@Override
- public @Nullable String getSerialForPackage(String callingPackage) throws RemoteException {
+ public @Nullable String getSerialForPackage(String callingPackage,
+ String callingFeatureId) throws RemoteException {
if (!TelephonyPermissions.checkCallingOrSelfReadDeviceIdentifiers(mContext,
- callingPackage, "getSerial")) {
+ callingPackage, callingFeatureId, "getSerial")) {
return Build.UNKNOWN;
}
return SystemProperties.get("ro.serialno", Build.UNKNOWN);
diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java
index bb5b04a..ec11a97 100644
--- a/services/core/java/com/android/server/pm/AppsFilter.java
+++ b/services/core/java/com/android/server/pm/AppsFilter.java
@@ -29,27 +29,24 @@
import android.content.pm.PackageParser;
import android.content.pm.ProviderInfo;
import android.net.Uri;
-import android.os.Build;
import android.os.Process;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.Trace;
-import android.permission.IPermissionManager;
+import android.os.UserHandle;
import android.provider.DeviceConfig;
+import android.text.TextUtils;
+import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Slog;
import android.util.SparseArray;
+import android.util.SparseSetArray;
import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.ArrayUtils;
import com.android.server.FgThread;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
import java.util.Objects;
import java.util.Set;
@@ -60,7 +57,7 @@
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public class AppsFilter {
- private static final String TAG = PackageManagerService.TAG;
+ private static final String TAG = "AppsFilter";
// Logs all filtering instead of enforcing
private static final boolean DEBUG_ALLOW_ALL = false;
@@ -69,52 +66,46 @@
private static final boolean DEBUG_LOGGING = false | DEBUG_ALLOW_ALL;
/**
- * This contains a list of packages that are implicitly queryable because another app explicitly
+ * This contains a list of app UIDs that are implicitly queryable because another app explicitly
* interacted with it. For example, if application A starts a service in application B,
* application B is implicitly allowed to query for application A; regardless of any manifest
* entries.
*/
- private final SparseArray<HashMap<String, Set<String>>> mImplicitlyQueryable =
- new SparseArray<>();
+ private final SparseSetArray<Integer> mImplicitlyQueryable = new SparseSetArray<>();
/**
- * A mapping from the set of packages that query other packages via package name to the
+ * A mapping from the set of App IDs that query other App IDs via package name to the
* list of packages that they can see.
*/
- private final HashMap<String, Set<String>> mQueriesViaPackage = new HashMap<>();
+ private final SparseSetArray<Integer> mQueriesViaPackage = new SparseSetArray<>();
/**
- * A mapping from the set of packages that query others via intent to the list
+ * A mapping from the set of App IDs that query others via intent to the list
* of packages that the intents resolve to.
*/
- private final HashMap<String, Set<String>> mQueriesViaIntent = new HashMap<>();
+ private final SparseSetArray<Integer> mQueriesViaIntent = new SparseSetArray<>();
/**
- * A set of packages that are always queryable by any package, regardless of their manifest
+ * A set of App IDs that are always queryable by any package, regardless of their manifest
* content.
*/
- private final HashSet<String> mForceQueryable;
+ private final ArraySet<Integer> mForceQueryable = new ArraySet<>();
+
/**
- * A set of packages that are always queryable by any package, regardless of their manifest
- * content.
+ * The set of package names provided by the device that should be force queryable regardless of
+ * their manifest contents.
*/
- private final Set<String> mForceQueryableByDevice;
+ private final String[] mForceQueryableByDevicePackageNames;
/** True if all system apps should be made queryable by default. */
private final boolean mSystemAppsQueryable;
- private final IPermissionManager mPermissionManager;
-
private final FeatureConfig mFeatureConfig;
- AppsFilter(FeatureConfig featureConfig, IPermissionManager permissionManager,
- String[] forceQueryableWhitelist, boolean systemAppsQueryable) {
+ AppsFilter(FeatureConfig featureConfig, String[] forceQueryableWhitelist,
+ boolean systemAppsQueryable) {
mFeatureConfig = featureConfig;
- final HashSet<String> forceQueryableByDeviceSet = new HashSet<>();
- Collections.addAll(forceQueryableByDeviceSet, forceQueryableWhitelist);
- this.mForceQueryableByDevice = Collections.unmodifiableSet(forceQueryableByDeviceSet);
- this.mForceQueryable = new HashSet<>();
- mPermissionManager = permissionManager;
+ mForceQueryableByDevicePackageNames = forceQueryableWhitelist;
mSystemAppsQueryable = systemAppsQueryable;
}
@@ -127,7 +118,6 @@
/** @return true if the feature is enabled for the given package. */
boolean packageIsEnabled(PackageParser.Package pkg);
-
}
private static class FeatureConfigImpl implements FeatureConfig {
@@ -174,7 +164,6 @@
}
}
-
public static AppsFilter create(PackageManagerService.Injector injector) {
final boolean forceSystemAppsQueryable =
injector.getContext().getResources()
@@ -192,15 +181,12 @@
forcedQueryablePackageNames[i] = forcedQueryablePackageNames[i].intern();
}
}
- IPermissionManager permissionmgr =
- (IPermissionManager) ServiceManager.getService("permissionmgr");
-
- return new AppsFilter(featureConfig, permissionmgr, forcedQueryablePackageNames,
+ return new AppsFilter(featureConfig, forcedQueryablePackageNames,
forceSystemAppsQueryable);
}
/** Returns true if the querying package may query for the potential target package */
- private static boolean canQuery(PackageParser.Package querying,
+ private static boolean canQueryViaIntent(PackageParser.Package querying,
PackageParser.Package potentialTarget) {
if (querying.mQueriesIntents == null) {
return false;
@@ -274,22 +260,14 @@
* Grants access based on an interaction between a calling and target package, granting
* visibility of the caller from the target.
*
- * @param callingPackage the package initiating the interaction
- * @param targetPackage the package being interacted with and thus gaining visibility of the
- * initiating package.
- * @param userId the user in which this interaction was taking place
+ * @param callingUid the uid initiating the interaction
+ * @param targetUid the uid being interacted with and thus gaining visibility of the
+ * initiating uid.
*/
- public void grantImplicitAccess(
- String callingPackage, String targetPackage, int userId) {
- HashMap<String, Set<String>> currentUser = mImplicitlyQueryable.get(userId);
- if (currentUser == null) {
- currentUser = new HashMap<>();
- mImplicitlyQueryable.put(userId, currentUser);
+ public void grantImplicitAccess(int callingUid, int targetUid) {
+ if (mImplicitlyQueryable.add(targetUid, callingUid) && DEBUG_LOGGING) {
+ Slog.wtf(TAG, "implicit access granted: " + callingUid + " -> " + targetUid);
}
- if (!currentUser.containsKey(targetPackage)) {
- currentUser.put(targetPackage, new HashSet<>());
- }
- currentUser.get(targetPackage).add(callingPackage);
}
public void onSystemReady() {
@@ -299,50 +277,57 @@
/**
* Adds a package that should be considered when filtering visibility between apps.
*
- * @param newPkg the new package being added
- * @param existing all other packages currently on the device.
+ * @param newPkgSetting the new setting being added
+ * @param existingSettings all other settings currently on the device.
*/
- public void addPackage(PackageParser.Package newPkg,
- Map<String, PackageParser.Package> existing) {
+ public void addPackage(PackageSetting newPkgSetting,
+ ArrayMap<String, PackageSetting> existingSettings) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage");
try {
- // let's re-evaluate the ability of already added packages to see this new package
- if (newPkg.mForceQueryable
- || (mSystemAppsQueryable && (newPkg.isSystem()
- || newPkg.isUpdatedSystemApp()))) {
- mForceQueryable.add(newPkg.packageName);
- } else {
- for (String packageName : mQueriesViaIntent.keySet()) {
- if (packageName == newPkg.packageName) {
- continue;
+ final PackageParser.Package newPkg = newPkgSetting.pkg;
+ if (newPkg == null) {
+ // nothing to add
+ return;
+ }
+
+ final boolean newIsForceQueryable =
+ mForceQueryable.contains(newPkgSetting.appId)
+ /* shared user that is already force queryable */
+ || newPkg.mForceQueryable
+ || (newPkgSetting.isSystem() && (mSystemAppsQueryable
+ || ArrayUtils.contains(mForceQueryableByDevicePackageNames,
+ newPkg.packageName)));
+ if (newIsForceQueryable) {
+ mForceQueryable.add(newPkgSetting.appId);
+ }
+
+ for (int i = existingSettings.size() - 1; i >= 0; i--) {
+ final PackageSetting existingSetting = existingSettings.valueAt(i);
+ if (existingSetting.appId == newPkgSetting.appId || existingSetting.pkg == null) {
+ continue;
+ }
+ final PackageParser.Package existingPkg = existingSetting.pkg;
+ // let's evaluate the ability of already added packages to see this new package
+ if (!newIsForceQueryable) {
+ if (canQueryViaIntent(existingPkg, newPkg)) {
+ mQueriesViaIntent.add(existingSetting.appId, newPkgSetting.appId);
}
- final PackageParser.Package existingPackage = existing.get(packageName);
- if (canQuery(existingPackage, newPkg)) {
- mQueriesViaIntent.get(packageName).add(newPkg.packageName);
+ if (existingPkg.mQueriesPackages != null
+ && existingPkg.mQueriesPackages.contains(newPkg.packageName)) {
+ mQueriesViaPackage.add(existingSetting.appId, newPkgSetting.appId);
+ }
+ }
+ // now we'll evaluate our new package's ability to see existing packages
+ if (!mForceQueryable.contains(existingSetting.appId)) {
+ if (canQueryViaIntent(newPkg, existingPkg)) {
+ mQueriesViaIntent.add(newPkgSetting.appId, existingSetting.appId);
+ }
+ if (newPkg.mQueriesPackages != null
+ && newPkg.mQueriesPackages.contains(existingPkg.packageName)) {
+ mQueriesViaPackage.add(newPkgSetting.appId, existingSetting.appId);
}
}
}
- // if the new package declares them, let's evaluate its ability to see existing packages
- mQueriesViaIntent.put(newPkg.packageName, new HashSet<>());
- for (PackageParser.Package existingPackage : existing.values()) {
- if (existingPackage.packageName == newPkg.packageName) {
- continue;
- }
- if (existingPackage.mForceQueryable
- || (mSystemAppsQueryable
- && (newPkg.isSystem() || newPkg.isUpdatedSystemApp()))) {
- continue;
- }
- if (canQuery(newPkg, existingPackage)) {
- mQueriesViaIntent.get(newPkg.packageName).add(existingPackage.packageName);
- }
- }
- final HashSet<String> queriesPackages = new HashSet<>(
- newPkg.mQueriesPackages == null ? 0 : newPkg.mQueriesPackages.size());
- if (newPkg.mQueriesPackages != null) {
- queriesPackages.addAll(newPkg.mQueriesPackages);
- }
- mQueriesViaPackage.put(newPkg.packageName, queriesPackages);
} finally {
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
@@ -351,24 +336,41 @@
/**
* Removes a package for consideration when filtering visibility between apps.
*
- * @param packageName the name of the package being removed.
+ * @param setting the setting of the package being removed.
+ * @param allUsers array of all current users on device.
*/
- public void removePackage(String packageName) {
- mForceQueryable.remove(packageName);
+ public void removePackage(PackageSetting setting, int[] allUsers,
+ ArrayMap<String, PackageSetting> existingSettings) {
+ mForceQueryable.remove(setting.appId);
- for (int i = 0; i < mImplicitlyQueryable.size(); i++) {
- mImplicitlyQueryable.valueAt(i).remove(packageName);
- for (Set<String> initiators : mImplicitlyQueryable.valueAt(i).values()) {
- initiators.remove(packageName);
+ for (int u = 0; u < allUsers.length; u++) {
+ final int userId = allUsers[u];
+ final int removingUid = UserHandle.getUid(userId, setting.appId);
+ mImplicitlyQueryable.remove(removingUid);
+ for (int i = mImplicitlyQueryable.size() - 1; i >= 0; i--) {
+ mImplicitlyQueryable.remove(mImplicitlyQueryable.keyAt(i), removingUid);
}
}
- mQueriesViaIntent.remove(packageName);
- for (Set<String> declarators : mQueriesViaIntent.values()) {
- declarators.remove(packageName);
+ mQueriesViaIntent.remove(setting.appId);
+ for (int i = mQueriesViaIntent.size() - 1; i >= 0; i--) {
+ mQueriesViaIntent.remove(mQueriesViaIntent.keyAt(i), setting.appId);
+ }
+ mQueriesViaPackage.remove(setting.appId);
+ for (int i = mQueriesViaPackage.size() - 1; i >= 0; i--) {
+ mQueriesViaPackage.remove(mQueriesViaPackage.keyAt(i), setting.appId);
}
- mQueriesViaPackage.remove(packageName);
+ // re-add other shared user members to re-establish visibility between them and other
+ // packages
+ if (setting.sharedUser != null) {
+ for (int i = setting.sharedUser.packages.size() - 1; i >= 0; i--) {
+ if (setting.sharedUser.packages.valueAt(i) == setting) {
+ continue;
+ }
+ addPackage(setting.sharedUser.packages.valueAt(i), existingSettings);
+ }
+ }
}
/**
@@ -385,6 +387,25 @@
PackageSetting targetPkgSetting, int userId) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "shouldFilterApplication");
try {
+ if (!shouldFilterApplicationInternal(callingUid, callingSetting,
+ targetPkgSetting,
+ userId)) {
+ return false;
+ }
+ if (DEBUG_LOGGING) {
+ log(callingSetting, targetPkgSetting,
+ DEBUG_ALLOW_ALL ? "ALLOWED" : "BLOCKED", new RuntimeException());
+ }
+ return !DEBUG_ALLOW_ALL;
+ } finally {
+ Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
+ }
+ }
+
+ private boolean shouldFilterApplicationInternal(int callingUid,
+ SettingBase callingSetting, PackageSetting targetPkgSetting, int userId) {
+ Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "shouldFilterApplicationInternal");
+ try {
final boolean featureEnabled = mFeatureConfig.isGloballyEnabled();
if (!featureEnabled) {
if (DEBUG_LOGGING) {
@@ -402,85 +423,37 @@
Slog.wtf(TAG, "No setting found for non system uid " + callingUid);
return true;
}
- PackageSetting callingPkgSetting = null;
+ final PackageSetting callingPkgSetting;
+ final ArraySet<PackageSetting> callingSharedPkgSettings;
if (callingSetting instanceof PackageSetting) {
callingPkgSetting = (PackageSetting) callingSetting;
- if (!shouldFilterApplicationInternal(callingPkgSetting, targetPkgSetting,
- userId)) {
+ callingSharedPkgSettings = null;
+ } else {
+ callingPkgSetting = null;
+ callingSharedPkgSettings = ((SharedUserSetting) callingSetting).packages;
+ }
+
+ if (callingPkgSetting != null) {
+ if (!mFeatureConfig.packageIsEnabled(callingPkgSetting.pkg)) {
+ if (DEBUG_LOGGING) {
+ log(callingSetting, targetPkgSetting, "DISABLED");
+ }
return false;
}
- } else if (callingSetting instanceof SharedUserSetting) {
- final ArraySet<PackageSetting> packageSettings =
- ((SharedUserSetting) callingSetting).packages;
- if (packageSettings != null && packageSettings.size() > 0) {
- for (int i = 0, max = packageSettings.size(); i < max; i++) {
- final PackageSetting packageSetting = packageSettings.valueAt(i);
- if (!shouldFilterApplicationInternal(packageSetting, targetPkgSetting,
- userId)) {
- return false;
+ } else {
+ for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) {
+ if (!mFeatureConfig.packageIsEnabled(callingSharedPkgSettings.valueAt(i).pkg)) {
+ if (DEBUG_LOGGING) {
+ log(callingSetting, targetPkgSetting, "DISABLED");
}
- if (callingPkgSetting == null && packageSetting.pkg != null) {
- callingPkgSetting = packageSetting;
- }
- }
- if (callingPkgSetting == null) {
- Slog.wtf(TAG, callingSetting + " does not have any non-null packages!");
- return true;
- }
- } else {
- Slog.wtf(TAG, callingSetting + " has no packages!");
- return true;
- }
- }
-
- if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting,
- DEBUG_ALLOW_ALL ? "ALLOWED" : "BLOCKED");
- }
- return !DEBUG_ALLOW_ALL;
- } finally {
- Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
- }
- }
-
- private boolean shouldFilterApplicationInternal(
- PackageSetting callingPkgSetting, PackageSetting targetPkgSetting, int userId) {
- return shouldFilterApplicationInternal(callingPkgSetting, targetPkgSetting, userId,
- true /*expandSharedUser*/);
- }
-
- /**
- * @param expandSharedUser true if all members of the shared user a target may belong to should
- * be considered
- */
- private boolean shouldFilterApplicationInternal(
- PackageSetting callingPkgSetting, PackageSetting targetPkgSetting, int userId,
- boolean expandSharedUser) {
- Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "shouldFilterApplicationInternal");
- try {
- // special case shared user targets
- if (expandSharedUser && targetPkgSetting.sharedUser != null) {
- for (PackageSetting sharedMemberSetting : targetPkgSetting.sharedUser.packages) {
- if (!shouldFilterApplicationInternal(
- callingPkgSetting, sharedMemberSetting, userId,
- false /*expandSharedUser*/)) {
return false;
}
}
- return true;
}
- final String callingName = callingPkgSetting.pkg.packageName;
- final PackageParser.Package targetPkg = targetPkgSetting.pkg;
-
- if (!mFeatureConfig.packageIsEnabled(callingPkgSetting.pkg)) {
- if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "DISABLED");
- }
- return false;
- }
// This package isn't technically installed and won't be written to settings, so we can
// treat it as filtered until it's available again.
+ final PackageParser.Package targetPkg = targetPkgSetting.pkg;
if (targetPkg == null) {
if (DEBUG_LOGGING) {
Slog.wtf(TAG, "shouldFilterApplication: " + "targetPkg is null");
@@ -488,149 +461,180 @@
return true;
}
final String targetName = targetPkg.packageName;
- if (callingPkgSetting.pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.R) {
+ final int callingAppId;
+ if (callingPkgSetting != null) {
+ callingAppId = callingPkgSetting.appId;
+ } else {
+ callingAppId = callingSharedPkgSettings.valueAt(0).appId; // all should be the same
+ }
+ final int targetAppId = targetPkgSetting.appId;
+ if (callingAppId == targetAppId) {
if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "caller pre-R");
+ log(callingSetting, targetPkgSetting, "same app id");
}
return false;
}
- if (callingPkgSetting.appId == targetPkgSetting.appId) {
+
+ if (callingSetting.getPermissionsState().hasPermission(
+ Manifest.permission.QUERY_ALL_PACKAGES, UserHandle.getUserId(callingUid))) {
if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "same app id");
+ log(callingSetting, targetPkgSetting, "has query-all permission");
}
return false;
}
- if (isImplicitlyQueryableSystemApp(targetPkgSetting)) {
+ if (mForceQueryable.contains(targetAppId)) {
if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "implicitly queryable sys");
+ log(callingSetting, targetPkgSetting, "force queryable");
}
return false;
}
- if (targetPkg.mForceQueryable) {
- if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "manifest forceQueryable");
- }
- return false;
- }
- if (mForceQueryable.contains(targetName)) {
- if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "whitelist forceQueryable");
- }
- return false;
- }
- if (mQueriesViaPackage.containsKey(callingName)
- && mQueriesViaPackage.get(callingName).contains(
- targetName)) {
+ if (mQueriesViaPackage.contains(callingAppId, targetAppId)) {
// the calling package has explicitly declared the target package; allow
if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "queries package");
+ log(callingSetting, targetPkgSetting, "queries package");
}
return false;
- } else if (mQueriesViaIntent.containsKey(callingName)
- && mQueriesViaIntent.get(callingName).contains(targetName)) {
+ } else if (mQueriesViaIntent.contains(callingAppId, targetAppId)) {
if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "queries intent");
+ log(callingSetting, targetPkgSetting, "queries intent");
}
return false;
}
- if (mImplicitlyQueryable.get(userId) != null
- && mImplicitlyQueryable.get(userId).containsKey(callingName)
- && mImplicitlyQueryable.get(userId).get(callingName).contains(targetName)) {
+
+ final int targetUid = UserHandle.getUid(userId, targetAppId);
+ if (mImplicitlyQueryable.contains(callingUid, targetUid)) {
if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "implicitly queryable for user");
+ log(callingSetting, targetPkgSetting, "implicitly queryable for user");
}
return false;
}
- final ArrayList<PackageParser.Instrumentation> inst =
- callingPkgSetting.pkg.instrumentation;
- if (inst.size() > 0) {
- for (int i = 0, max = inst.size(); i < max; i++) {
- if (inst.get(i).info.targetPackage == targetName) {
- if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "instrumentation");
- }
+ if (callingPkgSetting != null) {
+ if (callingPkgInstruments(callingPkgSetting, targetPkgSetting, targetName)) {
+ return false;
+ }
+ } else {
+ for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) {
+ if (callingPkgInstruments(callingSharedPkgSettings.valueAt(i),
+ targetPkgSetting, targetName)) {
return false;
}
}
}
- Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.checkPermission");
- try {
- if (mPermissionManager.checkPermission(
- Manifest.permission.QUERY_ALL_PACKAGES, callingName, userId)
- == PackageManager.PERMISSION_GRANTED) {
- if (DEBUG_LOGGING) {
- log(callingPkgSetting, targetPkgSetting, "permission");
- }
- return false;
- }
- } catch (RemoteException e) {
- return true;
- } finally {
- Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
- }
return true;
} finally {
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
}
- private static void log(PackageSetting callingPkgSetting, PackageSetting targetPkgSetting,
- String description) {
- Slog.wtf(TAG,
- "interaction: " + callingPkgSetting.name + " -> " + targetPkgSetting.name + " "
- + description);
+ private static boolean callingPkgInstruments(PackageSetting callingPkgSetting,
+ PackageSetting targetPkgSetting,
+ String targetName) {
+ final ArrayList<PackageParser.Instrumentation> inst = callingPkgSetting.pkg.instrumentation;
+ for (int i = inst.size() - 1; i >= 0; i--) {
+ if (inst.get(i).info.targetPackage == targetName) {
+ if (DEBUG_LOGGING) {
+ log(callingPkgSetting, targetPkgSetting, "instrumentation");
+ }
+ return true;
+ }
+ }
+ return false;
}
- private boolean isImplicitlyQueryableSystemApp(PackageSetting targetPkgSetting) {
- return targetPkgSetting.isSystem() && (mSystemAppsQueryable
- || mForceQueryableByDevice.contains(targetPkgSetting.pkg.packageName));
+ private static void log(SettingBase callingPkgSetting, PackageSetting targetPkgSetting,
+ String description) {
+ log(callingPkgSetting, targetPkgSetting, description, null);
+ }
+
+ private static void log(SettingBase callingPkgSetting, PackageSetting targetPkgSetting,
+ String description, Throwable throwable) {
+ Slog.wtf(TAG,
+ "interaction: " + callingPkgSetting.toString()
+ + " -> " + targetPkgSetting.name + " "
+ + description, throwable);
}
public void dumpQueries(
- PrintWriter pw, @Nullable String filteringPackageName, DumpState dumpState,
+ PrintWriter pw, PackageManagerService pms, @Nullable Integer filteringAppId,
+ DumpState dumpState,
int[] users) {
+ final SparseArray<String> cache = new SparseArray<>();
+ ToString<Integer> expandPackages = input -> {
+ String cachedValue = cache.get(input);
+ if (cachedValue == null) {
+ final String[] packagesForUid = pms.getPackagesForUid(input);
+ if (packagesForUid == null) {
+ cachedValue = "[unknown app id " + input + "]";
+ } else {
+ cachedValue = packagesForUid.length == 1 ? packagesForUid[0]
+ : "[" + TextUtils.join(",", packagesForUid) + "]";
+ }
+ cache.put(input, cachedValue);
+ }
+ return cachedValue;
+ };
pw.println();
pw.println("Queries:");
dumpState.onTitlePrinted();
+ if (!mFeatureConfig.isGloballyEnabled()) {
+ pw.println(" DISABLED");
+ if (!DEBUG_LOGGING) {
+ return;
+ }
+ }
pw.println(" system apps queryable: " + mSystemAppsQueryable);
- dumpPackageSet(pw, filteringPackageName, mForceQueryableByDevice, "System whitelist", " ");
- dumpPackageSet(pw, filteringPackageName, mForceQueryable, "forceQueryable", " ");
+ dumpPackageSet(pw, filteringAppId, mForceQueryable, "forceQueryable", " ", expandPackages);
pw.println(" queries via package name:");
- dumpQueriesMap(pw, filteringPackageName, mQueriesViaPackage, " ");
+ dumpQueriesMap(pw, filteringAppId, mQueriesViaPackage, " ", expandPackages);
pw.println(" queries via intent:");
- dumpQueriesMap(pw, filteringPackageName, mQueriesViaIntent, " ");
+ dumpQueriesMap(pw, filteringAppId, mQueriesViaIntent, " ", expandPackages);
pw.println(" queryable via interaction:");
for (int user : users) {
pw.append(" User ").append(Integer.toString(user)).println(":");
- final HashMap<String, Set<String>> queryMapForUser = mImplicitlyQueryable.get(user);
- if (queryMapForUser != null) {
- dumpQueriesMap(pw, filteringPackageName, queryMapForUser, " ");
- }
+ dumpQueriesMap(pw,
+ filteringAppId == null ? null : UserHandle.getUid(user, filteringAppId),
+ mImplicitlyQueryable, " ", expandPackages);
}
}
- private static void dumpQueriesMap(PrintWriter pw, @Nullable String filteringPackageName,
- HashMap<String, Set<String>> queriesMap, String spacing) {
- for (String callingPkg : queriesMap.keySet()) {
- if (Objects.equals(callingPkg, filteringPackageName)) {
- // don't filter target package names if the calling is filteringPackageName
- dumpPackageSet(pw, null /*filteringPackageName*/, queriesMap.get(callingPkg),
- callingPkg, spacing);
+ private static void dumpQueriesMap(PrintWriter pw, @Nullable Integer filteringId,
+ SparseSetArray<Integer> queriesMap, String spacing,
+ @Nullable ToString<Integer> toString) {
+ for (int i = 0; i < queriesMap.size(); i++) {
+ Integer callingId = queriesMap.keyAt(i);
+ if (Objects.equals(callingId, filteringId)) {
+ // don't filter target package names if the calling is filteringId
+ dumpPackageSet(
+ pw, null /*filteringId*/, queriesMap.get(callingId),
+ toString == null
+ ? callingId.toString()
+ : toString.toString(callingId),
+ spacing, toString);
} else {
- dumpPackageSet(pw, filteringPackageName, queriesMap.get(callingPkg), callingPkg,
- spacing);
+ dumpPackageSet(
+ pw, filteringId, queriesMap.get(callingId),
+ toString == null
+ ? callingId.toString()
+ : toString.toString(callingId),
+ spacing, toString);
}
}
}
- private static void dumpPackageSet(PrintWriter pw, @Nullable String filteringPackageName,
- Set<String> targetPkgSet, String subTitle, String spacing) {
+ private interface ToString<T> {
+ String toString(T input);
+ }
+
+ private static <T> void dumpPackageSet(PrintWriter pw, @Nullable T filteringId,
+ Set<T> targetPkgSet, String subTitle, String spacing,
+ @Nullable ToString<T> toString) {
if (targetPkgSet != null && targetPkgSet.size() > 0
- && (filteringPackageName == null || targetPkgSet.contains(filteringPackageName))) {
+ && (filteringId == null || targetPkgSet.contains(filteringId))) {
pw.append(spacing).append(subTitle).println(":");
- for (String pkgName : targetPkgSet) {
- if (filteringPackageName == null || Objects.equals(filteringPackageName, pkgName)) {
- pw.append(spacing).append(" ").println(pkgName);
+ for (T item : targetPkgSet) {
+ if (filteringId == null || Objects.equals(filteringId, item)) {
+ pw.append(spacing).append(" ")
+ .println(toString == null ? item : toString.toString(item));
}
}
}
diff --git a/services/core/java/com/android/server/pm/InstallSource.java b/services/core/java/com/android/server/pm/InstallSource.java
index 990eba1..0541797 100644
--- a/services/core/java/com/android/server/pm/InstallSource.java
+++ b/services/core/java/com/android/server/pm/InstallSource.java
@@ -18,8 +18,6 @@
import android.annotation.Nullable;
-import com.android.internal.util.IndentingPrintWriter;
-
import java.util.Objects;
/**
@@ -31,13 +29,25 @@
* An instance of InstallSource representing an absence of knowledge of the source of
* a package. Used in preference to null.
*/
- static final InstallSource EMPTY = new InstallSource(null, null, false);
+ static final InstallSource EMPTY = new InstallSource(null, null, null, false);
+
+ /** We also memoize this case because it is common - all un-updated system apps. */
+ private static final InstallSource EMPTY_ORPHANED = new InstallSource(null, null, null, true);
/** The package that requested the installation, if known. */
@Nullable
final String initiatingPackageName;
/**
+ * The package on behalf of which the initiating package requested the installation, if any.
+ * For example if a downloaded APK is installed via the Package Installer this could be the
+ * app that performed the download. This value is provided by the initiating package and not
+ * verified by the framework.
+ */
+ @Nullable
+ final String originatingPackageName;
+
+ /**
* Package name of the app that installed this package (the installer of record). Note that
* this may be modified.
*/
@@ -48,47 +58,55 @@
final boolean isOrphaned;
static InstallSource create(@Nullable String initiatingPackageName,
- @Nullable String installerPackageName) {
- return create(initiatingPackageName, installerPackageName, false);
- }
-
- static InstallSource create(@Nullable String initiatingPackageName,
- @Nullable String installerPackageName, boolean isOrphaned) {
- if (initiatingPackageName == null && installerPackageName == null && !isOrphaned) {
- return EMPTY;
- }
- return new InstallSource(
- initiatingPackageName == null ? null : initiatingPackageName.intern(),
- installerPackageName == null ? null : installerPackageName.intern(),
+ @Nullable String originatingPackageName, @Nullable String installerPackageName,
+ boolean isOrphaned) {
+ return createInternal(
+ intern(initiatingPackageName),
+ intern(originatingPackageName),
+ intern(installerPackageName),
isOrphaned);
}
- private InstallSource(@Nullable String initiatingPackageName,
- @Nullable String installerPackageName, boolean isOrphaned) {
- this.initiatingPackageName = initiatingPackageName;
- this.isOrphaned = isOrphaned;
- this.installerPackageName = installerPackageName;
+ private static InstallSource createInternal(@Nullable String initiatingPackageName,
+ @Nullable String originatingPackageName, @Nullable String installerPackageName,
+ boolean isOrphaned) {
+ if (initiatingPackageName == null && originatingPackageName == null
+ && installerPackageName == null) {
+ return isOrphaned ? EMPTY_ORPHANED : EMPTY;
+ }
+ return new InstallSource(initiatingPackageName, originatingPackageName,
+ installerPackageName, isOrphaned);
}
- void dump(IndentingPrintWriter pw) {
- pw.printPair("installerPackageName", installerPackageName);
- pw.printPair("installInitiatingPackageName", initiatingPackageName);
+ private InstallSource(@Nullable String initiatingPackageName,
+ @Nullable String originatingPackageName, @Nullable String installerPackageName,
+ boolean isOrphaned) {
+ this.initiatingPackageName = initiatingPackageName;
+ this.originatingPackageName = originatingPackageName;
+ this.installerPackageName = installerPackageName;
+ this.isOrphaned = isOrphaned;
}
/**
* Return an InstallSource the same as this one except with the specified installerPackageName.
*/
InstallSource setInstallerPackage(String installerPackageName) {
- return Objects.equals(installerPackageName, this.installerPackageName) ? this
- : create(initiatingPackageName, installerPackageName, isOrphaned);
+ if (Objects.equals(installerPackageName, this.installerPackageName)) {
+ return this;
+ }
+ return createInternal(initiatingPackageName, originatingPackageName,
+ intern(installerPackageName), isOrphaned);
}
/**
* Return an InstallSource the same as this one except with the specified value for isOrphaned.
*/
InstallSource setIsOrphaned(boolean isOrphaned) {
- return isOrphaned == this.isOrphaned ? this
- : create(initiatingPackageName, installerPackageName, isOrphaned);
+ if (isOrphaned == this.isOrphaned) {
+ return this;
+ }
+ return createInternal(initiatingPackageName, originatingPackageName, installerPackageName,
+ isOrphaned);
}
/**
@@ -102,6 +120,7 @@
boolean modified = false;
String initiatingPackageName = this.initiatingPackageName;
+ String originatingPackageName = this.originatingPackageName;
String installerPackageName = this.installerPackageName;
boolean isOrphaned = this.isOrphaned;
@@ -109,14 +128,25 @@
initiatingPackageName = null;
modified = true;
}
+ if (packageName.equals(originatingPackageName)) {
+ originatingPackageName = null;
+ modified = true;
+ }
if (packageName.equals(installerPackageName)) {
installerPackageName = null;
isOrphaned = true;
modified = true;
}
- return modified
- ? create(initiatingPackageName, installerPackageName, isOrphaned)
- : this;
+ if (!modified) {
+ return this;
+ }
+ return createInternal(initiatingPackageName, originatingPackageName, installerPackageName,
+ isOrphaned);
+ }
+
+ @Nullable
+ private static String intern(@Nullable String packageName) {
+ return packageName == null ? null : packageName.intern();
}
}
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 2b6c347..bd95667 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -304,7 +304,7 @@
long ident = injectClearCallingIdentity();
try {
final UserInfo callingUserInfo = mUm.getUserInfo(callingUserId);
- if (callingUserInfo != null && callingUserInfo.isManagedProfile()) {
+ if (callingUserInfo != null && callingUserInfo.isProfile()) {
Slog.w(TAG, message + " for another profile "
+ targetUserId + " from " + callingUserId + " not allowed");
return false;
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index ed2bb3d5..93249e9 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -26,7 +26,6 @@
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PackageDeleteObserver;
-import android.app.PackageInstallObserver;
import android.app.admin.DevicePolicyEventLogger;
import android.app.admin.DevicePolicyManagerInternal;
import android.content.Context;
@@ -512,6 +511,16 @@
}
}
+ String originatingPackageName = null;
+ if (params.originatingUid != SessionParams.UID_UNKNOWN
+ && params.originatingUid != callingUid) {
+ String[] packages = mPm.getPackagesForUid(params.originatingUid);
+ if (packages != null && packages.length > 0) {
+ // Choose an arbitrary representative package in the case of a shared UID.
+ originatingPackageName = packages[0];
+ }
+ }
+
if (Build.IS_DEBUGGABLE || isDowngradeAllowedForCaller(callingUid)) {
params.installFlags |= PackageManager.INSTALL_ALLOW_DOWNGRADE;
} else {
@@ -624,7 +633,7 @@
}
}
InstallSource installSource = InstallSource.create(installerPackageName,
- requestedInstallerPackageName);
+ originatingPackageName, requestedInstallerPackageName, false);
session = new PackageInstallerSession(mInternalCallback, mContext, mPm, this,
mInstallThread.getLooper(), mStagingManager, sessionId, userId, callingUid,
installSource, params, createdMillis,
@@ -1005,73 +1014,56 @@
}
}
- static class PackageInstallObserverAdapter extends PackageInstallObserver {
- private final Context mContext;
- private final IntentSender mTarget;
- private final int mSessionId;
- private final boolean mShowNotification;
- private final int mUserId;
-
- public PackageInstallObserverAdapter(Context context, IntentSender target, int sessionId,
- boolean showNotification, int userId) {
- mContext = context;
- mTarget = target;
- mSessionId = sessionId;
- mShowNotification = showNotification;
- mUserId = userId;
+ static void sendOnUserActionRequired(Context context, IntentSender target, int sessionId,
+ Intent intent) {
+ final Intent fillIn = new Intent();
+ fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
+ PackageInstaller.STATUS_PENDING_USER_ACTION);
+ fillIn.putExtra(Intent.EXTRA_INTENT, intent);
+ try {
+ target.sendIntent(context, 0, fillIn, null, null);
+ } catch (SendIntentException ignored) {
}
+ }
- @Override
- public void onUserActionRequired(Intent intent) {
- final Intent fillIn = new Intent();
- fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, mSessionId);
- fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
- PackageInstaller.STATUS_PENDING_USER_ACTION);
- fillIn.putExtra(Intent.EXTRA_INTENT, intent);
- try {
- mTarget.sendIntent(mContext, 0, fillIn, null, null);
- } catch (SendIntentException ignored) {
+ static void sendOnPackageInstalled(Context context, IntentSender target, int sessionId,
+ boolean showNotification, int userId, String basePackageName, int returnCode,
+ String msg, Bundle extras) {
+ if (PackageManager.INSTALL_SUCCEEDED == returnCode && showNotification) {
+ boolean update = (extras != null) && extras.getBoolean(Intent.EXTRA_REPLACING);
+ Notification notification = buildSuccessNotification(context,
+ context.getResources()
+ .getString(update ? R.string.package_updated_device_owner :
+ R.string.package_installed_device_owner),
+ basePackageName,
+ userId);
+ if (notification != null) {
+ NotificationManager notificationManager = (NotificationManager)
+ context.getSystemService(Context.NOTIFICATION_SERVICE);
+ notificationManager.notify(basePackageName,
+ SystemMessage.NOTE_PACKAGE_STATE,
+ notification);
}
}
-
- @Override
- public void onPackageInstalled(String basePackageName, int returnCode, String msg,
- Bundle extras) {
- if (PackageManager.INSTALL_SUCCEEDED == returnCode && mShowNotification) {
- boolean update = (extras != null) && extras.getBoolean(Intent.EXTRA_REPLACING);
- Notification notification = buildSuccessNotification(mContext,
- mContext.getResources()
- .getString(update ? R.string.package_updated_device_owner :
- R.string.package_installed_device_owner),
- basePackageName,
- mUserId);
- if (notification != null) {
- NotificationManager notificationManager = (NotificationManager)
- mContext.getSystemService(Context.NOTIFICATION_SERVICE);
- notificationManager.notify(basePackageName,
- SystemMessage.NOTE_PACKAGE_STATE,
- notification);
- }
+ final Intent fillIn = new Intent();
+ fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, basePackageName);
+ fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
+ PackageManager.installStatusToPublicStatus(returnCode));
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE,
+ PackageManager.installStatusToString(returnCode, msg));
+ fillIn.putExtra(PackageInstaller.EXTRA_LEGACY_STATUS, returnCode);
+ if (extras != null) {
+ final String existing = extras.getString(
+ PackageManager.EXTRA_FAILURE_EXISTING_PACKAGE);
+ if (!TextUtils.isEmpty(existing)) {
+ fillIn.putExtra(PackageInstaller.EXTRA_OTHER_PACKAGE_NAME, existing);
}
- final Intent fillIn = new Intent();
- fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, basePackageName);
- fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, mSessionId);
- fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
- PackageManager.installStatusToPublicStatus(returnCode));
- fillIn.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE,
- PackageManager.installStatusToString(returnCode, msg));
- fillIn.putExtra(PackageInstaller.EXTRA_LEGACY_STATUS, returnCode);
- if (extras != null) {
- final String existing = extras.getString(
- PackageManager.EXTRA_FAILURE_EXISTING_PACKAGE);
- if (!TextUtils.isEmpty(existing)) {
- fillIn.putExtra(PackageInstaller.EXTRA_OTHER_PACKAGE_NAME, existing);
- }
- }
- try {
- mTarget.sendIntent(mContext, 0, fillIn, null, null);
- } catch (SendIntentException ignored) {
- }
+ }
+ try {
+ target.sendIntent(context, 0, fillIn, null, null);
+ } catch (SendIntentException ignored) {
}
}
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index feb1271..d5f4ff2 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -18,7 +18,6 @@
import static android.content.pm.PackageManager.INSTALL_FAILED_ABORTED;
import static android.content.pm.PackageManager.INSTALL_FAILED_BAD_SIGNATURE;
-import static android.content.pm.PackageManager.INSTALL_FAILED_CONTAINER_ERROR;
import static android.content.pm.PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;
import static android.content.pm.PackageManager.INSTALL_FAILED_INTERNAL_ERROR;
import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_APK;
@@ -79,7 +78,6 @@
import android.os.ParcelFileDescriptor;
import android.os.ParcelableException;
import android.os.Process;
-import android.os.RemoteException;
import android.os.RevocableFileDescriptor;
import android.os.SystemProperties;
import android.os.UserHandle;
@@ -107,7 +105,6 @@
import com.android.internal.util.Preconditions;
import com.android.server.LocalServices;
import com.android.server.pm.Installer.InstallerException;
-import com.android.server.pm.PackageInstallerService.PackageInstallObserverAdapter;
import com.android.server.pm.dex.DexManager;
import com.android.server.security.VerityUtils;
@@ -131,7 +128,7 @@
public class PackageInstallerSession extends IPackageInstallerSession.Stub {
private static final String TAG = "PackageInstallerSession";
private static final boolean LOGD = true;
- private static final String REMOVE_SPLIT_MARKER_EXTENSION = ".removed";
+ private static final String REMOVE_MARKER_EXTENSION = ".removed";
private static final int MSG_COMMIT = 1;
private static final int MSG_ON_PACKAGE_INSTALLED = 2;
@@ -148,6 +145,8 @@
private static final String ATTR_INSTALLER_UID = "installerUid";
private static final String ATTR_INITIATING_PACKAGE_NAME =
"installInitiatingPackageName";
+ private static final String ATTR_ORIGINATING_PACKAGE_NAME =
+ "installOriginatingPackageName";
private static final String ATTR_CREATED_MILLIS = "createdMillis";
private static final String ATTR_UPDATED_MILLIS = "updatedMillis";
private static final String ATTR_SESSION_STAGE_DIR = "sessionStageDir";
@@ -259,7 +258,7 @@
private final ArrayList<FileBridge> mBridges = new ArrayList<>();
@GuardedBy("mLock")
- private IPackageInstallObserver2 mRemoteObserver;
+ private IntentSender mRemoteStatusReceiver;
/** Fields derived from commit parsing */
@GuardedBy("mLock")
@@ -296,9 +295,6 @@
private File mResolvedBaseFile;
@GuardedBy("mLock")
- private File mResolvedStageDir;
-
- @GuardedBy("mLock")
private final List<File> mResolvedStagedFiles = new ArrayList<>();
@GuardedBy("mLock")
private final List<File> mResolvedInheritedFiles = new ArrayList<>();
@@ -317,7 +313,7 @@
// Installers can't stage directories, so it's fine to ignore
// entries like "lost+found".
if (file.isDirectory()) return false;
- if (file.getName().endsWith(REMOVE_SPLIT_MARKER_EXTENSION)) return false;
+ if (file.getName().endsWith(REMOVE_MARKER_EXTENSION)) return false;
if (DexMetadataHelper.isDexMetadataFile(file)) return false;
if (VerityUtils.isFsveritySignatureFile(file)) return false;
return true;
@@ -327,7 +323,7 @@
@Override
public boolean accept(File file) {
if (file.isDirectory()) return false;
- if (!file.getName().endsWith(REMOVE_SPLIT_MARKER_EXTENSION)) return false;
+ if (!file.getName().endsWith(REMOVE_MARKER_EXTENSION)) return false;
return true;
}
};
@@ -344,14 +340,14 @@
final String packageName = (String) args.arg1;
final String message = (String) args.arg2;
final Bundle extras = (Bundle) args.arg3;
- final IPackageInstallObserver2 observer = (IPackageInstallObserver2) args.arg4;
+ final IntentSender statusReceiver = (IntentSender) args.arg4;
final int returnCode = args.argi1;
args.recycle();
- try {
- observer.onPackageInstalled(packageName, returnCode, message, extras);
- } catch (RemoteException ignored) {
- }
+ PackageInstallerService.sendOnPackageInstalled(mContext,
+ statusReceiver, sessionId,
+ isInstallerDeviceOwnerOrAffiliatedProfileOwnerLocked(), userId,
+ packageName, returnCode, message, extras);
break;
}
@@ -562,23 +558,6 @@
}
}
- /**
- * Resolve the actual location where staged data should be written. This
- * might point at an ASEC mount point, which is why we delay path resolution
- * until someone actively works with the session.
- */
- @GuardedBy("mLock")
- private File resolveStageDirLocked() throws IOException {
- if (mResolvedStageDir == null) {
- if (stageDir != null) {
- mResolvedStageDir = stageDir;
- } else {
- throw new IOException("Missing stageDir");
- }
- }
- return mResolvedStageDir;
- }
-
@Override
public void setClientProgress(float progress) {
synchronized (mLock) {
@@ -618,14 +597,32 @@
assertCallerIsOwnerOrRootLocked();
assertPreparedAndNotCommittedOrDestroyedLocked("getNames");
- try {
- return resolveStageDirLocked().list();
- } catch (IOException e) {
- throw ExceptionUtils.wrap(e);
- }
+ return getNamesLocked();
}
}
+ @GuardedBy("mLock")
+ private String[] getNamesLocked() {
+ return stageDir.list();
+ }
+
+ private static File[] filterFiles(File parent, String[] names, FileFilter filter) {
+ return Arrays.stream(names).map(name -> new File(parent, name)).filter(
+ file -> filter.accept(file)).toArray(File[]::new);
+ }
+
+ @GuardedBy("mLock")
+ private File[] getAddedFilesLocked() {
+ String[] names = getNamesLocked();
+ return filterFiles(stageDir, names, sAddedFilter);
+ }
+
+ @GuardedBy("mLock")
+ private File[] getRemovedFilesLocked() {
+ String[] names = getNamesLocked();
+ return filterFiles(stageDir, names, sRemovedFilter);
+ }
+
@Override
public void removeSplit(String splitName) {
if (TextUtils.isEmpty(params.appPackageName)) {
@@ -644,13 +641,17 @@
}
}
+ private static String getRemoveMarkerName(String name) {
+ final String markerName = name + REMOVE_MARKER_EXTENSION;
+ if (!FileUtils.isValidExtFilename(markerName)) {
+ throw new IllegalArgumentException("Invalid marker: " + markerName);
+ }
+ return markerName;
+ }
+
private void createRemoveSplitMarkerLocked(String splitName) throws IOException {
try {
- final String markerName = splitName + REMOVE_SPLIT_MARKER_EXTENSION;
- if (!FileUtils.isValidExtFilename(markerName)) {
- throw new IllegalArgumentException("Invalid marker: " + markerName);
- }
- final File target = new File(resolveStageDirLocked(), markerName);
+ final File target = new File(stageDir, getRemoveMarkerName(splitName));
target.createNewFile();
Os.chmod(target.getAbsolutePath(), 0 /*mode*/);
} catch (ErrnoException e) {
@@ -684,7 +685,6 @@
// will block any attempted install transitions.
final RevocableFileDescriptor fd;
final FileBridge bridge;
- final File stageDir;
synchronized (mLock) {
assertCallerIsOwnerOrRootLocked();
assertPreparedAndNotSealedLocked("openWrite");
@@ -698,8 +698,6 @@
bridge = new FileBridge();
mBridges.add(bridge);
}
-
- stageDir = resolveStageDirLocked();
}
try {
@@ -805,7 +803,7 @@
if (!FileUtils.isValidExtFilename(name)) {
throw new IllegalArgumentException("Invalid name: " + name);
}
- final File target = new File(resolveStageDirLocked(), name);
+ final File target = new File(stageDir, name);
final FileDescriptor targetFd = Os.open(target.getAbsolutePath(), O_RDONLY, 0);
return new ParcelFileDescriptor(targetFd);
} catch (ErrnoException e) {
@@ -951,7 +949,7 @@
* This method may be called multiple times to update the status receiver validate caller
* permissions.
*/
- public boolean markAsCommitted(
+ private boolean markAsCommitted(
@NonNull IntentSender statusReceiver, boolean forTransfer) {
Preconditions.checkNotNull(statusReceiver);
@@ -962,10 +960,7 @@
assertCallerIsOwnerOrRootLocked();
assertPreparedAndNotDestroyedLocked("commit");
- final PackageInstallObserverAdapter adapter = new PackageInstallObserverAdapter(
- mContext, statusReceiver, sessionId,
- isInstallerDeviceOwnerOrAffiliatedProfileOwnerLocked(), userId);
- mRemoteObserver = adapter.getBinder();
+ mRemoteStatusReceiver = statusReceiver;
if (forTransfer) {
mContext.enforceCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES, null);
@@ -989,12 +984,7 @@
if (!mSealed) {
try {
sealAndValidateLocked(childSessions);
- } catch (IOException e) {
- throw new IllegalArgumentException(e);
} catch (PackageManagerException e) {
- // Do now throw an exception here to stay compatible with O and older
- destroyInternal();
- dispatchSessionFinished(e.error, ExceptionUtils.getCompleteMessage(e), null);
return false;
}
}
@@ -1094,52 +1084,59 @@
*/
@GuardedBy("mLock")
private void sealAndValidateLocked(List<PackageInstallerSession> childSessions)
- throws PackageManagerException, IOException {
- assertNoWriteFileTransfersOpenLocked();
- assertPreparedAndNotDestroyedLocked("sealing of session");
+ throws PackageManagerException {
+ try {
+ assertNoWriteFileTransfersOpenLocked();
+ assertPreparedAndNotDestroyedLocked("sealing of session");
- mSealed = true;
+ mSealed = true;
- if (childSessions != null) {
- assertMultiPackageConsistencyLocked(childSessions);
- }
-
- if (params.isStaged) {
- final PackageInstallerSession activeSession = mStagingManager.getActiveSession();
- final boolean anotherSessionAlreadyInProgress =
- activeSession != null && sessionId != activeSession.sessionId
- && mParentSessionId != activeSession.sessionId;
- if (anotherSessionAlreadyInProgress) {
- throw new PackageManagerException(
- PackageManager.INSTALL_FAILED_OTHER_STAGED_SESSION_IN_PROGRESS,
- "There is already in-progress committed staged session "
- + activeSession.sessionId, null);
+ if (childSessions != null) {
+ assertMultiPackageConsistencyLocked(childSessions);
}
- }
- // Read transfers from the original owner stay open, but as the session's data
- // cannot be modified anymore, there is no leak of information. For staged sessions,
- // further validation is performed by the staging manager.
- if (!params.isMultiPackage) {
- final PackageInfo pkgInfo = mPm.getPackageInfo(
- params.appPackageName, PackageManager.GET_SIGNATURES
- | PackageManager.MATCH_STATIC_SHARED_LIBRARIES /*flags*/, userId);
-
- resolveStageDirLocked();
-
- try {
- if ((params.installFlags & PackageManager.INSTALL_APEX) != 0) {
- validateApexInstallLocked();
- } else {
- validateApkInstallLocked(pkgInfo);
+ if (params.isStaged) {
+ final PackageInstallerSession activeSession = mStagingManager.getActiveSession();
+ final boolean anotherSessionAlreadyInProgress =
+ activeSession != null && sessionId != activeSession.sessionId
+ && mParentSessionId != activeSession.sessionId;
+ if (anotherSessionAlreadyInProgress) {
+ throw new PackageManagerException(
+ PackageManager.INSTALL_FAILED_OTHER_STAGED_SESSION_IN_PROGRESS,
+ "There is already in-progress committed staged session "
+ + activeSession.sessionId, null);
}
- } catch (PackageManagerException e) {
- throw e;
- } catch (Throwable e) {
- // Convert all exceptions into package manager exceptions as only those are handled
- // in the code above
- throw new PackageManagerException(e);
}
+
+ // Read transfers from the original owner stay open, but as the session's data
+ // cannot be modified anymore, there is no leak of information. For staged sessions,
+ // further validation is performed by the staging manager.
+ if (!params.isMultiPackage) {
+ final PackageInfo pkgInfo = mPm.getPackageInfo(
+ params.appPackageName, PackageManager.GET_SIGNATURES
+ | PackageManager.MATCH_STATIC_SHARED_LIBRARIES /*flags*/, userId);
+
+ try {
+ if ((params.installFlags & PackageManager.INSTALL_APEX) != 0) {
+ validateApexInstallLocked();
+ } else {
+ validateApkInstallLocked(pkgInfo);
+ }
+ } catch (PackageManagerException e) {
+ throw e;
+ } catch (Throwable e) {
+ // Convert all exceptions into package manager exceptions as only those are
+ // handled in the code above.
+ throw new PackageManagerException(e);
+ }
+ }
+ } catch (PackageManagerException e) {
+ // Session is sealed but could not be verified, we need to destroy it.
+ destroyInternal();
+ // Dispatch message to remove session from PackageInstallerService
+ dispatchSessionFinished(
+ e.error, ExceptionUtils.getCompleteMessage(e), null);
+ throw e;
}
}
@@ -1162,15 +1159,8 @@
synchronized (mLock) {
try {
sealAndValidateLocked(childSessions);
- } catch (IOException e) {
- throw new IllegalStateException(e);
} catch (PackageManagerException e) {
Slog.e(TAG, "Package not valid", e);
- // Session is sealed but could not be verified, we need to destroy it.
- destroyInternal();
- // Dispatch message to remove session from PackageInstallerService
- dispatchSessionFinished(
- e.error, ExceptionUtils.getCompleteMessage(e), null);
}
}
}
@@ -1211,13 +1201,7 @@
try {
sealAndValidateLocked(childSessions);
- } catch (IOException e) {
- throw new IllegalStateException(e);
} catch (PackageManagerException e) {
- // Session is sealed but could not be verified, we need to destroy it
- destroyInternal();
- dispatchSessionFinished(e.error, ExceptionUtils.getCompleteMessage(e), null);
-
throw new IllegalArgumentException("Package is not valid", e);
}
@@ -1227,7 +1211,7 @@
}
mInstallerUid = newOwnerAppInfo.uid;
- mInstallSource = InstallSource.create(packageName, packageName);
+ mInstallSource = InstallSource.create(packageName, null, packageName, false);
}
// Persist the fact that we've sealed ourselves to prevent
@@ -1302,11 +1286,10 @@
}
}
if (!success) {
- try {
- mRemoteObserver.onPackageInstalled(
- null, failure.error, failure.getLocalizedMessage(), null);
- } catch (RemoteException ignored) {
- }
+ PackageInstallerService.sendOnPackageInstalled(mContext,
+ mRemoteStatusReceiver, sessionId,
+ isInstallerDeviceOwnerOrAffiliatedProfileOwnerLocked(), userId, null,
+ failure.error, failure.getLocalizedMessage(), null);
return;
}
mPm.installStage(activeChildSessions);
@@ -1350,10 +1333,9 @@
final Intent intent = new Intent(PackageInstaller.ACTION_CONFIRM_INSTALL);
intent.setPackage(mPm.getPackageInstallerPackageName());
intent.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);
- try {
- mRemoteObserver.onUserActionRequired(intent);
- } catch (RemoteException ignored) {
- }
+
+ PackageInstallerService.sendOnUserActionRequired(mContext,
+ mRemoteStatusReceiver, sessionId, intent);
// Commit was keeping session marked as active until now; release
// that extra refcount so session appears idle.
@@ -1366,7 +1348,7 @@
if (params.mode == SessionParams.MODE_INHERIT_EXISTING) {
try {
final List<File> fromFiles = mResolvedInheritedFiles;
- final File toDir = resolveStageDirLocked();
+ final File toDir = stageDir;
if (LOGD) Slog.d(TAG, "Inherited files: " + mResolvedInheritedFiles);
if (!mResolvedInheritedFiles.isEmpty() && mInheritedFilesBase == null) {
@@ -1416,8 +1398,7 @@
computeProgressLocked(true);
// Unpack native libraries
- extractNativeLibraries(mResolvedStageDir, params.abiOverride,
- mayInheritNativeLibs());
+ extractNativeLibraries(stageDir, params.abiOverride, mayInheritNativeLibs());
}
// We've reached point of no return; call into PMS to install the stage.
@@ -1477,7 +1458,7 @@
@GuardedBy("mLock")
private void validateApexInstallLocked()
throws PackageManagerException {
- final File[] addedFiles = mResolvedStageDir.listFiles(sAddedFilter);
+ final File[] addedFiles = getAddedFilesLocked();
if (ArrayUtils.isEmpty(addedFiles)) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");
}
@@ -1487,13 +1468,6 @@
"Too many files for apex install");
}
- try {
- resolveStageDirLocked();
- } catch (IOException e) {
- throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,
- "Failed to resolve stage location", e);
- }
-
File addedFile = addedFiles[0]; // there is only one file
// Ensure file name has proper suffix
@@ -1506,7 +1480,7 @@
"Invalid filename: " + targetName);
}
- final File targetFile = new File(mResolvedStageDir, targetName);
+ final File targetFile = new File(stageDir, targetName);
resolveAndStageFile(addedFile, targetFile);
mResolvedBaseFile = targetFile;
@@ -1547,25 +1521,18 @@
&& params.mode == SessionParams.MODE_INHERIT_EXISTING
&& VerityUtils.hasFsverity(pkgInfo.applicationInfo.getBaseCodePath());
- try {
- resolveStageDirLocked();
- } catch (IOException e) {
- throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,
- "Failed to resolve stage location", e);
- }
-
- final File[] removedFiles = mResolvedStageDir.listFiles(sRemovedFilter);
+ final File[] removedFiles = getRemovedFilesLocked();
final List<String> removeSplitList = new ArrayList<>();
if (!ArrayUtils.isEmpty(removedFiles)) {
for (File removedFile : removedFiles) {
final String fileName = removedFile.getName();
final String splitName = fileName.substring(
- 0, fileName.length() - REMOVE_SPLIT_MARKER_EXTENSION.length());
+ 0, fileName.length() - REMOVE_MARKER_EXTENSION.length());
removeSplitList.add(splitName);
}
}
- final File[] addedFiles = mResolvedStageDir.listFiles(sAddedFilter);
+ final File[] addedFiles = getAddedFilesLocked();
if (ArrayUtils.isEmpty(addedFiles) && removeSplitList.size() == 0) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");
}
@@ -1609,7 +1576,7 @@
"Invalid filename: " + targetName);
}
- final File targetFile = new File(mResolvedStageDir, targetName);
+ final File targetFile = new File(stageDir, targetName);
resolveAndStageFile(addedFile, targetFile);
// Base is coming from session
@@ -1624,7 +1591,7 @@
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
"Invalid filename: " + dexMetadataFile);
}
- final File targetDexMetadataFile = new File(mResolvedStageDir,
+ final File targetDexMetadataFile = new File(stageDir,
DexMetadataHelper.buildDexMetadataPathForApk(targetName));
resolveAndStageFile(dexMetadataFile, targetDexMetadataFile);
}
@@ -2184,17 +2151,17 @@
}
private void dispatchSessionFinished(int returnCode, String msg, Bundle extras) {
- final IPackageInstallObserver2 observer;
+ final IntentSender statusReceiver;
final String packageName;
synchronized (mLock) {
mFinalStatus = returnCode;
mFinalMessage = msg;
- observer = mRemoteObserver;
+ statusReceiver = mRemoteStatusReceiver;
packageName = mPackageName;
}
- if (observer != null) {
+ if (statusReceiver != null) {
// Execute observer.onPackageInstalled on different tread as we don't want callers
// inside the system server have to worry about catching the callbacks while they are
// calling into the session
@@ -2202,7 +2169,7 @@
args.arg1 = packageName;
args.arg2 = msg;
args.arg3 = extras;
- args.arg4 = observer;
+ args.arg4 = statusReceiver;
args.argi1 = returnCode;
mHandler.obtainMessage(MSG_ON_PACKAGE_INSTALLED, args).sendToTarget();
@@ -2211,8 +2178,10 @@
final boolean success = (returnCode == PackageManager.INSTALL_SUCCEEDED);
// Send broadcast to default launcher only if it's a new install
+ // TODO(b/144270665): Secure the usage of this broadcast.
final boolean isNewInstall = extras == null || !extras.getBoolean(Intent.EXTRA_REPLACING);
- if (success && isNewInstall && mPm.mInstallerService.okToSendBroadcasts()) {
+ if (success && isNewInstall && mPm.mInstallerService.okToSendBroadcasts()
+ && (params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
mPm.sendSessionCommitBroadcast(generateInfo(), userId);
}
@@ -2336,7 +2305,9 @@
pw.printPair("userId", userId);
pw.printPair("mOriginalInstallerUid", mOriginalInstallerUid);
- mInstallSource.dump(pw);
+ pw.printPair("installerPackageName", mInstallSource.installerPackageName);
+ pw.printPair("installInitiatingPackageName", mInstallSource.initiatingPackageName);
+ pw.printPair("installOriginatingPackageName", mInstallSource.originatingPackageName);
pw.printPair("mInstallerUid", mInstallerUid);
pw.printPair("createdMillis", createdMillis);
pw.printPair("updatedMillis", updatedMillis);
@@ -2420,6 +2391,8 @@
writeIntAttribute(out, ATTR_INSTALLER_UID, mInstallerUid);
writeStringAttribute(out, ATTR_INITIATING_PACKAGE_NAME,
mInstallSource.initiatingPackageName);
+ writeStringAttribute(out, ATTR_ORIGINATING_PACKAGE_NAME,
+ mInstallSource.originatingPackageName);
writeLongAttribute(out, ATTR_CREATED_MILLIS, createdMillis);
writeLongAttribute(out, ATTR_UPDATED_MILLIS, updatedMillis);
if (stageDir != null) {
@@ -2527,6 +2500,8 @@
installerPackageName, PackageManager.MATCH_UNINSTALLED_PACKAGES, userId));
final String installInitiatingPackageName =
readStringAttribute(in, ATTR_INITIATING_PACKAGE_NAME);
+ final String installOriginatingPackageName =
+ readStringAttribute(in, ATTR_ORIGINATING_PACKAGE_NAME);
final long createdMillis = readLongAttribute(in, ATTR_CREATED_MILLIS);
long updatedMillis = readLongAttribute(in, ATTR_UPDATED_MILLIS);
final String stageDirRaw = readStringAttribute(in, ATTR_SESSION_STAGE_DIR);
@@ -2619,7 +2594,7 @@
}
InstallSource installSource = InstallSource.create(installInitiatingPackageName,
- installerPackageName);
+ installOriginatingPackageName, installerPackageName, false);
return new PackageInstallerSession(callback, context, pm, sessionProvider,
installerThread, stagingManager, sessionId, userId, installerUid,
installSource, params, createdMillis, stageDir, stageCid,
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index fe82f7c..fa98c96 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -11701,7 +11701,7 @@
ksms.addScannedPackageLPw(pkg);
mComponentResolver.addAllComponents(pkg, chatty);
- mAppsFilter.addPackage(pkg, mPackages);
+ mAppsFilter.addPackage(pkgSetting, mSettings.mPackages);
// Don't allow ephemeral applications to define new permissions groups.
if ((scanFlags & SCAN_AS_INSTANT_APP) != 0) {
@@ -11889,31 +11889,10 @@
}
}
- void removeInstalledPackageLI(PackageParser.Package pkg, boolean chatty) {
- if (DEBUG_INSTALL) {
- if (chatty)
- Log.d(TAG, "Removing package " + pkg.applicationInfo.packageName);
- }
-
- // writer
- synchronized (mLock) {
- // Remove the parent package
- mPackages.remove(pkg.applicationInfo.packageName);
- cleanPackageDataStructuresLILPw(pkg, chatty);
-
- // Remove the child packages
- final int childCount = (pkg.childPackages != null) ? pkg.childPackages.size() : 0;
- for (int i = 0; i < childCount; i++) {
- PackageParser.Package childPkg = pkg.childPackages.get(i);
- mPackages.remove(childPkg.applicationInfo.packageName);
- cleanPackageDataStructuresLILPw(childPkg, chatty);
- }
- }
- }
-
void cleanPackageDataStructuresLILPw(PackageParser.Package pkg, boolean chatty) {
mComponentResolver.removeAllComponents(pkg, chatty);
- mAppsFilter.removePackage(pkg.packageName);
+ mAppsFilter.removePackage((PackageSetting) pkg.mExtras,
+ mInjector.getUserManagerInternal().getUserIds(), mSettings.mPackages);
mPermissionManager.removeAllPermissions(pkg, chatty);
final int instrumentationSize = pkg.instrumentation.size();
@@ -20861,7 +20840,11 @@
}
if (dumpState.isDumping(DumpState.DUMP_QUERIES)) {
- mAppsFilter.dumpQueries(pw, packageName, dumpState, mUserManager.getUserIds());
+ final PackageSetting setting = mSettings.getPackageLPr(packageName);
+ Integer filteringAppId = setting == null ? null : setting.appId;
+ mAppsFilter.dumpQueries(
+ pw, this, filteringAppId, dumpState,
+ mUserManager.getUserIds());
}
if (dumpState.isDumping(DumpState.DUMP_SHARED_USERS)) {
@@ -23195,8 +23178,9 @@
int callingUid, int targetAppId) {
synchronized (mLock) {
final PackageParser.Package callingPackage = getPackage(callingUid);
+ final int targetUid = UserHandle.getUid(userId, targetAppId);
final PackageParser.Package targetPackage =
- getPackage(UserHandle.getUid(userId, targetAppId));
+ getPackage(targetUid);
if (callingPackage == null || targetPackage == null) {
return;
}
@@ -23207,8 +23191,7 @@
mInstantAppRegistry.grantInstantAccessLPw(userId, intent,
UserHandle.getAppId(callingUid), targetAppId);
} else {
- mAppsFilter.grantImplicitAccess(
- callingPackage.packageName, targetPackage.packageName, userId);
+ mAppsFilter.grantImplicitAccess(callingUid, targetUid);
}
}
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index f1c84b8..232374c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -115,6 +115,7 @@
import java.io.PrintWriter;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
@@ -438,8 +439,14 @@
}
}
- private void setParamsSize(InstallParams params, String inPath) {
- if (params.sessionParams.sizeBytes == -1 && !STDIN_PATH.equals(inPath)) {
+ private void setParamsSize(InstallParams params, List<String> inPaths) {
+ if (params.sessionParams.sizeBytes != -1 || STDIN_PATH.equals(inPaths.get(0))) {
+ return;
+ }
+
+ long sessionSize = 0;
+
+ for (String inPath : inPaths) {
final ParcelFileDescriptor fd = openFileForSystem(inPath, "r");
if (fd == null) {
getErrPrintWriter().println("Error: Can't open file: " + inPath);
@@ -449,8 +456,8 @@
ApkLite baseApk = PackageParser.parseApkLite(fd.getFileDescriptor(), inPath, 0);
PackageLite pkgLite = new PackageLite(null, baseApk, null, null, null, null,
null, null);
- params.sessionParams.setSize(PackageHelper.calculateInstalledSize(
- pkgLite, params.sessionParams.abiOverride, fd.getFileDescriptor()));
+ sessionSize += PackageHelper.calculateInstalledSize(pkgLite,
+ params.sessionParams.abiOverride, fd.getFileDescriptor());
} catch (PackageParserException | IOException e) {
getErrPrintWriter().println("Error: Failed to parse APK file: " + inPath);
throw new IllegalArgumentException(
@@ -462,6 +469,7 @@
}
}
}
+ params.sessionParams.setSize(sessionSize);
}
/**
* Displays the package file for a package.
@@ -1148,23 +1156,44 @@
private int runInstall() throws RemoteException {
final PrintWriter pw = getOutPrintWriter();
final InstallParams params = makeInstallParams();
- final String inPath = getNextArg();
- setParamsSize(params, inPath);
+ ArrayList<String> inPaths = getRemainingArgs();
+ if (inPaths.isEmpty()) {
+ inPaths.add(STDIN_PATH);
+ }
+
+ final boolean hasSplits = inPaths.size() > 1;
+
+ if (STDIN_PATH.equals(inPaths.get(0))) {
+ if (hasSplits) {
+ pw.println("Error: can't specify SPLIT(s) along with STDIN");
+ return 1;
+ }
+ if (params.sessionParams.sizeBytes == -1) {
+ pw.println("Error: must either specify a package size or an APK file");
+ return 1;
+ }
+ }
+
+ final boolean isApex =
+ (params.sessionParams.installFlags & PackageManager.INSTALL_APEX) != 0;
+ if (isApex && hasSplits) {
+ pw.println("Error: can't specify SPLIT(s) for APEX");
+ return 1;
+ }
+
+ setParamsSize(params, inPaths);
final int sessionId = doCreateSession(params.sessionParams,
params.installerPackageName, params.userId);
boolean abandonSession = true;
try {
- if (inPath == null && params.sessionParams.sizeBytes == -1) {
- pw.println("Error: must either specify a package size or an APK file");
- return 1;
- }
- final boolean isApex =
- (params.sessionParams.installFlags & PackageManager.INSTALL_APEX) != 0;
- String splitName = "base." + (isApex ? "apex" : "apk");
- if (doWriteSplit(sessionId, inPath, params.sessionParams.sizeBytes, splitName,
- false /*logSuccess*/) != PackageInstaller.STATUS_SUCCESS) {
- return 1;
+ for (String inPath : inPaths) {
+ String splitName = hasSplits ? (new File(inPath)).getName()
+ : "base." + (isApex ? "apex" : "apk");
+ if (doWriteSplit(sessionId, inPath, params.sessionParams.sizeBytes, splitName,
+ false /*logSuccess*/) != PackageInstaller.STATUS_SUCCESS) {
+ return 1;
+ }
}
if (doCommitSession(sessionId, false /*logSuccess*/)
!= PackageInstaller.STATUS_SUCCESS) {
@@ -1283,12 +1312,12 @@
final int sessionId = Integer.parseInt(getNextArg());
- final String splitName = getNextArg();
- if (splitName == null) {
+ ArrayList<String> splitNames = getRemainingArgs();
+ if (splitNames.isEmpty()) {
pw.println("Error: split name not specified");
return 1;
}
- return doRemoveSplit(sessionId, splitName, true /*logSuccess*/);
+ return doRemoveSplits(sessionId, splitNames, true /*logSuccess*/);
}
private int runInstallExisting() throws RemoteException {
@@ -1731,6 +1760,15 @@
return 0;
}
+ private ArrayList<String> getRemainingArgs() {
+ ArrayList<String> args = new ArrayList<>();
+ String arg;
+ while ((arg = getNextArg()) != null) {
+ args.add(arg);
+ }
+ return args;
+ }
+
private static class SnapshotRuntimeProfileCallback
extends ISnapshotRuntimeProfileCallback.Stub {
private boolean mSuccess = false;
@@ -1802,9 +1840,9 @@
}
// if a split is specified, just remove it and not the whole package
- final String splitName = getNextArg();
- if (splitName != null) {
- return runRemoveSplit(packageName, splitName);
+ ArrayList<String> splitNames = getRemainingArgs();
+ if (!splitNames.isEmpty()) {
+ return runRemoveSplits(packageName, splitNames);
}
userId = translateUserId(userId, true /*allowAll*/, "runUninstall");
@@ -1852,7 +1890,8 @@
}
}
- private int runRemoveSplit(String packageName, String splitName) throws RemoteException {
+ private int runRemoveSplits(String packageName, Collection<String> splitNames)
+ throws RemoteException {
final PrintWriter pw = getOutPrintWriter();
final SessionParams sessionParams = new SessionParams(SessionParams.MODE_INHERIT_EXISTING);
sessionParams.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;
@@ -1861,7 +1900,7 @@
doCreateSession(sessionParams, null /*installerPackageName*/, UserHandle.USER_ALL);
boolean abandonSession = true;
try {
- if (doRemoveSplit(sessionId, splitName, false /*logSuccess*/)
+ if (doRemoveSplits(sessionId, splitNames, false /*logSuccess*/)
!= PackageInstaller.STATUS_SUCCESS) {
return 1;
}
@@ -2414,27 +2453,40 @@
String name;
int userId = -1;
int flags = 0;
+ String userType = null;
String opt;
boolean preCreateOnly = false;
while ((opt = getNextOption()) != null) {
+ String newUserType = null;
if ("--profileOf".equals(opt)) {
userId = UserHandle.parseUserArg(getNextArgRequired());
} else if ("--managed".equals(opt)) {
- flags |= UserInfo.FLAG_MANAGED_PROFILE;
+ newUserType = UserManager.USER_TYPE_PROFILE_MANAGED;
} else if ("--restricted".equals(opt)) {
- flags |= UserInfo.FLAG_RESTRICTED;
+ newUserType = UserManager.USER_TYPE_FULL_RESTRICTED;
+ } else if ("--guest".equals(opt)) {
+ newUserType = UserManager.USER_TYPE_FULL_GUEST;
+ } else if ("--demo".equals(opt)) {
+ newUserType = UserManager.USER_TYPE_FULL_DEMO;
} else if ("--ephemeral".equals(opt)) {
flags |= UserInfo.FLAG_EPHEMERAL;
- } else if ("--guest".equals(opt)) {
- flags |= UserInfo.FLAG_GUEST;
- } else if ("--demo".equals(opt)) {
- flags |= UserInfo.FLAG_DEMO;
} else if ("--pre-create-only".equals(opt)) {
preCreateOnly = true;
+ } else if ("--user-type".equals(opt)) {
+ newUserType = getNextArgRequired();
} else {
getErrPrintWriter().println("Error: unknown option " + opt);
return 1;
}
+ // Ensure only one user-type was specified.
+ if (newUserType != null) {
+ if (userType != null && !userType.equals(newUserType)) {
+ getErrPrintWriter().println("Error: more than one user type was specified ("
+ + userType + " and " + newUserType + ")");
+ return 1;
+ }
+ userType = newUserType;
+ }
}
String arg = getNextArg();
if (arg == null && !preCreateOnly) {
@@ -2451,16 +2503,20 @@
ServiceManager.getService(Context.USER_SERVICE));
IAccountManager accm = IAccountManager.Stub.asInterface(
ServiceManager.getService(Context.ACCOUNT_SERVICE));
- if ((flags & UserInfo.FLAG_RESTRICTED) != 0) {
+ if (userType == null) {
+ userType = UserInfo.getDefaultUserType(flags);
+ }
+ if (UserManager.isUserTypeRestricted(userType)) {
// In non-split user mode, userId can only be SYSTEM
int parentUserId = userId >= 0 ? userId : UserHandle.USER_SYSTEM;
info = um.createRestrictedProfile(name, parentUserId);
accm.addSharedAccountsFromParentUser(parentUserId, userId,
(Process.myUid() == Process.ROOT_UID) ? "root" : "com.android.shell");
} else if (userId < 0) {
- info = preCreateOnly ? um.preCreateUser(flags) : um.createUser(name, flags);
+ info = preCreateOnly ?
+ um.preCreateUser(userType) : um.createUser(name, userType, flags);
} else {
- info = um.createProfileForUser(name, flags, userId, null);
+ info = um.createProfileForUser(name, userType, flags, userId, null);
}
if (info != null) {
@@ -2945,14 +3001,17 @@
}
}
- private int doRemoveSplit(int sessionId, String splitName, boolean logSuccess)
+ private int doRemoveSplits(int sessionId, Collection<String> splitNames, boolean logSuccess)
throws RemoteException {
final PrintWriter pw = getOutPrintWriter();
PackageInstaller.Session session = null;
try {
session = new PackageInstaller.Session(
mInterface.getPackageInstaller().openSession(sessionId));
- session.removeSplit(splitName);
+
+ for (String splitName : splitNames) {
+ session.removeSplit(splitName);
+ }
if (logSuccess) {
pw.println("Success");
@@ -3237,9 +3296,9 @@
pw.println(" [--enable-rollback]");
pw.println(" [--force-uuid internal|UUID] [--pkg PACKAGE] [-S BYTES]");
pw.println(" [--apex] [--wait TIMEOUT]");
- pw.println(" [PATH|-]");
- pw.println(" Install an application. Must provide the apk data to install, either as a");
- pw.println(" file path or '-' to read from stdin. Options are:");
+ pw.println(" [PATH [SPLIT...]|-]");
+ pw.println(" Install an application. Must provide the apk data to install, either as");
+ pw.println(" file path(s) or '-' to read from stdin. Options are:");
pw.println(" -R: disallow replacement of existing application");
pw.println(" -t: allow test packages");
pw.println(" -i: specify package name of installer owning the app");
@@ -3293,6 +3352,9 @@
pw.println(" will be read from stdin. Options are:");
pw.println(" -S: size in bytes of package, required for stdin");
pw.println("");
+ pw.println(" install-remove SESSION_ID SPLIT...");
+ pw.println(" Mark SPLIT(s) as removed in the given install session.");
+ pw.println("");
pw.println(" install-add-session MULTI_PACKAGE_SESSION_ID CHILD_SESSION_IDs");
pw.println(" Add one or more session IDs to a multi-package session.");
pw.println("");
@@ -3317,9 +3379,10 @@
pw.println("");
pw.println(" move-primary-storage [internal|UUID]");
pw.println("");
- pw.println(" pm uninstall [-k] [--user USER_ID] [--versionCode VERSION_CODE] PACKAGE [SPLIT]");
+ pw.println(" uninstall [-k] [--user USER_ID] [--versionCode VERSION_CODE]");
+ pw.println(" PACKAGE [SPLIT...]");
pw.println(" Remove the given package name from the system. May remove an entire app");
- pw.println(" if no SPLIT name is specified, otherwise will remove only the split of the");
+ pw.println(" if no SPLIT names specified, otherwise will remove only the splits of the");
pw.println(" given app. Options are:");
pw.println(" -k: keep the data and cache directories around after package removal.");
pw.println(" --user: remove the app from the given user.");
@@ -3375,9 +3438,15 @@
pw.println(" Lists the current users.");
pw.println("");
pw.println(" create-user [--profileOf USER_ID] [--managed] [--restricted] [--ephemeral]");
- pw.println(" [--guest] [--pre-create-only] USER_NAME");
+ pw.println(" [--guest] [--pre-create-only] [--user-type USER_TYPE] USER_NAME");
pw.println(" Create a new user with the given USER_NAME, printing the new user identifier");
pw.println(" of the user.");
+ // TODO(b/142482943): Consider fetching the list of user types from UMS.
+ pw.println(" USER_TYPE is the name of a user type, e.g. android.os.usertype.profile.MANAGED.");
+ pw.println(" If not specified, the default user type is android.os.usertype.full.SECONDARY.");
+ pw.println(" --managed is shorthand for '--user-type android.os.usertype.profile.MANAGED'.");
+ pw.println(" --restricted is shorthand for '--user-type android.os.usertype.full.RESTRICTED'.");
+ pw.println(" --guest is shorthand for '--user-type android.os.usertype.full.GUEST'.");
pw.println("");
pw.println(" remove-user USER_ID");
pw.println(" Remove the user with the given USER_IDENTIFIER, deleting all data");
diff --git a/services/core/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java
index 4fca91a..1254891 100644
--- a/services/core/java/com/android/server/pm/PackageSetting.java
+++ b/services/core/java/com/android/server/pm/PackageSetting.java
@@ -209,6 +209,8 @@
long sourceToken = proto.start(PackageProto.INSTALL_SOURCE);
proto.write(PackageProto.InstallSourceProto.INITIATING_PACKAGE_NAME,
installSource.initiatingPackageName);
+ proto.write(PackageProto.InstallSourceProto.ORIGINATING_PACKAGE_NAME,
+ installSource.originatingPackageName);
proto.end(sourceToken);
}
writeUsersInfoToProto(proto, PackageProto.USERS);
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 66c77f5..5f3650c 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -2848,6 +2848,9 @@
if (installSource.initiatingPackageName != null) {
serializer.attribute(null, "installInitiator", installSource.initiatingPackageName);
}
+ if (installSource.originatingPackageName != null) {
+ serializer.attribute(null, "installOriginator", installSource.originatingPackageName);
+ }
if (pkg.volumeUuid != null) {
serializer.attribute(null, "volumeUuid", pkg.volumeUuid);
}
@@ -3605,6 +3608,7 @@
String systemStr = null;
String installerPackageName = null;
String isOrphaned = null;
+ String installOriginatingPackageName = null;
String installInitiatingPackageName = null;
String volumeUuid = null;
String categoryHintString = null;
@@ -3653,6 +3657,7 @@
installerPackageName = parser.getAttributeValue(null, "installer");
isOrphaned = parser.getAttributeValue(null, "isOrphaned");
installInitiatingPackageName = parser.getAttributeValue(null, "installInitiator");
+ installOriginatingPackageName = parser.getAttributeValue(null, "installOriginator");
volumeUuid = parser.getAttributeValue(null, "volumeUuid");
categoryHintString = parser.getAttributeValue(null, "categoryHint");
if (categoryHintString != null) {
@@ -3808,7 +3813,8 @@
if (packageSetting != null) {
packageSetting.uidError = "true".equals(uidError);
packageSetting.installSource = InstallSource.create(
- installInitiatingPackageName, installerPackageName, "true".equals(isOrphaned));
+ installInitiatingPackageName, installOriginatingPackageName,
+ installerPackageName, "true".equals(isOrphaned));
packageSetting.volumeUuid = volumeUuid;
packageSetting.categoryHint = categoryHint;
packageSetting.legacyNativeLibraryPathString = legacyNativeLibraryPathStr;
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index f7b60c2..e8798ff 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -22,6 +22,9 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "PackageManagerShellCommandTest"
}
],
"postsubmit": [
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 5c9b9c9..8ddfad9 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -20,8 +20,11 @@
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import android.Manifest;
+import android.annotation.ColorRes;
+import android.annotation.DrawableRes;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.StringRes;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.ActivityManager;
@@ -77,6 +80,7 @@
import android.security.GateKeeper;
import android.service.gatekeeper.IGateKeeperService;
import android.stats.devicepolicy.DevicePolicyEnums;
+import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.AtomicFile;
import android.util.IntArray;
@@ -152,6 +156,7 @@
private static final String TAG_NAME = "name";
private static final String TAG_ACCOUNT = "account";
private static final String ATTR_FLAGS = "flags";
+ private static final String ATTR_TYPE = "type";
private static final String ATTR_ICON_PATH = "icon";
private static final String ATTR_ID = "id";
private static final String ATTR_CREATION_TIME = "created";
@@ -220,15 +225,10 @@
@VisibleForTesting
static final int MAX_RECENTLY_REMOVED_IDS_SIZE = 100;
- private static final int USER_VERSION = 8;
+ private static final int USER_VERSION = 9;
private static final long EPOCH_PLUS_30_YEARS = 30L * 365 * 24 * 60 * 60 * 1000L; // ms
- // Maximum number of managed profiles permitted per user is 1. This cannot be increased
- // without first making sure that the rest of the framework is prepared for it.
- @VisibleForTesting
- static final int MAX_MANAGED_PROFILES = 1;
-
static final int WRITE_USER_MSG = 1;
static final int WRITE_USER_DELAY = 2*1000; // 2 seconds
@@ -304,6 +304,12 @@
private final SparseArray<UserData> mUsers = new SparseArray<>();
/**
+ * Map of user type names to their corresponding {@link UserTypeDetails}.
+ * Should not be modified after UserManagerService constructor finishes.
+ */
+ private final ArrayMap<String, UserTypeDetails> mUserTypes;
+
+ /**
* User restrictions set via UserManager. This doesn't include restrictions set by
* device owner / profile owners. Only non-empty restriction bundles are stored.
*
@@ -543,6 +549,7 @@
mPackagesLock = packagesLock;
mHandler = new MainHandler();
mUserDataPreparer = userDataPreparer;
+ mUserTypes = UserTypeFactory.getUserTypes();
synchronized (mPackagesLock) {
mUsersDir = new File(dataDir, USER_INFO_DIR);
mUsersDir.mkdirs();
@@ -700,22 +707,37 @@
final long ident = Binder.clearCallingIdentity();
try {
synchronized (mUsersLock) {
- return getProfilesLU(userId, enabledOnly, returnFullInfo);
+ return getProfilesLU(userId, /* userType */ null, enabledOnly, returnFullInfo);
}
} finally {
Binder.restoreCallingIdentity(ident);
}
}
+ // TODO(b/142482943): Will probably need a getProfiles(userType). But permissions may vary.
+
@Override
public int[] getProfileIds(@UserIdInt int userId, boolean enabledOnly) {
+ return getProfileIds(userId, null, enabledOnly);
+ }
+
+ // TODO(b/142482943): Probably @Override and make this accessible in UserManager.
+ /**
+ * Returns all the users of type userType that are in the same profile group as userId
+ * (including userId itself, if it is of the appropriate user type).
+ *
+ * <p>If userType is non-{@code null}, only returns users that are of type userType.
+ * If enabledOnly, only returns users that are not {@link UserInfo#FLAG_DISABLED}.
+ */
+ public int[] getProfileIds(@UserIdInt int userId, @Nullable String userType,
+ boolean enabledOnly) {
if (userId != UserHandle.getCallingUserId()) {
checkManageOrCreateUsersPermission("getting profiles related to user " + userId);
}
final long ident = Binder.clearCallingIdentity();
try {
synchronized (mUsersLock) {
- return getProfileIdsLU(userId, enabledOnly).toArray();
+ return getProfileIdsLU(userId, userType, enabledOnly).toArray();
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -724,9 +746,9 @@
/** Assume permissions already checked and caller's identity cleared */
@GuardedBy("mUsersLock")
- private List<UserInfo> getProfilesLU(@UserIdInt int userId, boolean enabledOnly,
- boolean fullInfo) {
- IntArray profileIds = getProfileIdsLU(userId, enabledOnly);
+ private List<UserInfo> getProfilesLU(@UserIdInt int userId, @Nullable String userType,
+ boolean enabledOnly, boolean fullInfo) {
+ IntArray profileIds = getProfileIdsLU(userId, userType, enabledOnly);
ArrayList<UserInfo> users = new ArrayList<>(profileIds.size());
for (int i = 0; i < profileIds.size(); i++) {
int profileId = profileIds.get(i);
@@ -746,9 +768,12 @@
/**
* Assume permissions already checked and caller's identity cleared
+ * <p>If userType is {@code null}, returns all profiles for user; else, only returns
+ * profiles of that type.
*/
@GuardedBy("mUsersLock")
- private IntArray getProfileIdsLU(@UserIdInt int userId, boolean enabledOnly) {
+ private IntArray getProfileIdsLU(@UserIdInt int userId, @Nullable String userType,
+ boolean enabledOnly) {
UserInfo user = getUserInfoLU(userId);
IntArray result = new IntArray(mUsers.size());
if (user == null) {
@@ -770,6 +795,9 @@
if (profile.partial) {
continue;
}
+ if (userType != null && !userType.equals(profile.userType)) {
+ continue;
+ }
result.add(profile.id);
}
return result;
@@ -1116,6 +1144,45 @@
}
}
+ /**
+ * Returns the user type, e.g. {@link UserManager#USER_TYPE_FULL_GUEST}, of the given userId,
+ * or null if the user doesn't exist.
+ */
+ @Override
+ public @Nullable String getUserTypeForUser(@UserIdInt int userId) {
+ // TODO(b/142482943): Decide on the appropriate permission requirements.
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "getUserTypeForUser");
+ return getUserTypeNoChecks(userId);
+ }
+
+ /**
+ * Returns the user type of the given userId, or null if the user doesn't exist.
+ * <p>No permissions checks are made (but userId checks may be made).
+ */
+ private @Nullable String getUserTypeNoChecks(@UserIdInt int userId) {
+ synchronized (mUsersLock) {
+ final UserInfo userInfo = getUserInfoLU(userId);
+ return userInfo != null ? userInfo.userType : null;
+ }
+ }
+
+ /**
+ * Returns the UserTypeDetails of the given userId's user type, or null if the no such user.
+ * <p>No permissions checks are made (but userId checks may be made).
+ */
+ private @Nullable UserTypeDetails getUserTypeDetailsNoChecks(@UserIdInt int userId) {
+ final String typeStr = getUserTypeNoChecks(userId);
+ return typeStr != null ? mUserTypes.get(typeStr) : null;
+ }
+
+ /**
+ * Returns the UserTypeDetails of the given userInfo's user type (or null for a null userInfo).
+ */
+ private @Nullable UserTypeDetails getUserTypeDetails(@Nullable UserInfo userInfo) {
+ final String typeStr = userInfo != null ? userInfo.userType : null;
+ return typeStr != null ? mUserTypes.get(typeStr) : null;
+ }
+
@Override
public UserInfo getUserInfo(@UserIdInt int userId) {
checkManageOrCreateUsersPermission("query user");
@@ -1139,11 +1206,78 @@
}
@Override
- public int getManagedProfileBadge(@UserIdInt int userId) {
- checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "getManagedProfileBadge");
+ public boolean hasBadge(@UserIdInt int userId) {
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "hasBadge");
+ final UserTypeDetails userTypeDetails = getUserTypeDetailsNoChecks(userId);
+ return userTypeDetails != null && userTypeDetails.hasBadge();
+ }
+
+ @Override
+ public @StringRes int getUserBadgeLabelResId(@UserIdInt int userId) {
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "getUserBadgeLabelResId");
+ final UserInfo userInfo = getUserInfoNoChecks(userId);
+ final UserTypeDetails userTypeDetails = getUserTypeDetails(userInfo);
+ if (userInfo == null || userTypeDetails == null || !userTypeDetails.hasBadge()) {
+ Slog.e(LOG_TAG, "Requested badge label for non-badged user " + userId);
+ return Resources.ID_NULL;
+ }
+ final int badgeIndex = userInfo.profileBadge;
+ return userTypeDetails.getBadgeLabel(badgeIndex);
+ }
+
+ @Override
+ public @ColorRes int getUserBadgeColorResId(@UserIdInt int userId) {
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "getUserBadgeColorResId");
+ final UserInfo userInfo = getUserInfoNoChecks(userId);
+ final UserTypeDetails userTypeDetails = getUserTypeDetails(userInfo);
+ if (userInfo == null || userTypeDetails == null || !userTypeDetails.hasBadge()) {
+ Slog.e(LOG_TAG, "Requested badge color for non-badged user " + userId);
+ return Resources.ID_NULL;
+ }
+ final int badgeIndex = userInfo.profileBadge;
+ return userTypeDetails.getBadgeColor(badgeIndex);
+ }
+
+ @Override
+ public @DrawableRes int getUserIconBadgeResId(@UserIdInt int userId) {
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "getUserIconBadgeResId");
+ final UserTypeDetails userTypeDetails = getUserTypeDetailsNoChecks(userId);
+ if (userTypeDetails == null || !userTypeDetails.hasBadge()) {
+ Slog.e(LOG_TAG, "Requested icon badge for non-badged user " + userId);
+ return Resources.ID_NULL;
+ }
+ return userTypeDetails.getIconBadge();
+ }
+
+ @Override
+ public @DrawableRes int getUserBadgeResId(@UserIdInt int userId) {
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "getUserBadgeResId");
+ final UserTypeDetails userTypeDetails = getUserTypeDetailsNoChecks(userId);
+ if (userTypeDetails == null || !userTypeDetails.hasBadge()) {
+ Slog.e(LOG_TAG, "Requested badge for non-badged user " + userId);
+ return Resources.ID_NULL;
+ }
+ return userTypeDetails.getBadgePlain();
+ }
+
+ @Override
+ public @DrawableRes int getUserBadgeNoBackgroundResId(@UserIdInt int userId) {
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId,
+ "getUserBadgeNoBackgroundResId");
+ final UserTypeDetails userTypeDetails = getUserTypeDetailsNoChecks(userId);
+ if (userTypeDetails == null || !userTypeDetails.hasBadge()) {
+ Slog.e(LOG_TAG, "Requested badge (no background) for non-badged user " + userId);
+ return Resources.ID_NULL;
+ }
+ return userTypeDetails.getBadgeNoBackground();
+ }
+
+ @Override
+ public boolean isProfile(@UserIdInt int userId) {
+ checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "isProfile");
synchronized (mUsersLock) {
UserInfo userInfo = getUserInfoLU(userId);
- return userInfo != null ? userInfo.profileBadge : 0;
+ return userInfo != null && userInfo.isProfile();
}
}
@@ -1896,33 +2030,93 @@
return count >= UserManager.getMaxSupportedUsers();
}
+ /**
+ * Returns whether more users of the given type can be added (based on how many users of that
+ * type already exist).
+ *
+ * <p>For checking whether more profiles can be added to a particular parent use
+ * {@link #canAddMoreProfilesToUser}.
+ */
+ private boolean canAddMoreUsersOfType(UserTypeDetails userTypeDetails) {
+ final int max = userTypeDetails.getMaxAllowed();
+ if (max == UserTypeDetails.UNLIMITED_NUMBER_OF_USERS) {
+ return true; // Indicates that there is no max.
+ }
+ return getNumberOfUsersOfType(userTypeDetails.getName()) < max;
+ }
+
+ /**
+ * Gets the number of users of the given user type.
+ * Does not include users that are about to die.
+ */
+ private int getNumberOfUsersOfType(String userType) {
+ int count = 0;
+ synchronized (mUsersLock) {
+ final int size = mUsers.size();
+ for (int i = 0; i < size; i++) {
+ final UserInfo user = mUsers.valueAt(i).info;
+ if (user.userType.equals(userType)
+ && !user.guestToRemove
+ && !mRemovingUserIds.get(user.id)
+ && !user.preCreated) {
+ count++;
+ }
+ }
+ }
+ return count;
+ }
+
@Override
public boolean canAddMoreManagedProfiles(@UserIdInt int userId, boolean allowedToRemoveOne) {
- checkManageUsersPermission("check if more managed profiles can be added.");
- if (ActivityManager.isLowRamDeviceStatic()) {
+ return canAddMoreProfilesToUser(UserManager.USER_TYPE_PROFILE_MANAGED, userId,
+ allowedToRemoveOne);
+ }
+
+ /** Returns whether more profiles of the given type can be added to the given parent userId. */
+ @Override
+ public boolean canAddMoreProfilesToUser(String userType, @UserIdInt int userId,
+ boolean allowedToRemoveOne) {
+ checkManageUsersPermission("check if more profiles can be added.");
+ final UserTypeDetails type = mUserTypes.get(userType);
+ if (type == null) {
return false;
}
- if (!mContext.getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_MANAGED_USERS)) {
- return false;
+ // Managed profiles have their own specific rules.
+ final boolean isManagedProfile = type.isManagedProfile();
+ if (isManagedProfile) {
+ if (ActivityManager.isLowRamDeviceStatic()) {
+ return false;
+ }
+ if (!mContext.getPackageManager().hasSystemFeature(
+ PackageManager.FEATURE_MANAGED_USERS)) {
+ return false;
+ }
}
- // Limit number of managed profiles that can be created
- final int managedProfilesCount = getProfiles(userId, false).size() - 1;
- final int profilesRemovedCount = managedProfilesCount > 0 && allowedToRemoveOne ? 1 : 0;
- if (managedProfilesCount - profilesRemovedCount >= getMaxManagedProfiles()) {
- return false;
- }
- synchronized(mUsersLock) {
+ synchronized (mUsersLock) {
+ // Check if the parent exists and its type is even allowed to have a profile.
UserInfo userInfo = getUserInfoLU(userId);
if (userInfo == null || !userInfo.canHaveProfile()) {
return false;
}
- int usersCountAfterRemoving = getAliveUsersExcludingGuestsCountLU()
- - profilesRemovedCount;
- // We allow creating a managed profile in the special case where there is only one user.
- return usersCountAfterRemoving == 1
- || usersCountAfterRemoving < UserManager.getMaxSupportedUsers();
+
+ // Limit the number of profiles that can be created
+ final int maxUsersOfType = getMaxUsersOfTypePerParent(type);
+ if (maxUsersOfType != UserTypeDetails.UNLIMITED_NUMBER_OF_USERS) {
+ final int userTypeCount = getProfileIds(userId, userType, false).length;
+ final int profilesRemovedCount = userTypeCount > 0 && allowedToRemoveOne ? 1 : 0;
+ if (userTypeCount - profilesRemovedCount >= maxUsersOfType) {
+ return false;
+ }
+ // Allow creating a managed profile in the special case where there is only one user
+ if (isManagedProfile) {
+ int usersCountAfterRemoving = getAliveUsersExcludingGuestsCountLU()
+ - profilesRemovedCount;
+ return usersCountAfterRemoving == 1
+ || usersCountAfterRemoving < UserManager.getMaxSupportedUsers();
+ }
+ }
}
+ return true;
}
@GuardedBy("mUsersLock")
@@ -2207,9 +2401,18 @@
*/
@GuardedBy({"mRestrictionsLock", "mPackagesLock"})
private void upgradeIfNecessaryLP(Bundle oldGlobalUserRestrictions) {
+ upgradeIfNecessaryLP(oldGlobalUserRestrictions, mUserVersion);
+ }
+
+ /**
+ * Version of {@link #upgradeIfNecessaryLP(Bundle)} that takes in the userVersion for testing
+ * purposes. For non-tests, use {@link #upgradeIfNecessaryLP(Bundle)}.
+ */
+ @GuardedBy({"mRestrictionsLock", "mPackagesLock"})
+ @VisibleForTesting
+ void upgradeIfNecessaryLP(Bundle oldGlobalUserRestrictions, int userVersion) {
Set<Integer> userIdsToWrite = new ArraySet<>();
final int originalVersion = mUserVersion;
- int userVersion = mUserVersion;
if (userVersion < 1) {
// Assign a proper name for the owner, if not initialized correctly before
UserData userData = getUserDataNoChecks(UserHandle.USER_SYSTEM);
@@ -2298,6 +2501,44 @@
userVersion = 8;
}
+ if (userVersion < 9) {
+ // Convert from UserInfo flags to UserTypes. Apply FLAG_PROFILE to FLAG_MANAGED_PROFILE.
+ synchronized (mUsersLock) {
+ for (int i = 0; i < mUsers.size(); i++) {
+ UserData userData = mUsers.valueAt(i);
+ final int flags = userData.info.flags;
+ if ((flags & UserInfo.FLAG_SYSTEM) != 0) {
+ if ((flags & UserInfo.FLAG_FULL) != 0) {
+ userData.info.userType = UserManager.USER_TYPE_FULL_SYSTEM;
+ } else {
+ userData.info.userType = UserManager.USER_TYPE_SYSTEM_HEADLESS;
+ }
+ } else {
+ try {
+ userData.info.userType = UserInfo.getDefaultUserType(flags);
+ } catch (IllegalArgumentException e) {
+ // TODO(b/142482943): What should we do here? Delete user? Crashloop?
+ throw new IllegalStateException("Cannot upgrade user with flags "
+ + Integer.toHexString(flags) + " because it doesn't correspond "
+ + "to a valid user type.", e);
+ }
+ }
+ // OEMs are responsible for their own custom upgrade logic here.
+
+ final UserTypeDetails userTypeDetails = mUserTypes.get(userData.info.userType);
+ if (userTypeDetails == null) {
+ throw new IllegalStateException(
+ "Cannot upgrade user with flags " + Integer.toHexString(flags)
+ + " because " + userData.info.userType + " isn't defined"
+ + " on this device!");
+ }
+ userData.info.flags |= userTypeDetails.getDefaultUserInfoFlags();
+ userIdsToWrite.add(userData.info.id);
+ }
+ }
+ userVersion = 9;
+ }
+
if (userVersion < USER_VERSION) {
Slog.w(LOG_TAG, "User version " + mUserVersion + " didn't upgrade as expected to "
+ USER_VERSION);
@@ -2320,12 +2561,11 @@
private void fallbackToSingleUserLP() {
int flags = UserInfo.FLAG_SYSTEM | UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_ADMIN
| UserInfo.FLAG_PRIMARY;
- // In headless system user mode, headless system user is not a full user.
- if (!UserManager.isHeadlessSystemUserMode()) {
- flags |= UserInfo.FLAG_FULL;
- }
// Create the system user
- UserInfo system = new UserInfo(UserHandle.USER_SYSTEM, null, null, flags);
+ String systemUserType = UserManager.isHeadlessSystemUserMode() ?
+ UserManager.USER_TYPE_SYSTEM_HEADLESS : UserManager.USER_TYPE_FULL_SYSTEM;
+ flags |= mUserTypes.get(systemUserType).getDefaultUserInfoFlags();
+ UserInfo system = new UserInfo(UserHandle.USER_SYSTEM, null, null, flags, systemUserType);
UserData userData = putUserInfo(system);
mNextSerialNumber = MIN_USER_ID;
mUserVersion = USER_VERSION;
@@ -2410,6 +2650,7 @@
serializer.attribute(null, ATTR_ID, Integer.toString(userInfo.id));
serializer.attribute(null, ATTR_SERIAL_NO, Integer.toString(userInfo.serialNumber));
serializer.attribute(null, ATTR_FLAGS, Integer.toString(userInfo.flags));
+ serializer.attribute(null, ATTR_TYPE, userInfo.userType);
serializer.attribute(null, ATTR_CREATION_TIME, Long.toString(userInfo.creationTime));
serializer.attribute(null, ATTR_LAST_LOGGED_IN_TIME,
Long.toString(userInfo.lastLoggedInTime));
@@ -2570,6 +2811,7 @@
UserData readUserLP(int id, InputStream is) throws IOException,
XmlPullParserException {
int flags = 0;
+ String userType = null;
int serialNumber = id;
String name = null;
String account = null;
@@ -2613,6 +2855,8 @@
}
serialNumber = readIntAttribute(parser, ATTR_SERIAL_NO, id);
flags = readIntAttribute(parser, ATTR_FLAGS, 0);
+ userType = parser.getAttributeValue(null, ATTR_TYPE);
+ userType = userType != null ? userType.intern() : null;
iconPath = parser.getAttributeValue(null, ATTR_ICON_PATH);
creationTime = readLongAttribute(parser, ATTR_CREATION_TIME, 0);
lastLoggedInTime = readLongAttribute(parser, ATTR_LAST_LOGGED_IN_TIME, 0);
@@ -2678,7 +2922,7 @@
}
// Create the UserInfo object that gets passed around
- UserInfo userInfo = new UserInfo(id, name, iconPath, flags);
+ UserInfo userInfo = new UserInfo(id, name, iconPath, flags, userType);
userInfo.serialNumber = serialNumber;
userInfo.creationTime = creationTime;
userInfo.lastLoggedInTime = lastLoggedInTime;
@@ -2745,108 +2989,135 @@
}
}
+ /**
+ * Creates a profile user. Used for actual profiles, like
+ * {@link UserManager#USER_TYPE_PROFILE_MANAGED}, as well as for
+ * {@link UserManager#USER_TYPE_FULL_RESTRICTED}.
+ */
@Override
- public UserInfo createProfileForUser(String name, int flags, @UserIdInt int userId,
- String[] disallowedPackages) {
+ public UserInfo createProfileForUser(String name, @NonNull String userType,
+ @UserInfoFlag int flags, @UserIdInt int userId, @Nullable String[] disallowedPackages) {
checkManageOrCreateUsersPermission(flags);
- return createUserInternal(name, flags, userId, disallowedPackages);
+ return createUserInternal(name, userType, flags, userId, disallowedPackages);
+ }
+
+ /** @see #createProfileForUser */
+ @Override
+ public UserInfo createProfileForUserEvenWhenDisallowed(String name, @NonNull String userType,
+ @UserInfoFlag int flags, @UserIdInt int userId, @Nullable String[] disallowedPackages) {
+ checkManageOrCreateUsersPermission(flags);
+ return createUserInternalUnchecked(name, userType, flags, userId,
+ /* preCreate= */ false, disallowedPackages);
}
@Override
- public UserInfo createProfileForUserEvenWhenDisallowed(String name, int flags,
- @UserIdInt int userId, String[] disallowedPackages) {
+ public UserInfo createUser(String name, @NonNull String userType, @UserInfoFlag int flags) {
checkManageOrCreateUsersPermission(flags);
- return createUserInternalUnchecked(name, flags, userId, /* preCreate= */ false,
- disallowedPackages);
+ return createUserInternal(name, userType, flags, UserHandle.USER_NULL,
+ /* disallowedPackages= */ null);
}
@Override
- public boolean removeUserEvenWhenDisallowed(@UserIdInt int userId) {
- checkManageOrCreateUsersPermission("Only the system can remove users");
- return removeUserUnchecked(userId);
- }
+ public UserInfo preCreateUser(String userType) {
+ final UserTypeDetails userTypeDetails = mUserTypes.get(userType);
+ final int flags = userTypeDetails != null ? userTypeDetails.getDefaultUserInfoFlags() : 0;
- @Override
- public UserInfo createUser(String name, int flags) {
- checkManageOrCreateUsersPermission(flags);
- return createUserInternal(name, flags, UserHandle.USER_NULL);
- }
-
- @Override
- public UserInfo preCreateUser(int flags) {
checkManageOrCreateUsersPermission(flags);
- Preconditions.checkArgument(!UserInfo.isManagedProfile(flags),
- "cannot pre-create managed profiles");
+ Preconditions.checkArgument(isUserTypeEligibleForPreCreation(userTypeDetails),
+ "cannot pre-create user of type " + userType);
+ Slog.i(LOG_TAG, "Pre-creating user of type " + userType);
- Slog.i(LOG_TAG, "Pre-creating user with flags " + UserInfo.flagsToString(flags));
-
- return createUserInternalUnchecked(/* name= */ null, flags,
+ return createUserInternalUnchecked(/* name= */ null, userType, flags,
/* parentId= */ UserHandle.USER_NULL, /* preCreate= */ true,
/* disallowedPackages= */ null);
}
- private UserInfo createUserInternal(@Nullable String name, @UserInfoFlag int flags,
- @UserIdInt int parentId) {
- return createUserInternal(name, flags, parentId, null);
- }
-
- private UserInfo createUserInternal(@Nullable String name, @UserInfoFlag int flags,
- @UserIdInt int parentId, @Nullable String[] disallowedPackages) {
- String restriction = ((flags & UserInfo.FLAG_MANAGED_PROFILE) != 0)
+ private UserInfo createUserInternal(@Nullable String name, @NonNull String userType,
+ @UserInfoFlag int flags, @UserIdInt int parentId,
+ @Nullable String[] disallowedPackages) {
+ String restriction = (UserManager.isUserTypeManagedProfile(userType))
? UserManager.DISALLOW_ADD_MANAGED_PROFILE
: UserManager.DISALLOW_ADD_USER;
if (hasUserRestriction(restriction, UserHandle.getCallingUserId())) {
Log.w(LOG_TAG, "Cannot add user. " + restriction + " is enabled.");
return null;
}
- return createUserInternalUnchecked(name, flags, parentId, /* preCreate= */ false,
- disallowedPackages);
+ return createUserInternalUnchecked(name, userType, flags, parentId,
+ /* preCreate= */ false, disallowedPackages);
}
- private UserInfo createUserInternalUnchecked(@Nullable String name, @UserInfoFlag int flags,
- @UserIdInt int parentId, boolean preCreate,
- @Nullable String[] disallowedPackages) {
+ private UserInfo createUserInternalUnchecked(@Nullable String name,
+ @NonNull String userType, @UserInfoFlag int flags, @UserIdInt int parentId,
+ boolean preCreate, @Nullable String[] disallowedPackages) {
final TimingsTraceAndSlog t = new TimingsTraceAndSlog();
t.traceBegin("createUser-" + flags);
try {
- return createUserInternalUncheckedNoTracing(name, flags, parentId, preCreate,
- disallowedPackages, t);
+ return createUserInternalUncheckedNoTracing(name, userType, flags, parentId,
+ preCreate, disallowedPackages, t);
} finally {
t.traceEnd();
}
}
private UserInfo createUserInternalUncheckedNoTracing(@Nullable String name,
- @UserInfoFlag int flags, @UserIdInt int parentId, boolean preCreate,
- @Nullable String[] disallowedPackages, @NonNull TimingsTraceAndSlog t) {
+ @NonNull String userType, @UserInfoFlag int flags, @UserIdInt int parentId,
+ boolean preCreate, @Nullable String[] disallowedPackages,
+ @NonNull TimingsTraceAndSlog t) {
+
+ final UserTypeDetails userTypeDetails = mUserTypes.get(userType);
+ if (userTypeDetails == null) {
+ Slog.e(LOG_TAG, "Cannot create user of invalid user type: " + userType);
+ return null;
+ }
+ userType = userType.intern(); // Now that we know it's valid, we can intern it.
+ flags |= userTypeDetails.getDefaultUserInfoFlags();
+ if (!checkUserTypeConsistency(flags)) {
+ Slog.e(LOG_TAG, "Cannot add user. Flags (" + Integer.toHexString(flags)
+ + ") and userTypeDetails (" + userType + ") are inconsistent.");
+ return null;
+ }
+ if ((flags & UserInfo.FLAG_SYSTEM) != 0) {
+ Slog.e(LOG_TAG, "Cannot add user. Flags (" + Integer.toHexString(flags)
+ + ") indicated SYSTEM user, which cannot be created.");
+ return null;
+ }
+ synchronized (mUsersLock) {
+ if (mForceEphemeralUsers) {
+ flags |= UserInfo.FLAG_EPHEMERAL;
+ }
+ }
// First try to use a pre-created user (if available).
- // NOTE: currently we don't support pre-created managed profiles
- if (!preCreate && (parentId < 0 && !UserInfo.isManagedProfile(flags))) {
+ // TODO(b/142482943): Move this to its own function later.
+ if (!preCreate
+ && (parentId < 0 && isUserTypeEligibleForPreCreation(userTypeDetails))) {
final UserData preCreatedUserData;
synchronized (mUsersLock) {
- preCreatedUserData = getPreCreatedUserLU(flags);
+ preCreatedUserData = getPreCreatedUserLU(userType);
}
if (preCreatedUserData != null) {
final UserInfo preCreatedUser = preCreatedUserData.info;
- Log.i(LOG_TAG, "Reusing pre-created user " + preCreatedUser.id + " for flags + "
- + UserInfo.flagsToString(flags));
- if (DBG) {
- Log.d(LOG_TAG, "pre-created user flags: "
- + UserInfo.flagsToString(preCreatedUser.flags)
- + " new-user flags: " + UserInfo.flagsToString(flags));
+ final int newFlags = preCreatedUser.flags | flags;
+ if (!checkUserTypeConsistency(newFlags)) {
+ Slog.wtf(LOG_TAG, "Cannot reuse pre-created user " + preCreatedUser.id
+ + " of type " + userType + " because flags are inconsistent. "
+ + "Flags (" + Integer.toHexString(flags) + "); preCreatedUserFlags ( "
+ + Integer.toHexString(preCreatedUser.flags) + ").");
+ } else {
+ Log.i(LOG_TAG, "Reusing pre-created user " + preCreatedUser.id + " of type "
+ + userType + " and bestowing on it flags "
+ + UserInfo.flagsToString(flags));
+ preCreatedUser.name = name;
+ preCreatedUser.flags = newFlags;
+ preCreatedUser.preCreated = false;
+ preCreatedUser.creationTime = getCreationTime();
+
+ dispatchUserAddedIntent(preCreatedUser);
+ writeUserLP(preCreatedUserData);
+ writeUserListLP();
+ return preCreatedUser;
}
- preCreatedUser.name = name;
- preCreatedUser.preCreated = false;
- preCreatedUser.creationTime = getCreationTime();
-
- dispatchUserAddedIntent(preCreatedUser);
-
- writeUserLP(preCreatedUserData);
- writeUserListLP();
-
- return preCreatedUser;
}
}
@@ -2857,10 +3128,11 @@
return null;
}
- final boolean isGuest = UserInfo.isGuest(flags);
- final boolean isManagedProfile = UserInfo.isManagedProfile(flags);
- final boolean isRestricted = (flags & UserInfo.FLAG_RESTRICTED) != 0;
- final boolean isDemo = (flags & UserInfo.FLAG_DEMO) != 0;
+ final boolean isProfile = userTypeDetails.isProfile();
+ final boolean isGuest = UserManager.isUserTypeGuest(userType);
+ final boolean isRestricted = UserManager.isUserTypeRestricted(userType);
+ final boolean isDemo = UserManager.isUserTypeDemo(userType);
+
final long ident = Binder.clearCallingIdentity();
UserInfo userInfo;
UserData userData;
@@ -2874,21 +3146,23 @@
}
if (parent == null) return null;
}
- if (isManagedProfile && !canAddMoreManagedProfiles(parentId, false)) {
- Log.e(LOG_TAG, "Cannot add more managed profiles for user " + parentId);
+ if (!preCreate && !canAddMoreUsersOfType(userTypeDetails)) {
+ Log.e(LOG_TAG, "Cannot add more users of type " + userType
+ + ". Maximum number of that type already exists.");
return null;
}
- if (!isGuest && !isManagedProfile && !isDemo && isUserLimitReached()) {
- // If we're not adding a guest/demo user or a managed profile,
- // and the limit has been reached, cannot add a user.
+ // TODO(b/142482943): Perhaps let the following code apply to restricted users too.
+ if (isProfile && !canAddMoreProfilesToUser(userType, parentId, false)) {
+ Log.e(LOG_TAG, "Cannot add more profiles of type " + userType
+ + " for user " + parentId);
+ return null;
+ }
+ if (!isGuest && !isProfile && !isDemo && isUserLimitReached()) {
+ // If we're not adding a guest/demo user or a profile and the 'user limit' has
+ // been reached, cannot add a user.
Log.e(LOG_TAG, "Cannot add user. Maximum user limit is reached.");
return null;
}
- // If we're adding a guest and there already exists one, bail.
- if (isGuest && !preCreate && findCurrentGuestUser() != null) {
- Log.e(LOG_TAG, "Cannot add guest user. Guest user already exists.");
- return null;
- }
// In legacy mode, restricted profile's parent can only be the owner user
if (isRestricted && !UserManager.isSplitSystemUser()
&& (parentId != UserHandle.USER_SYSTEM)) {
@@ -2908,30 +3182,23 @@
}
}
- if (!isManagedProfile) {
- // New users cannot be system, and it's not a profile, so per-force it's FULL.
- flags |= UserInfo.FLAG_FULL;
- }
-
userId = getNextAvailableId();
Environment.getUserSystemDirectory(userId).mkdirs();
- boolean ephemeralGuests = areGuestUsersEphemeral();
synchronized (mUsersLock) {
- // Add ephemeral flag to guests/users if required. Also inherit it from parent.
- if ((isGuest && ephemeralGuests) || mForceEphemeralUsers
- || (parent != null && parent.info.isEphemeral())) {
+ // Inherit ephemeral flag from parent.
+ if (parent != null && parent.info.isEphemeral()) {
flags |= UserInfo.FLAG_EPHEMERAL;
}
- userInfo = new UserInfo(userId, name, null, flags);
+ userInfo = new UserInfo(userId, name, null, flags, userType);
userInfo.serialNumber = mNextSerialNumber++;
userInfo.creationTime = getCreationTime();
userInfo.partial = true;
userInfo.preCreated = preCreate;
userInfo.lastLoggedInFingerprint = Build.FINGERPRINT;
- if (isManagedProfile && parentId != UserHandle.USER_NULL) {
- userInfo.profileBadge = getFreeProfileBadgeLU(parentId);
+ if (userTypeDetails.hasBadge() && parentId != UserHandle.USER_NULL) {
+ userInfo.profileBadge = getFreeProfileBadgeLU(parentId, userType);
}
userData = new UserData();
userData.info = userInfo;
@@ -2940,7 +3207,7 @@
writeUserLP(userData);
writeUserListLP();
if (parent != null) {
- if (isManagedProfile) {
+ if (isProfile) {
if (parent.info.profileGroupId == UserInfo.NO_PROFILE_GROUP_ID) {
parent.info.profileGroupId = parent.info.id;
writeUserLP(parent);
@@ -2966,7 +3233,7 @@
StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
t.traceEnd();
- final Set<String> installablePackages =
+ final Set<String> installablePackages = // TODO(b/142482943): use userType
mSystemPackageInstaller.getInstallablePackagesForUserType(flags);
t.traceBegin("PM.createNewUser");
mPm.createNewUser(userId, installablePackages, disallowedPackages);
@@ -2978,6 +3245,7 @@
}
updateUserIds();
Bundle restrictions = new Bundle();
+ // TODO(b/142482943): Generalize this using UserTypeDetails default restrictions.
if (isGuest) {
synchronized (mGuestRestrictions) {
restrictions.putAll(mGuestRestrictions);
@@ -3026,6 +3294,22 @@
return userInfo;
}
+ /** Checks that the flags do not contain mutually exclusive types/properties. */
+ static boolean checkUserTypeConsistency(@UserInfoFlag int flags) {
+ // Mask to check that flags don't refer to multiple user types.
+ final int userTypeFlagMask = UserInfo.FLAG_GUEST | UserInfo.FLAG_DEMO
+ | UserInfo.FLAG_RESTRICTED | UserInfo.FLAG_PROFILE;
+ return isAtMostOneFlag(flags & userTypeFlagMask)
+ && isAtMostOneFlag(flags & (UserInfo.FLAG_PROFILE | UserInfo.FLAG_FULL))
+ && isAtMostOneFlag(flags & (UserInfo.FLAG_PROFILE | UserInfo.FLAG_SYSTEM));
+ }
+
+ /** Returns whether the given flags contains at most one 1. */
+ private static boolean isAtMostOneFlag(int flags) {
+ return (flags & (flags - 1)) == 0;
+ // If !=0, this means that flags is not a power of 2, and therefore is multiple types.
+ }
+
/** Install/uninstall system packages for all users based on their user-type, as applicable. */
boolean installWhitelistedSystemPackages(boolean isFirstBoot, boolean isUpgrade) {
return mSystemPackageInstaller.installWhitelistedSystemPackages(isFirstBoot, isUpgrade);
@@ -3045,39 +3329,23 @@
: (userInfo.isDemo() ? TRON_DEMO_CREATED : TRON_USER_CREATED), 1);
}
- private boolean areGuestUsersEphemeral() {
- return Resources.getSystem()
- .getBoolean(com.android.internal.R.bool.config_guestUserEphemeral);
- }
-
/**
- * Gets a pre-created user for the given flag.
+ * Gets a pre-created user for the given user type.
*
* <p>Should be used only during user creation, so the pre-created user can be used (instead of
* creating and initializing a new user from scratch).
*/
// TODO(b/143092698): add unit test
@GuardedBy("mUsersLock")
- private @Nullable UserData getPreCreatedUserLU(@UserInfoFlag int flags) {
- if (DBG) {
- Slog.d(LOG_TAG, "getPreCreatedUser(): initialFlags= " + UserInfo.flagsToString(flags));
- }
- flags |= UserInfo.FLAG_FULL;
- if (UserInfo.isGuest(flags) && areGuestUsersEphemeral()) {
- flags |= UserInfo.FLAG_EPHEMERAL;
- }
- if (DBG) {
- Slog.d(LOG_TAG, "getPreCreatedUser(): targetFlags= " + UserInfo.flagsToString(flags));
- }
+ private @Nullable UserData getPreCreatedUserLU(String userType) {
+ if (DBG) Slog.d(LOG_TAG, "getPreCreatedUser(): userType= " + userType);
final int userSize = mUsers.size();
for (int i = 0; i < userSize; i++) {
final UserData user = mUsers.valueAt(i);
if (DBG) Slog.d(LOG_TAG, i + ":" + user.info.toFullString());
- if (user.info.preCreated
- && (user.info.flags & ~UserInfo.FLAG_INITIALIZED) == flags) {
+ if (user.info.preCreated && user.info.userType.equals(userType)) {
if (!user.info.isInitialized()) {
- Slog.w(LOG_TAG, "found pre-created user for flags "
- + "" + UserInfo.flagsToString(flags)
+ Slog.w(LOG_TAG, "found pre-created user of type " + userType
+ ", but it's not initialized yet: " + user.info.toFullString());
continue;
}
@@ -3087,6 +3355,18 @@
return null;
}
+ /**
+ * Returns whether a user with the given userTypeDetails is eligible to be
+ * {@link UserInfo#preCreated}.
+ */
+ private static boolean isUserTypeEligibleForPreCreation(UserTypeDetails userTypeDetails) {
+ if (userTypeDetails == null) {
+ return false;
+ }
+ return !userTypeDetails.isProfile()
+ && !userTypeDetails.getName().equals(UserManager.USER_TYPE_FULL_RESTRICTED);
+ }
+
@VisibleForTesting
UserData putUserInfo(UserInfo userInfo) {
final UserData userData = new UserData();
@@ -3111,7 +3391,7 @@
public UserInfo createRestrictedProfile(String name, int parentUserId) {
checkManageOrCreateUsersPermission("setupRestrictedProfile");
final UserInfo user = createProfileForUser(
- name, UserInfo.FLAG_RESTRICTED, parentUserId, null);
+ name, UserManager.USER_TYPE_FULL_RESTRICTED, 0, parentUserId, null);
if (user == null) {
return null;
}
@@ -3217,6 +3497,12 @@
return removeUserUnchecked(userId);
}
+ @Override
+ public boolean removeUserEvenWhenDisallowed(@UserIdInt int userId) {
+ checkManageOrCreateUsersPermission("Only the system can remove users");
+ return removeUserUnchecked(userId);
+ }
+
private boolean removeUserUnchecked(@UserIdInt int userId) {
long ident = Binder.clearCallingIdentity();
try {
@@ -3264,6 +3550,7 @@
Log.w(LOG_TAG, "Unable to notify AppOpsService of removing user.", e);
}
+ // TODO(b/142482943): Send some sort of broadcast for profiles even if non-managed?
if (userData.info.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID
&& userData.info.isManagedProfile()) {
// Send broadcast to notify system that the user removed was a
@@ -4035,6 +4322,7 @@
pw.print(" <pre-created>");
}
pw.println();
+ pw.print(" Type: "); pw.println(userInfo.userType);
pw.print(" Flags: "); pw.print(userInfo.flags); pw.print(" (");
pw.print(UserInfo.flagsToString(userInfo.flags)); pw.println(")");
pw.print(" State: ");
@@ -4119,11 +4407,20 @@
pw.print(" Max users: " + UserManager.getMaxSupportedUsers());
pw.println(" (limit reached: " + isUserLimitReached() + ")");
pw.println(" Supports switchable users: " + UserManager.supportsMultipleUsers());
- pw.println(" All guests ephemeral: " + areGuestUsersEphemeral());
+ pw.println(" All guests ephemeral: " + Resources.getSystem().getBoolean(
+ com.android.internal.R.bool.config_guestUserEphemeral));
pw.println(" Is split-system user: " + UserManager.isSplitSystemUser());
pw.println(" Is headless-system mode: " + UserManager.isHeadlessSystemUserMode());
pw.println(" User version: " + mUserVersion);
+ // Dump UserTypes
+ pw.println();
+ pw.println(" User types (" + mUserTypes.size() + " types):");
+ for (int i = 0; i < mUserTypes.size(); i++) {
+ pw.println(" " + mUserTypes.keyAt(i) + ": ");
+ mUserTypes.valueAt(i).dump(pw);
+ }
+
// Dump package whitelist
pw.println();
mSystemPackageInstaller.dump(pw);
@@ -4322,10 +4619,10 @@
}
@Override
- public UserInfo createUserEvenWhenDisallowed(String name, int flags,
- String[] disallowedPackages) {
- UserInfo user = createUserInternalUnchecked(name, flags, UserHandle.USER_NULL,
- /* preCreated= */ false, disallowedPackages);
+ public UserInfo createUserEvenWhenDisallowed(String name, @NonNull String userType,
+ @UserInfoFlag int flags, String[] disallowedPackages) {
+ UserInfo user = createUserInternalUnchecked(name, userType, flags,
+ UserHandle.USER_NULL, /* preCreated= */ false, disallowedPackages);
// Keep this in sync with UserManager.createUser
if (user != null && !user.isAdmin() && !user.isDemo()) {
setUserRestriction(UserManager.DISALLOW_SMS, true, user.id);
@@ -4410,7 +4707,7 @@
}
synchronized (mUsersLock) {
UserInfo callingUserInfo = getUserInfoLU(callingUserId);
- if (callingUserInfo == null || callingUserInfo.isManagedProfile()) {
+ if (callingUserInfo == null || callingUserInfo.isProfile()) {
if (throwSecurityException) {
throw new SecurityException(
debugMsg + " for another profile "
@@ -4529,36 +4826,53 @@
(DBG_WITH_STACKTRACE ? " called at\n" + Debug.getCallers(10, " ") : ""));
}
+ /** @see #getMaxUsersOfTypePerParent(UserTypeDetails) */
@VisibleForTesting
- static int getMaxManagedProfiles() {
- // Allow overriding max managed profiles on debuggable builds for testing
- // of multiple profiles.
- if (!Build.IS_DEBUGGABLE) {
- return MAX_MANAGED_PROFILES;
- } else {
- return SystemProperties.getInt("persist.sys.max_profiles",
- MAX_MANAGED_PROFILES);
+ int getMaxUsersOfTypePerParent(String userType) {
+ final UserTypeDetails type = mUserTypes.get(userType);
+ if (type == null) {
+ return 0;
}
+ return getMaxUsersOfTypePerParent(type);
+ }
+
+ /**
+ * Returns the maximum number of users allowed for the given userTypeDetails per parent user.
+ * This is applicable for user types that are {@link UserTypeDetails#isProfile()}.
+ * If there is no maximum, {@link UserTypeDetails#UNLIMITED_NUMBER_OF_USERS} is returned.
+ */
+ private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
+ final int defaultMax = userTypeDetails.getMaxAllowedPerParent();
+ if (!Build.IS_DEBUGGABLE) {
+ return defaultMax;
+ } else {
+ if (userTypeDetails.isManagedProfile()) {
+ return SystemProperties.getInt("persist.sys.max_profiles", defaultMax);
+ }
+ }
+ return defaultMax;
}
@GuardedBy("mUsersLock")
@VisibleForTesting
- int getFreeProfileBadgeLU(int parentUserId) {
- int maxManagedProfiles = getMaxManagedProfiles();
- boolean[] usedBadges = new boolean[maxManagedProfiles];
+ int getFreeProfileBadgeLU(int parentUserId, String userType) {
+ Set<Integer> usedBadges = new ArraySet<>();
final int userSize = mUsers.size();
for (int i = 0; i < userSize; i++) {
UserInfo ui = mUsers.valueAt(i).info;
// Check which badge indexes are already used by this profile group.
- if (ui.isManagedProfile()
+ if (ui.userType.equals(userType)
&& ui.profileGroupId == parentUserId
- && !mRemovingUserIds.get(ui.id)
- && ui.profileBadge < maxManagedProfiles) {
- usedBadges[ui.profileBadge] = true;
+ && !mRemovingUserIds.get(ui.id)) {
+ usedBadges.add(ui.profileBadge);
}
}
- for (int i = 0; i < maxManagedProfiles; i++) {
- if (!usedBadges[i]) {
+ int maxUsersOfType = getMaxUsersOfTypePerParent(userType);
+ if (maxUsersOfType == UserTypeDetails.UNLIMITED_NUMBER_OF_USERS) {
+ maxUsersOfType = Integer.MAX_VALUE;
+ }
+ for (int i = 0; i < maxUsersOfType; i++) {
+ if (!usedBadges.contains(i)) {
return i;
}
}
diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
index ef6b24c..95197b0 100644
--- a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
+++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
@@ -389,7 +389,7 @@
final ArrayMap<String, Integer> result = new ArrayMap<>(whitelist.size() + 1);
// First, do the whitelisted user types.
for (int i = 0; i < whitelist.size(); i++) {
- final String pkgName = whitelist.keyAt(i);
+ final String pkgName = whitelist.keyAt(i).intern();
final int flags = getFlagsFromUserTypes(whitelist.valueAt(i));
if (flags != 0) {
result.put(pkgName, flags);
@@ -402,7 +402,7 @@
final ArrayMap<String, Set<String>> blacklist =
sysConfig.getAndClearPackageToUserTypeBlacklist();
for (int i = 0; i < blacklist.size(); i++) {
- final String pkgName = blacklist.keyAt(i);
+ final String pkgName = blacklist.keyAt(i).intern();
final int nonFlags = getFlagsFromUserTypes(blacklist.valueAt(i));
final Integer flags = result.get(pkgName);
if (flags != null) {
@@ -411,12 +411,13 @@
}
// Regardless of the whitelists/blacklists, ensure mandatory packages.
result.put("android",
- UserInfo.FLAG_SYSTEM | UserInfo.FLAG_FULL | UserInfo.PROFILE_FLAGS_MASK);
+ UserInfo.FLAG_SYSTEM | UserInfo.FLAG_FULL | UserInfo.FLAG_PROFILE);
return result;
}
/** Converts a user types, as used in SystemConfig, to a UserInfo flag. */
private static int getFlagsFromUserTypes(Iterable<String> userTypes) {
+ // TODO(b/142482943): Update all this for the new UserTypes.
int flags = 0;
for (String type : userTypes) {
switch (type) {
@@ -442,7 +443,7 @@
flags |= UserInfo.FLAG_SYSTEM;
break;
case "PROFILE":
- flags |= UserInfo.PROFILE_FLAGS_MASK;
+ flags |= UserInfo.FLAG_PROFILE;
break;
default:
Slog.w(TAG, "SystemConfig contained an invalid user type: " + type);
diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java
index b3f1867..cc5aec2 100644
--- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java
+++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java
@@ -314,9 +314,13 @@
case ArtManager.PROFILE_APPS :
return SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false);
case ArtManager.PROFILE_BOOT_IMAGE:
+ // The device config property overrides the system property version.
+ boolean profileBootClassPath = SystemProperties.getBoolean(
+ "persist.device_config.runtime_native_boot.profilebootclasspath",
+ SystemProperties.getBoolean("dalvik.vm.profilebootclasspath", false));
return (Build.IS_USERDEBUG || Build.IS_ENG) &&
SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false) &&
- SystemProperties.getBoolean("dalvik.vm.profilebootimage", false);
+ profileBootClassPath;
default:
throw new IllegalArgumentException("Invalid profile type:" + profileType);
}
diff --git a/services/core/java/com/android/server/pm/permission/PermissionsState.java b/services/core/java/com/android/server/pm/permission/PermissionsState.java
index 505a0e2..b68d541 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionsState.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionsState.java
@@ -23,6 +23,7 @@
import android.util.SparseArray;
import android.util.SparseBooleanArray;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.ArrayUtils;
import java.util.ArrayList;
@@ -30,7 +31,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import com.android.internal.annotations.GuardedBy;
/**
* This class encapsulates the permissions for a package or a shared user.
@@ -708,7 +708,11 @@
}
private static final class PermissionData {
+
+ private final Object mLock = new Object();
+
private final BasePermission mPerm;
+ @GuardedBy("mLock")
private SparseArray<PermissionState> mUserStates = new SparseArray<>();
public PermissionData(BasePermission perm) {
@@ -717,11 +721,14 @@
public PermissionData(PermissionData other) {
this(other.mPerm);
- final int otherStateCount = other.mUserStates.size();
- for (int i = 0; i < otherStateCount; i++) {
- final int otherUserId = other.mUserStates.keyAt(i);
- PermissionState otherState = other.mUserStates.valueAt(i);
- mUserStates.put(otherUserId, new PermissionState(otherState));
+
+ synchronized (mLock) {
+ final int otherStateCount = other.mUserStates.size();
+ for (int i = 0; i < otherStateCount; i++) {
+ final int otherUserId = other.mUserStates.keyAt(i);
+ PermissionState otherState = other.mUserStates.valueAt(i);
+ mUserStates.put(otherUserId, new PermissionState(otherState));
+ }
}
}
@@ -730,71 +737,83 @@
}
public boolean isGranted(int userId) {
- if (isInstallPermission()) {
- userId = UserHandle.USER_ALL;
- }
+ synchronized (mLock) {
+ if (isInstallPermission()) {
+ userId = UserHandle.USER_ALL;
+ }
- PermissionState userState = mUserStates.get(userId);
- if (userState == null) {
- return false;
- }
+ PermissionState userState = mUserStates.get(userId);
+ if (userState == null) {
+ return false;
+ }
- return userState.mGranted;
+ return userState.mGranted;
+ }
}
public boolean grant(int userId) {
- if (!isCompatibleUserId(userId)) {
- return false;
+ synchronized (mLock) {
+ if (!isCompatibleUserId(userId)) {
+ return false;
+ }
+
+ if (isGranted(userId)) {
+ return false;
+ }
+
+ PermissionState userState = mUserStates.get(userId);
+ if (userState == null) {
+ userState = new PermissionState(mPerm.getName());
+ mUserStates.put(userId, userState);
+ }
+
+ userState.mGranted = true;
+
+ return true;
}
-
- if (isGranted(userId)) {
- return false;
- }
-
- PermissionState userState = mUserStates.get(userId);
- if (userState == null) {
- userState = new PermissionState(mPerm.getName());
- mUserStates.put(userId, userState);
- }
-
- userState.mGranted = true;
-
- return true;
}
public boolean revoke(int userId) {
- if (!isCompatibleUserId(userId)) {
- return false;
+ synchronized (mLock) {
+ if (!isCompatibleUserId(userId)) {
+ return false;
+ }
+
+ if (!isGranted(userId)) {
+ return false;
+ }
+
+ PermissionState userState = mUserStates.get(userId);
+ userState.mGranted = false;
+
+ if (userState.isDefault()) {
+ mUserStates.remove(userId);
+ }
+
+ return true;
}
-
- if (!isGranted(userId)) {
- return false;
- }
-
- PermissionState userState = mUserStates.get(userId);
- userState.mGranted = false;
-
- if (userState.isDefault()) {
- mUserStates.remove(userId);
- }
-
- return true;
}
public PermissionState getPermissionState(int userId) {
- return mUserStates.get(userId);
+ synchronized (mLock) {
+ return mUserStates.get(userId);
+ }
}
public int getFlags(int userId) {
- PermissionState userState = mUserStates.get(userId);
- if (userState != null) {
- return userState.mFlags;
+ synchronized (mLock) {
+ PermissionState userState = mUserStates.get(userId);
+ if (userState != null) {
+ return userState.mFlags;
+ }
+ return 0;
}
- return 0;
}
public boolean isDefault() {
- return mUserStates.size() <= 0;
+ synchronized (mLock) {
+ return mUserStates.size() <= 0;
+ }
}
public static boolean isInstallPermissionKey(int userId) {
@@ -802,32 +821,34 @@
}
public boolean updateFlags(int userId, int flagMask, int flagValues) {
- if (isInstallPermission()) {
- userId = UserHandle.USER_ALL;
- }
+ synchronized (mLock) {
+ if (isInstallPermission()) {
+ userId = UserHandle.USER_ALL;
+ }
- if (!isCompatibleUserId(userId)) {
+ if (!isCompatibleUserId(userId)) {
+ return false;
+ }
+
+ final int newFlags = flagValues & flagMask;
+
+ PermissionState userState = mUserStates.get(userId);
+ if (userState != null) {
+ final int oldFlags = userState.mFlags;
+ userState.mFlags = (userState.mFlags & ~flagMask) | newFlags;
+ if (userState.isDefault()) {
+ mUserStates.remove(userId);
+ }
+ return userState.mFlags != oldFlags;
+ } else if (newFlags != 0) {
+ userState = new PermissionState(mPerm.getName());
+ userState.mFlags = newFlags;
+ mUserStates.put(userId, userState);
+ return true;
+ }
+
return false;
}
-
- final int newFlags = flagValues & flagMask;
-
- PermissionState userState = mUserStates.get(userId);
- if (userState != null) {
- final int oldFlags = userState.mFlags;
- userState.mFlags = (userState.mFlags & ~flagMask) | newFlags;
- if (userState.isDefault()) {
- mUserStates.remove(userId);
- }
- return userState.mFlags != oldFlags;
- } else if (newFlags != 0) {
- userState = new PermissionState(mPerm.getName());
- userState.mFlags = newFlags;
- mUserStates.put(userId, userState);
- return true;
- }
-
- return false;
}
private boolean isCompatibleUserId(int userId) {
diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java
index 9b9f93f..3c4e3f6 100644
--- a/services/core/java/com/android/server/policy/PermissionPolicyService.java
+++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java
@@ -29,8 +29,10 @@
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.AppOpsManager;
+import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -169,6 +171,23 @@
} catch (RemoteException doesNotHappen) {
Slog.wtf(LOG_TAG, "Cannot set up app-ops listener");
}
+
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+ intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+ intentFilter.addDataScheme("package");
+
+ getContext().registerReceiverAsUser(new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ UserHandle user =
+ UserHandle.getUserHandleForUid(intent.getIntExtra(Intent.EXTRA_UID, -1));
+ new PermissionControllerManager(
+ getUserContext(getContext(), user), FgThread.getHandler())
+ .updateUserSensitive();
+ }
+ }, UserHandle.ALL, intentFilter, null, null);
+
}
/**
diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java
index 01250db..1f37faf 100644
--- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java
+++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java
@@ -213,15 +213,6 @@
public Rect getDisplayFrameLw();
/**
- * Retrieve the frame of the area inside the overscan region of the
- * display that this window was last laid out in. Must be called with the
- * window manager lock held.
- *
- * @return Rect The rectangle holding the display overscan frame.
- */
- public Rect getOverscanFrameLw();
-
- /**
* Retrieve the frame of the content area that this window was last
* laid out in. This is the area in which the content of the window
* should be placed. It will be smaller than the display frame to
diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java b/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java
index f78d263..add0b01 100644
--- a/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java
@@ -19,8 +19,6 @@
import android.app.ActivityManager;
import android.content.Context;
import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.security.keystore.IKeystoreService;
import android.util.Slog;
import com.android.internal.policy.IKeyguardService;
@@ -53,16 +51,11 @@
private final LockPatternUtils mLockPatternUtils;
private final StateCallback mCallback;
- IKeystoreService mKeystoreService;
-
public KeyguardStateMonitor(Context context, IKeyguardService service, StateCallback callback) {
mLockPatternUtils = new LockPatternUtils(context);
mCurrentUserId = ActivityManager.getCurrentUser();
mCallback = callback;
- mKeystoreService = IKeystoreService.Stub.asInterface(ServiceManager
- .getService("android.security.keystore"));
-
try {
service.addStateMonitorCallback(this);
} catch (RemoteException e) {
@@ -95,23 +88,6 @@
mIsShowing = showing;
mCallback.onShowingChanged();
- int retry = 2;
- while (retry > 0) {
- try {
- mKeystoreService.onKeyguardVisibilityChanged(showing, mCurrentUserId);
- break;
- } catch (RemoteException e) {
- if (retry == 2) {
- Slog.w(TAG, "Error informing keystore of screen lock. Keystore may have died"
- + " -> refreshing service token and retrying");
- mKeystoreService = IKeystoreService.Stub.asInterface(ServiceManager
- .getService("android.security.keystore"));
- } else {
- Slog.e(TAG, "Error informing keystore of screen lock after retrying once", e);
- }
- --retry;
- }
- }
}
@Override // Binder interface
@@ -123,10 +99,6 @@
mCurrentUserId = userId;
}
- private synchronized int getCurrentUser() {
- return mCurrentUserId;
- }
-
@Override // Binder interface
public void onInputRestrictedStateChanged(boolean inputRestricted) {
mInputRestricted = inputRestricted;
diff --git a/services/core/java/com/android/server/power/InattentiveSleepWarningController.java b/services/core/java/com/android/server/power/InattentiveSleepWarningController.java
new file mode 100644
index 0000000..db8a63f
--- /dev/null
+++ b/services/core/java/com/android/server/power/InattentiveSleepWarningController.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (C) 2019 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.power;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.statusbar.IStatusBarService;
+
+/**
+ * Communicates with System UI to show/hide the inattentive sleep warning overlay.
+ */
+@VisibleForTesting
+public class InattentiveSleepWarningController {
+ private static final String TAG = "InattentiveSleepWarning";
+
+ private final Handler mHandler = new Handler();
+
+ private boolean mIsShown;
+ private IStatusBarService mStatusBarService;
+
+ InattentiveSleepWarningController() {
+ }
+
+ /**
+ * Returns true if the warning is currently being displayed, false otherwise.
+ */
+ @GuardedBy("PowerManagerService.mLock")
+ public boolean isShown() {
+ return mIsShown;
+ }
+
+ /**
+ * Show the warning.
+ */
+ @GuardedBy("PowerManagerService.mLock")
+ public void show() {
+ if (isShown()) {
+ return;
+ }
+
+ mHandler.post(this::showInternal);
+ mIsShown = true;
+ }
+
+ private void showInternal() {
+ try {
+ getStatusBar().showInattentiveSleepWarning();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to show inattentive sleep warning", e);
+ mIsShown = false;
+ }
+ }
+
+ /**
+ * Dismiss the warning.
+ */
+ @GuardedBy("PowerManagerService.mLock")
+ public void dismiss() {
+ if (!isShown()) {
+ return;
+ }
+
+ mHandler.post(this::dismissInternal);
+ mIsShown = false;
+ }
+
+ private void dismissInternal() {
+ try {
+ getStatusBar().dismissInattentiveSleepWarning();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to dismiss inattentive sleep warning", e);
+ }
+ }
+
+ private IStatusBarService getStatusBar() {
+ if (mStatusBarService == null) {
+ mStatusBarService = IStatusBarService.Stub.asInterface(
+ ServiceManager.getService(Context.STATUS_BAR_SERVICE));
+ }
+
+ return mStatusBarService;
+ }
+}
diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java
index b67d9b2..7fc9fdc0 100644
--- a/services/core/java/com/android/server/power/Notifier.java
+++ b/services/core/java/com/android/server/power/Notifier.java
@@ -536,6 +536,7 @@
case PowerManager.GO_TO_SLEEP_REASON_DEVICE_ADMIN:
return WindowManagerPolicy.OFF_BECAUSE_OF_ADMIN;
case PowerManager.GO_TO_SLEEP_REASON_TIMEOUT:
+ case PowerManager.GO_TO_SLEEP_REASON_INATTENTIVE:
return WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT;
default:
return WindowManagerPolicy.OFF_BECAUSE_OF_USER;
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index befe4e9..00e0f71 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -128,6 +128,8 @@
private static final int MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT = 3;
// Message: Polling to look for long held wake locks.
private static final int MSG_CHECK_FOR_LONG_WAKELOCKS = 4;
+ // Message: Sent when an attentive timeout occurs to update the power state.
+ private static final int MSG_ATTENTIVE_TIMEOUT = 5;
// Dirty bit: mWakeLocks changed
private static final int DIRTY_WAKE_LOCKS = 1 << 0;
@@ -157,6 +159,8 @@
private static final int DIRTY_QUIESCENT = 1 << 12;
// Dirty bit: VR Mode enabled changed
private static final int DIRTY_VR_MODE_CHANGED = 1 << 13;
+ // Dirty bit: attentive timer may have timed out
+ private static final int DIRTY_ATTENTIVE = 1 << 14;
// Summarizes the state of all active wakelocks.
private static final int WAKE_LOCK_CPU = 1 << 0;
@@ -249,6 +253,8 @@
private DreamManagerInternal mDreamManager;
private Light mAttentionLight;
+ private InattentiveSleepWarningController mInattentiveSleepWarningOverlayController;
+
private final Object mLock = LockGuard.installNewLock(LockGuard.INDEX_POWER);
// A bitfield that indicates what parts of the power state have
@@ -381,6 +387,9 @@
// True if the device should suspend when the screen is off due to proximity.
private boolean mSuspendWhenScreenOffDueToProximityConfig;
+ // Default value for attentive timeout.
+ private int mAttentiveTimeoutConfig;
+
// True if dreams are supported on this device.
private boolean mDreamsSupportedConfig;
@@ -441,9 +450,16 @@
// The screen off timeout setting value in milliseconds.
private long mScreenOffTimeoutSetting;
+ // Default for attentive warning duration.
+ private long mAttentiveWarningDurationConfig;
+
// The sleep timeout setting value in milliseconds.
private long mSleepTimeoutSetting;
+ // How long to show a warning message to user before the device goes to sleep
+ // after long user inactivity, even if wakelocks are held.
+ private long mAttentiveTimeoutSetting;
+
// The maximum allowable screen off timeout according to the device
// administration policy. Overrides other settings.
private long mMaximumScreenOffTimeoutFromDeviceAdmin = Long.MAX_VALUE;
@@ -735,6 +751,10 @@
AmbientDisplayConfiguration createAmbientDisplayConfiguration(Context context) {
return new AmbientDisplayConfiguration(context);
}
+
+ InattentiveSleepWarningController createInattentiveSleepWarningController() {
+ return new InattentiveSleepWarningController();
+ }
}
final Constants mConstants;
@@ -779,6 +799,9 @@
mBatterySaverStateMachine = new BatterySaverStateMachine(
mLock, mContext, mBatterySaverController);
+ mInattentiveSleepWarningOverlayController =
+ mInjector.createInattentiveSleepWarningController();
+
synchronized (mLock) {
mWakeLockSuspendBlocker =
mInjector.createSuspendBlocker(this, "PowerManagerService.WakeLocks");
@@ -902,6 +925,9 @@
resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.SLEEP_TIMEOUT),
false, mSettingsObserver, UserHandle.USER_ALL);
+ resolver.registerContentObserver(Settings.Secure.getUriFor(
+ Settings.Secure.ATTENTIVE_TIMEOUT),
+ false, mSettingsObserver, UserHandle.USER_ALL);
resolver.registerContentObserver(Settings.Global.getUriFor(
Settings.Global.STAY_ON_WHILE_PLUGGED_IN),
false, mSettingsObserver, UserHandle.USER_ALL);
@@ -966,6 +992,10 @@
com.android.internal.R.bool.config_allowTheaterModeWakeFromUnplug);
mSuspendWhenScreenOffDueToProximityConfig = resources.getBoolean(
com.android.internal.R.bool.config_suspendWhenScreenOffDueToProximity);
+ mAttentiveTimeoutConfig = resources.getInteger(
+ com.android.internal.R.integer.config_attentiveTimeout);
+ mAttentiveWarningDurationConfig = resources.getInteger(
+ com.android.internal.R.integer.config_attentiveWarningDuration);
mDreamsSupportedConfig = resources.getBoolean(
com.android.internal.R.bool.config_dreamsSupported);
mDreamsEnabledByDefaultConfig = resources.getBoolean(
@@ -1015,6 +1045,9 @@
mSleepTimeoutSetting = Settings.Secure.getIntForUser(resolver,
Settings.Secure.SLEEP_TIMEOUT, DEFAULT_SLEEP_TIMEOUT,
UserHandle.USER_CURRENT);
+ mAttentiveTimeoutSetting = Settings.Secure.getIntForUser(resolver,
+ Settings.Secure.ATTENTIVE_TIMEOUT, mAttentiveTimeoutConfig,
+ UserHandle.USER_CURRENT);
mStayOnWhilePluggedInSetting = Settings.Global.getInt(resolver,
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, BatteryManager.BATTERY_PLUGGED_AC);
mTheaterModeEnabled = Settings.Global.getInt(mContext.getContentResolver(),
@@ -1700,6 +1733,7 @@
updateWakeLockSummaryLocked(dirtyPhase1);
updateUserActivitySummaryLocked(now, dirtyPhase1);
+ updateAttentiveStateLocked(now, dirtyPhase1);
if (!updateWakefulnessLocked(dirtyPhase1)) {
break;
}
@@ -2042,8 +2076,10 @@
if (mWakefulness == WAKEFULNESS_AWAKE
|| mWakefulness == WAKEFULNESS_DREAMING
|| mWakefulness == WAKEFULNESS_DOZING) {
- final long sleepTimeout = getSleepTimeoutLocked();
- final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout);
+ final long attentiveTimeout = getAttentiveTimeoutLocked();
+ final long sleepTimeout = getSleepTimeoutLocked(attentiveTimeout);
+ final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout,
+ attentiveTimeout);
final long screenDimDuration = getScreenDimDurationLocked(screenOffTimeout);
final boolean userInactiveOverride = mUserInactiveOverrideFromWindowManager;
final long nextProfileTimeout = getNextProfileTimeoutLocked(now);
@@ -2134,6 +2170,12 @@
mHandler.sendMessageAtTime(msg, timeMs);
}
+ private void scheduleAttentiveTimeout(long timeMs) {
+ final Message msg = mHandler.obtainMessage(MSG_ATTENTIVE_TIMEOUT);
+ msg.setAsynchronous(true);
+ mHandler.sendMessageAtTime(msg, timeMs);
+ }
+
/**
* Finds the next profile timeout time or returns -1 if there are no profiles to be locked.
*/
@@ -2150,6 +2192,69 @@
return nextTimeout;
}
+ private void updateAttentiveStateLocked(long now, int dirty) {
+ long attentiveTimeout = getAttentiveTimeoutLocked();
+ long goToSleepTime = mLastUserActivityTime + attentiveTimeout;
+ long showWarningTime = goToSleepTime - mAttentiveWarningDurationConfig;
+
+ boolean warningDismissed = maybeHideInattentiveSleepWarningLocked(now, showWarningTime);
+
+ if (attentiveTimeout >= 0 && (warningDismissed
+ || (dirty & (DIRTY_ATTENTIVE | DIRTY_STAY_ON | DIRTY_SCREEN_BRIGHTNESS_BOOST
+ | DIRTY_PROXIMITY_POSITIVE | DIRTY_WAKEFULNESS | DIRTY_BOOT_COMPLETED
+ | DIRTY_SETTINGS)) != 0)) {
+ if (DEBUG_SPEW) {
+ Slog.d(TAG, "Updating attentive state");
+ }
+
+ mHandler.removeMessages(MSG_ATTENTIVE_TIMEOUT);
+
+ if (isBeingKeptFromShowingInattentiveSleepWarningLocked()) {
+ return;
+ }
+
+ long nextTimeout = -1;
+
+ if (now < showWarningTime) {
+ nextTimeout = showWarningTime;
+ } else if (now < goToSleepTime) {
+ if (DEBUG) {
+ long timeToSleep = goToSleepTime - now;
+ Slog.d(TAG, "Going to sleep in " + timeToSleep
+ + "ms if there is no user activity");
+ }
+ mInattentiveSleepWarningOverlayController.show();
+ nextTimeout = goToSleepTime;
+ } else {
+ if (DEBUG && mWakefulness != WAKEFULNESS_ASLEEP) {
+ Slog.i(TAG, "Going to sleep now due to long user inactivity");
+ }
+ }
+
+ if (nextTimeout >= 0) {
+ scheduleAttentiveTimeout(nextTimeout);
+ }
+ }
+ }
+
+ private boolean maybeHideInattentiveSleepWarningLocked(long now, long showWarningTime) {
+ long attentiveTimeout = getAttentiveTimeoutLocked();
+
+ if (mInattentiveSleepWarningOverlayController.isShown() && (attentiveTimeout < 0
+ || isBeingKeptFromShowingInattentiveSleepWarningLocked()
+ || now < showWarningTime)) {
+ mInattentiveSleepWarningOverlayController.dismiss();
+ return true;
+ }
+
+ return false;
+ }
+
+ private boolean isAttentiveTimeoutExpired(long now) {
+ long attentiveTimeout = getAttentiveTimeoutLocked();
+ return attentiveTimeout >= 0 && now > mLastUserActivityTime + attentiveTimeout;
+ }
+
/**
* Called when a user activity timeout has occurred.
* Simply indicates that something about user activity has changed so that the new
@@ -2169,15 +2274,38 @@
}
}
- private long getSleepTimeoutLocked() {
- final long timeout = mSleepTimeoutSetting;
+ private void handleAttentiveTimeout() { // runs on handler thread
+ synchronized (mLock) {
+ if (DEBUG_SPEW) {
+ Slog.d(TAG, "handleAttentiveTimeout");
+ }
+
+ mDirty |= DIRTY_ATTENTIVE;
+ updatePowerStateLocked();
+ }
+ }
+
+ private long getAttentiveTimeoutLocked() {
+ long timeout = mAttentiveTimeoutSetting;
if (timeout <= 0) {
return -1;
}
+
+ return Math.max(timeout, mMinimumScreenOffTimeoutConfig);
+ }
+
+ private long getSleepTimeoutLocked(long attentiveTimeout) {
+ long timeout = mSleepTimeoutSetting;
+ if (timeout <= 0) {
+ return -1;
+ }
+ if (attentiveTimeout >= 0) {
+ timeout = Math.min(timeout, attentiveTimeout);
+ }
return Math.max(timeout, mMinimumScreenOffTimeoutConfig);
}
- private long getScreenOffTimeoutLocked(long sleepTimeout) {
+ private long getScreenOffTimeoutLocked(long sleepTimeout, long attentiveTimeout) {
long timeout = mScreenOffTimeoutSetting;
if (isMaximumScreenOffTimeoutFromDeviceAdminEnforcedLocked()) {
timeout = Math.min(timeout, mMaximumScreenOffTimeoutFromDeviceAdmin);
@@ -2188,6 +2316,9 @@
if (sleepTimeout >= 0) {
timeout = Math.min(timeout, sleepTimeout);
}
+ if (attentiveTimeout >= 0) {
+ timeout = Math.min(timeout, attentiveTimeout);
+ }
return Math.max(timeout, mMinimumScreenOffTimeoutConfig);
}
@@ -2209,13 +2340,16 @@
boolean changed = false;
if ((dirty & (DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY | DIRTY_BOOT_COMPLETED
| DIRTY_WAKEFULNESS | DIRTY_STAY_ON | DIRTY_PROXIMITY_POSITIVE
- | DIRTY_DOCK_STATE)) != 0) {
+ | DIRTY_DOCK_STATE | DIRTY_ATTENTIVE)) != 0) {
if (mWakefulness == WAKEFULNESS_AWAKE && isItBedTimeYetLocked()) {
if (DEBUG_SPEW) {
Slog.d(TAG, "updateWakefulnessLocked: Bed time...");
}
final long time = SystemClock.uptimeMillis();
- if (shouldNapAtBedTimeLocked()) {
+ if (isAttentiveTimeoutExpired(time)) {
+ changed = goToSleepNoUpdateLocked(time, PowerManager.GO_TO_SLEEP_REASON_TIMEOUT,
+ PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE, Process.SYSTEM_UID);
+ } else if (shouldNapAtBedTimeLocked()) {
changed = napNoUpdateLocked(time, Process.SYSTEM_UID);
} else {
changed = goToSleepNoUpdateLocked(time,
@@ -2242,7 +2376,16 @@
* to being fully awake or else go to sleep for good.
*/
private boolean isItBedTimeYetLocked() {
- return mBootCompleted && !isBeingKeptAwakeLocked();
+ if (!mBootCompleted) {
+ return false;
+ }
+
+ long now = SystemClock.uptimeMillis();
+ if (isAttentiveTimeoutExpired(now)) {
+ return !isBeingKeptFromInattentiveSleepLocked();
+ } else {
+ return !isBeingKeptAwakeLocked();
+ }
}
/**
@@ -2263,11 +2406,29 @@
}
/**
+ * Returns true if the device is prevented from going into inattentive sleep by the stay on
+ * while powered setting. We also keep the device awake when the proximity sensor returns a
+ * positive result so that the device does not lock while in a phone call. This function only
+ * controls whether the device will go to sleep which is independent of whether it will be
+ * allowed to suspend.
+ */
+ private boolean isBeingKeptFromInattentiveSleepLocked() {
+ return mStayOn || mScreenBrightnessBoostInProgress || mProximityPositive
+ || (mUserActivitySummary & (USER_ACTIVITY_SCREEN_BRIGHT
+ | USER_ACTIVITY_SCREEN_DIM)) != 0;
+ }
+
+ private boolean isBeingKeptFromShowingInattentiveSleepWarningLocked() {
+ return mStayOn || mScreenBrightnessBoostInProgress || mProximityPositive || !mBootCompleted;
+ }
+
+ /**
* Determines whether to post a message to the sandman to update the dream state.
*/
private void updateDreamLocked(int dirty, boolean displayBecameReady) {
if ((dirty & (DIRTY_WAKEFULNESS
| DIRTY_USER_ACTIVITY
+ | DIRTY_ATTENTIVE
| DIRTY_WAKE_LOCKS
| DIRTY_BOOT_COMPLETED
| DIRTY_SETTINGS
@@ -2350,6 +2511,7 @@
}
// Determine whether the dream should continue.
+ long now = SystemClock.uptimeMillis();
if (wakefulness == WAKEFULNESS_DREAMING) {
if (isDreaming && canDreamLocked()) {
if (mDreamsBatteryLevelDrainCutoffConfig >= 0
@@ -2371,11 +2533,15 @@
// Dream has ended or will be stopped. Update the power state.
if (isItBedTimeYetLocked()) {
- goToSleepNoUpdateLocked(SystemClock.uptimeMillis(),
- PowerManager.GO_TO_SLEEP_REASON_TIMEOUT, 0, Process.SYSTEM_UID);
+ int flags = 0;
+ if (isAttentiveTimeoutExpired(now)) {
+ flags |= PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE;
+ }
+ goToSleepNoUpdateLocked(now, PowerManager.GO_TO_SLEEP_REASON_TIMEOUT, flags,
+ Process.SYSTEM_UID);
updatePowerStateLocked();
} else {
- wakeUpNoUpdateLocked(SystemClock.uptimeMillis(),
+ wakeUpNoUpdateLocked(now,
PowerManager.WAKE_REASON_UNKNOWN,
"android.server.power:DREAM_FINISHED", Process.SYSTEM_UID,
mContext.getOpPackageName(), Process.SYSTEM_UID);
@@ -2387,7 +2553,7 @@
}
// Doze has ended or will be stopped. Update the power state.
- reallyGoToSleepNoUpdateLocked(SystemClock.uptimeMillis(), Process.SYSTEM_UID);
+ reallyGoToSleepNoUpdateLocked(now, Process.SYSTEM_UID);
updatePowerStateLocked();
}
}
@@ -3474,6 +3640,9 @@
pw.println(" mMinimumScreenOffTimeoutConfig=" + mMinimumScreenOffTimeoutConfig);
pw.println(" mMaximumScreenDimDurationConfig=" + mMaximumScreenDimDurationConfig);
pw.println(" mMaximumScreenDimRatioConfig=" + mMaximumScreenDimRatioConfig);
+ pw.println(" mAttentiveTimeoutConfig=" + mAttentiveTimeoutConfig);
+ pw.println(" mAttentiveTimeoutSetting=" + mAttentiveTimeoutSetting);
+ pw.println(" mAttentiveWarningDurationConfig=" + mAttentiveWarningDurationConfig);
pw.println(" mScreenOffTimeoutSetting=" + mScreenOffTimeoutSetting);
pw.println(" mSleepTimeoutSetting=" + mSleepTimeoutSetting);
pw.println(" mMaximumScreenOffTimeoutFromDeviceAdmin="
@@ -3501,10 +3670,12 @@
pw.println(" mForegroundProfile=" + mForegroundProfile);
pw.println(" mUserId=" + mUserId);
- final long sleepTimeout = getSleepTimeoutLocked();
- final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout);
+ final long attentiveTimeout = getAttentiveTimeoutLocked();
+ final long sleepTimeout = getSleepTimeoutLocked(attentiveTimeout);
+ final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout, attentiveTimeout);
final long screenDimDuration = getScreenDimDurationLocked(screenOffTimeout);
pw.println();
+ pw.println("Attentive timeout: " + attentiveTimeout + " ms");
pw.println("Sleep timeout: " + sleepTimeout + " ms");
pw.println("Screen off timeout: " + screenOffTimeout + " ms");
pw.println("Screen dim duration: " + screenDimDuration + " ms");
@@ -3772,6 +3943,16 @@
PowerServiceSettingsAndConfigurationDumpProto.SLEEP_TIMEOUT_SETTING_MS,
mSleepTimeoutSetting);
proto.write(
+ PowerServiceSettingsAndConfigurationDumpProto.ATTENTIVE_TIMEOUT_SETTING_MS,
+ mAttentiveTimeoutSetting);
+ proto.write(
+ PowerServiceSettingsAndConfigurationDumpProto.ATTENTIVE_TIMEOUT_CONFIG_MS,
+ mAttentiveTimeoutConfig);
+ proto.write(
+ PowerServiceSettingsAndConfigurationDumpProto
+ .ATTENTIVE_WARNING_DURATION_CONFIG_MS,
+ mAttentiveWarningDurationConfig);
+ proto.write(
PowerServiceSettingsAndConfigurationDumpProto
.MAXIMUM_SCREEN_OFF_TIMEOUT_FROM_DEVICE_ADMIN_MS,
// Clamp to int32
@@ -3853,9 +4034,11 @@
mIsVrModeEnabled);
proto.end(settingsAndConfigurationToken);
- final long sleepTimeout = getSleepTimeoutLocked();
- final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout);
+ final long attentiveTimeout = getAttentiveTimeoutLocked();
+ final long sleepTimeout = getSleepTimeoutLocked(attentiveTimeout);
+ final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout, attentiveTimeout);
final long screenDimDuration = getScreenDimDurationLocked(screenOffTimeout);
+ proto.write(PowerManagerServiceDumpProto.ATTENTIVE_TIMEOUT_MS, attentiveTimeout);
proto.write(PowerManagerServiceDumpProto.SLEEP_TIMEOUT_MS, sleepTimeout);
proto.write(PowerManagerServiceDumpProto.SCREEN_OFF_TIMEOUT_MS, screenOffTimeout);
proto.write(PowerManagerServiceDumpProto.SCREEN_DIM_DURATION_MS, screenDimDuration);
@@ -4009,6 +4192,9 @@
case MSG_CHECK_FOR_LONG_WAKELOCKS:
checkForLongWakeLocks();
break;
+ case MSG_ATTENTIVE_TIMEOUT:
+ handleAttentiveTimeout();
+ break;
}
}
}
diff --git a/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java b/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java
index 8431ae4..c1eacce 100644
--- a/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java
+++ b/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java
@@ -15,28 +15,22 @@
*/
package com.android.server.stats;
+import static android.os.Process.PROC_OUT_STRING;
+
import android.annotation.Nullable;
-import android.os.FileUtils;
-import android.util.Slog;
+import android.os.Process;
-import com.android.internal.annotations.VisibleForTesting;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.function.BiConsumer;
final class ProcfsMemoryUtil {
- private static final String TAG = "ProcfsMemoryUtil";
-
- private static final Pattern STATUS_MEMORY_STATS =
- Pattern.compile(String.join(
- ".*",
- "Uid:\\s*(\\d+)\\s*",
- "VmHWM:\\s*(\\d+)\\s*kB",
- "VmRSS:\\s*(\\d+)\\s*kB",
- "RssAnon:\\s*(\\d+)\\s*kB",
- "VmSwap:\\s*(\\d+)\\s*kB"), Pattern.DOTALL);
+ private static final int[] CMDLINE_OUT = new int[] { PROC_OUT_STRING };
+ private static final String[] STATUS_KEYS = new String[] {
+ "Uid:",
+ "VmHWM:",
+ "VmRSS:",
+ "RssAnon:",
+ "VmSwap:"
+ };
private ProcfsMemoryUtil() {}
@@ -46,30 +40,21 @@
*/
@Nullable
static MemorySnapshot readMemorySnapshotFromProcfs(int pid) {
- return parseMemorySnapshotFromStatus(readFile("/proc/" + pid + "/status"));
- }
-
- @VisibleForTesting
- @Nullable
- static MemorySnapshot parseMemorySnapshotFromStatus(String contents) {
- if (contents.isEmpty()) {
+ long[] output = new long[STATUS_KEYS.length];
+ output[0] = -1;
+ Process.readProcLines("/proc/" + pid + "/status", STATUS_KEYS, output);
+ if (output[0] == -1 || (output[3] == 0 && output[4] == 0)) {
+ // Could not open file or anon rss / swap are 0 indicating the process is in a zombie
+ // state.
return null;
}
- try {
- final Matcher matcher = STATUS_MEMORY_STATS.matcher(contents);
- if (matcher.find()) {
- final MemorySnapshot snapshot = new MemorySnapshot();
- snapshot.uid = Integer.parseInt(matcher.group(1));
- snapshot.rssHighWaterMarkInKilobytes = Integer.parseInt(matcher.group(2));
- snapshot.rssInKilobytes = Integer.parseInt(matcher.group(3));
- snapshot.anonRssInKilobytes = Integer.parseInt(matcher.group(4));
- snapshot.swapInKilobytes = Integer.parseInt(matcher.group(5));
- return snapshot;
- }
- } catch (NumberFormatException e) {
- Slog.e(TAG, "Failed to parse value", e);
- }
- return null;
+ final MemorySnapshot snapshot = new MemorySnapshot();
+ snapshot.uid = (int) output[0];
+ snapshot.rssHighWaterMarkInKilobytes = (int) output[1];
+ snapshot.rssInKilobytes = (int) output[2];
+ snapshot.anonRssInKilobytes = (int) output[3];
+ snapshot.swapInKilobytes = (int) output[4];
+ return snapshot;
}
/**
@@ -78,31 +63,27 @@
* Returns content of /proc/pid/cmdline (e.g. /system/bin/statsd) or an empty string
* if the file is not available.
*/
- public static String readCmdlineFromProcfs(int pid) {
- return parseCmdline(readFile("/proc/" + pid + "/cmdline"));
- }
-
- /**
- * Parses cmdline out of the contents of the /proc/pid/cmdline file in procfs.
- *
- * Parsing is required to strip anything after the first null byte.
- */
- @VisibleForTesting
- static String parseCmdline(String contents) {
- int firstNullByte = contents.indexOf("\0");
- if (firstNullByte == -1) {
- return contents;
- }
- return contents.substring(0, firstNullByte);
- }
-
- private static String readFile(String path) {
- try {
- final File file = new File(path);
- return FileUtils.readTextFile(file, 0 /* max */, null /* ellipsis */);
- } catch (IOException e) {
+ static String readCmdlineFromProcfs(int pid) {
+ String[] cmdline = new String[1];
+ if (!Process.readProcFile("/proc/" + pid + "/cmdline", CMDLINE_OUT, cmdline, null, null)) {
return "";
}
+ return cmdline[0];
+ }
+
+ static void forEachPid(BiConsumer<Integer, String> func) {
+ int[] pids = new int[1024];
+ pids = Process.getPids("/proc", pids);
+ for (int pid : pids) {
+ if (pid < 0) {
+ return;
+ }
+ String cmdline = readCmdlineFromProcfs(pid);
+ if (cmdline.isEmpty()) {
+ continue;
+ }
+ func.accept(pid, cmdline);
+ }
}
static final class MemorySnapshot {
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 25c41f5..c256b84 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -1375,6 +1375,28 @@
this, in, out, err, args, callback, resultReceiver);
}
+ @Override
+ public void showInattentiveSleepWarning() {
+ enforceStatusBarService();
+ if (mBar != null) {
+ try {
+ mBar.showInattentiveSleepWarning();
+ } catch (RemoteException ex) {
+ }
+ }
+ }
+
+ @Override
+ public void dismissInattentiveSleepWarning() {
+ enforceStatusBarService();
+ if (mBar != null) {
+ try {
+ mBar.dismissInattentiveSleepWarning();
+ } catch (RemoteException ex) {
+ }
+ }
+ }
+
public String[] getStatusBarIcons() {
return mContext.getResources().getStringArray(R.array.config_statusBarIcons);
}
diff --git a/services/core/java/com/android/server/storage/StorageSessionController.java b/services/core/java/com/android/server/storage/StorageSessionController.java
index 2d36a0d..72a1b9d 100644
--- a/services/core/java/com/android/server/storage/StorageSessionController.java
+++ b/services/core/java/com/android/server/storage/StorageSessionController.java
@@ -18,6 +18,8 @@
import android.Manifest;
import android.annotation.Nullable;
+import android.app.ActivityManager;
+import android.app.IActivityManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -25,7 +27,12 @@
import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
+import android.os.Handler;
+import android.os.IVold;
import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
+import android.os.ServiceSpecificException;
+import android.os.UserHandle;
import android.os.storage.VolumeInfo;
import android.provider.MediaStore;
import android.service.storage.ExternalStorageService;
@@ -47,27 +54,41 @@
private final Object mLock = new Object();
private final Context mContext;
- private final Callback mCallback;
- @GuardedBy("mLock")
- private ComponentName mExternalStorageServiceComponent;
@GuardedBy("mLock")
private final SparseArray<StorageUserConnection> mConnections = new SparseArray<>();
+ private final boolean mIsFuseEnabled;
- public StorageSessionController(Context context, Callback callback) {
+ private volatile ComponentName mExternalStorageServiceComponent;
+ private volatile String mExternalStorageServicePackageName;
+ private volatile int mExternalStorageServiceAppId;
+ private volatile boolean mIsResetting;
+
+ public StorageSessionController(Context context, boolean isFuseEnabled) {
mContext = Preconditions.checkNotNull(context);
- mCallback = Preconditions.checkNotNull(callback);
+ mIsFuseEnabled = isFuseEnabled;
}
/**
- * Starts a storage session associated with {@code deviceFd} for {@code vol}.
- * Does nothing if a session is already started or starting. If the user associated with
- * {@code vol} is not yet ready, the session will be retried {@link #onUserStarted}.
+ * Creates a storage session associated with {@code deviceFd} for {@code vol}. Sessions can be
+ * started with {@link #onVolumeReady} and removed with {@link #onVolumeUnmount} or
+ * {@link #onVolumeRemove}.
*
- * A session must be ended with {@link #endSession} when no longer required.
+ * Does nothing if {@link #shouldHandle} is {@code false}
+ *
+ * @throws IllegalStateException if a session has already been created for {@code vol}
*/
- public void onVolumeMounted(int userId, FileDescriptor deviceFd, VolumeInfo vol) {
+ public void onVolumeMount(FileDescriptor deviceFd, VolumeInfo vol) {
+ if (!shouldHandle(vol)) {
+ return;
+ }
+
+ Slog.i(TAG, "On volume mount " + vol);
+
+ String sessionId = vol.getId();
+ int userId = vol.getMountUserId();
+
if (deviceFd == null) {
- Slog.w(TAG, "Null device fd. Session not started for " + vol);
+ Slog.w(TAG, "Null fd. Session not started for vol: " + vol);
return;
}
@@ -82,136 +103,320 @@
}
if ("/dev/null".equals(realPath)) {
- Slog.i(TAG, "Volume ready for use: " + vol);
+ Slog.i(TAG, "Volume ready for use with id: " + sessionId);
return;
}
synchronized (mLock) {
StorageUserConnection connection = mConnections.get(userId);
if (connection == null) {
- Slog.i(TAG, "Creating new session for vol: " + vol);
connection = new StorageUserConnection(mContext, userId, this);
mConnections.put(userId, connection);
}
- try {
- Slog.i(TAG, "Starting session for vol: " + vol);
- connection.startSession(deviceFd, vol);
- } catch (ExternalStorageServiceException e) {
- Slog.e(TAG, "Failed to start session for vol: " + vol, e);
+ Slog.i(TAG, "Creating session with id: " + sessionId);
+ connection.createSession(sessionId, new ParcelFileDescriptor(deviceFd));
+ }
+ }
+
+ /**
+ * Starts a storage session associated with {@code vol} after {@link #onVolumeMount}.
+ *
+ * Subsequent calls will attempt to start the storage session, but does nothing if already
+ * started. If the user associated with {@code vol} is not yet ready, all pending sesssions
+ * can be restarted with {@link onUnlockUser}.
+ *
+ * Does nothing if {@link #shouldHandle} is {@code false}
+ *
+ * Blocks until the session is started or fails
+ *
+ * @throws ExternalStorageServiceException if the session fails to start
+ */
+ public void onVolumeReady(VolumeInfo vol) throws ExternalStorageServiceException {
+ if (!shouldHandle(vol)) {
+ return;
+ }
+
+ Slog.i(TAG, "On volume ready " + vol);
+ String sessionId = vol.getId();
+
+ StorageUserConnection connection = null;
+ synchronized (mLock) {
+ connection = mConnections.get(vol.getMountUserId());
+ if (connection == null) {
+ Slog.i(TAG, "Volume ready but no associated connection");
+ return;
+ }
+ }
+
+ connection.initSession(sessionId, vol.getPath().getPath(),
+ vol.getInternalPath().getPath());
+
+ if (isReady()) {
+ connection.startSession(sessionId);
+ } else {
+ Slog.i(TAG, "Controller not initialised, session not started " + sessionId);
+ }
+ }
+
+ /**
+ * Removes and returns the {@link StorageUserConnection} for {@code vol}.
+ *
+ * Does nothing if {@link #shouldHandle} is {@code false}
+ *
+ * @return the connection that was removed or {@code null} if nothing was removed
+ */
+ @Nullable
+ public StorageUserConnection onVolumeRemove(VolumeInfo vol) {
+ if (!shouldHandle(vol)) {
+ return null;
+ }
+
+ Slog.i(TAG, "On volume remove " + vol);
+ String sessionId = vol.getId();
+ int userId = vol.getMountUserId();
+
+ synchronized (mLock) {
+ StorageUserConnection connection = mConnections.get(userId);
+ if (connection != null) {
+ Slog.i(TAG, "Removed session for vol with id: " + sessionId);
+ connection.removeSession(sessionId);
+ return connection;
+ } else {
+ Slog.w(TAG, "Session already removed for vol with id: " + sessionId);
+ return null;
+ }
+ }
+ }
+
+
+ /**
+ * Removes a storage session for {@code vol} and waits for exit.
+ *
+ * Does nothing if {@link #shouldHandle} is {@code false}
+ *
+ * Any errors are ignored
+ *
+ * Call {@link #onVolumeRemove} to remove the connection without waiting for exit
+ */
+ public void onVolumeUnmount(VolumeInfo vol) {
+ StorageUserConnection connection = onVolumeRemove(vol);
+
+ Slog.i(TAG, "On volume unmount " + vol);
+ if (connection != null) {
+ String sessionId = vol.getId();
+
+ if (isReady()) {
+ try {
+ connection.removeSessionAndWait(sessionId);
+ } catch (ExternalStorageServiceException e) {
+ Slog.e(TAG, "Failed to end session for vol with id: " + sessionId, e);
+ }
+ } else {
+ Slog.i(TAG, "Controller not initialised, session not ended " + sessionId);
}
}
}
/**
- * Ends a storage session for {@code vol}. Does nothing if the session is already
- * ended or ending. Ending a session discards all resources associated with that session.
+ * Restarts all sessions for {@code userId}.
+ *
+ * Does nothing if {@link #shouldHandle} is {@code false}
+ *
+ * This call blocks and waits for all sessions to be started, however any failures when starting
+ * a session will be ignored.
*/
- public void onVolumeUnmounted(int userId, VolumeInfo vol) {
+ public void onUnlockUser(int userId) throws ExternalStorageServiceException {
+ if (!shouldHandle(null)) {
+ return;
+ }
+
+ Slog.i(TAG, "On user unlock " + userId);
+ if (userId == 0) {
+ init();
+ }
+
+ StorageUserConnection connection = null;
synchronized (mLock) {
- StorageUserConnection connection = mConnections.get(userId);
- if (connection != null) {
- Slog.i(TAG, "Ending session for vol: " + vol);
- try {
- if (connection.endSession(vol)) {
- mConnections.remove(userId);
- }
- } catch (ExternalStorageServiceException e) {
- Slog.e(TAG, "Failed to end session for vol: " + vol, e);
- }
- } else {
- Slog.w(TAG, "Session already ended for vol: " + vol);
- }
+ connection = mConnections.get(userId);
+ }
+
+ if (connection != null) {
+ Slog.i(TAG, "Restarting all sessions for user: " + userId);
+ connection.startAllSessions();
+ } else {
+ Slog.w(TAG, "No connection found for user: " + userId);
}
}
- /** Restarts all sessions for {@code userId}. */
- public void onUserStarted(int userId) {
- synchronized (mLock) {
- StorageUserConnection connection = mConnections.get(userId);
- if (connection != null) {
- try {
- Slog.i(TAG, "Restarting all sessions for user: " + userId);
- connection.startAllSessions();
- } catch (ExternalStorageServiceException e) {
- Slog.e(TAG, "Failed to start all sessions", e);
- }
- } else {
- // TODO(b/135341433): What does this mean in multi-user
+ /**
+ * Resets all sessions for all users and waits for exit. This may kill the
+ * {@link ExternalStorageservice} for a user if necessary to ensure all state has been reset.
+ *
+ * Does nothing if {@link #shouldHandle} is {@code false}
+ **/
+ public void onReset(IVold vold, Handler handler) {
+ if (!shouldHandle(null)) {
+ return;
+ }
+
+ if (!isReady()) {
+ synchronized (mLock) {
+ mConnections.clear();
}
+ return;
+ }
+
+ SparseArray<StorageUserConnection> connections = new SparseArray();
+ synchronized (mLock) {
+ mIsResetting = true;
+ Slog.i(TAG, "Started resetting external storage service...");
+ for (int i = 0; i < mConnections.size(); i++) {
+ connections.put(mConnections.keyAt(i), mConnections.valueAt(i));
+ }
+ }
+
+ for (int i = 0; i < connections.size(); i++) {
+ StorageUserConnection connection = connections.valueAt(i);
+ for (String sessionId : connection.getAllSessionIds()) {
+ try {
+ Slog.i(TAG, "Unmounting " + sessionId);
+ vold.unmount(sessionId);
+ Slog.i(TAG, "Unmounted " + sessionId);
+ } catch (ServiceSpecificException | RemoteException e) {
+ // TODO(b/140025078): Hard reset vold?
+ Slog.e(TAG, "Failed to unmount volume: " + sessionId, e);
+ }
+
+ try {
+ Slog.i(TAG, "Exiting " + sessionId);
+ connection.removeSessionAndWait(sessionId);
+ Slog.i(TAG, "Exited " + sessionId);
+ } catch (IllegalStateException | ExternalStorageServiceException e) {
+ Slog.e(TAG, "Failed to exit session: " + sessionId
+ + ". Killing MediaProvider...", e);
+ // If we failed to confirm the session exited, it is risky to proceed
+ // We kill the ExternalStorageService as a last resort
+ killExternalStorageService(connections.keyAt(i));
+ break;
+ }
+ }
+ connection.close();
+ }
+
+ handler.removeCallbacksAndMessages(null);
+ synchronized (mLock) {
+ mConnections.clear();
+ mIsResetting = false;
+ Slog.i(TAG, "Finished resetting external storage service");
}
}
- /** Ends all sessions for {@code userId}. */
- public void onUserRemoved(int userId) {
- synchronized (mLock) {
- StorageUserConnection connection = mConnections.get(userId);
- if (connection != null) {
- try {
- Slog.i(TAG, "Ending all sessions for user: " + userId);
- connection.endAllSessions();
- mConnections.remove(userId);
- } catch (ExternalStorageServiceException e) {
- Slog.e(TAG, "Failed to end all sessions", e);
- }
- } else {
- // TODO(b/135341433): What does this mean in multi-user
- }
+ private void init() throws ExternalStorageServiceException {
+ Slog.i(TAG, "Initialialising...");
+ ProviderInfo provider = mContext.getPackageManager().resolveContentProvider(
+ MediaStore.AUTHORITY, PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_SYSTEM_ONLY);
+ if (provider == null) {
+ throw new ExternalStorageServiceException("No valid MediaStore provider found");
}
+
+ mExternalStorageServicePackageName = provider.applicationInfo.packageName;
+ mExternalStorageServiceAppId = UserHandle.getAppId(provider.applicationInfo.uid);
+
+ Intent intent = new Intent(ExternalStorageService.SERVICE_INTERFACE);
+ intent.setPackage(mExternalStorageServicePackageName);
+ ResolveInfo resolveInfo = mContext.getPackageManager().resolveService(intent,
+ PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
+ if (resolveInfo == null || resolveInfo.serviceInfo == null) {
+ throw new ExternalStorageServiceException(
+ "No valid ExternalStorageService component found");
+ }
+
+ ServiceInfo serviceInfo = resolveInfo.serviceInfo;
+ ComponentName name = new ComponentName(serviceInfo.packageName, serviceInfo.name);
+ if (!Manifest.permission.BIND_EXTERNAL_STORAGE_SERVICE
+ .equals(serviceInfo.permission)) {
+ throw new ExternalStorageServiceException(name.flattenToShortString()
+ + " does not require permission "
+ + Manifest.permission.BIND_EXTERNAL_STORAGE_SERVICE);
+ }
+
+ mExternalStorageServiceComponent = name;
}
/** Returns the {@link ExternalStorageService} component name. */
@Nullable
public ComponentName getExternalStorageServiceComponentName() {
- synchronized (mLock) {
- if (mExternalStorageServiceComponent == null) {
- ProviderInfo provider = mContext.getPackageManager().resolveContentProvider(
- MediaStore.AUTHORITY, PackageManager.MATCH_DIRECT_BOOT_AWARE
- | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
- | PackageManager.MATCH_SYSTEM_ONLY);
+ return mExternalStorageServiceComponent;
+ }
- if (provider == null) {
- Slog.e(TAG, "No valid MediaStore provider found.");
- }
- String packageName = provider.applicationInfo.packageName;
-
- Intent intent = new Intent(ExternalStorageService.SERVICE_INTERFACE);
- intent.setPackage(packageName);
- ResolveInfo resolveInfo = mContext.getPackageManager().resolveService(intent,
- PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
- if (resolveInfo == null || resolveInfo.serviceInfo == null) {
- Slog.e(TAG, "No valid ExternalStorageService component found.");
- return null;
- }
-
- ServiceInfo serviceInfo = resolveInfo.serviceInfo;
- ComponentName name = new ComponentName(serviceInfo.packageName, serviceInfo.name);
- if (!Manifest.permission.BIND_EXTERNAL_STORAGE_SERVICE
- .equals(serviceInfo.permission)) {
- Slog.e(TAG, name.flattenToShortString() + " does not require permission "
- + Manifest.permission.BIND_EXTERNAL_STORAGE_SERVICE);
- return null;
- }
- mExternalStorageServiceComponent = name;
- }
- return mExternalStorageServiceComponent;
+ private void killExternalStorageService(int userId) {
+ IActivityManager am = ActivityManager.getService();
+ try {
+ am.killApplication(mExternalStorageServicePackageName, mExternalStorageServiceAppId,
+ userId, "storage_session_controller reset");
+ } catch (RemoteException e) {
+ Slog.i(TAG, "Failed to kill the ExtenalStorageService for user " + userId);
}
}
- /** Returns the {@link StorageManagerService} callback. */
- public Callback getCallback() {
- return mCallback;
+ /**
+ * Throws an {@link IllegalStateException} if {@code path} is not ready to be accessed by
+ * {@code userId}.
+ */
+ // TODO(b/144332951): This is not used because it is racy. Right after checking a path
+ // we can call into vold with that path and the FUSE daemon can go down. Improve or remove
+ public void checkPathReadyForUser(int userId, String path) {
+ if (!mIsFuseEnabled) {
+ return;
+ }
+
+ if (mIsResetting) {
+ throw new IllegalStateException("Connection resetting for user " + userId
+ + " with path " + path);
+ }
+
+ StorageUserConnection connection = null;
+ synchronized (mLock) {
+ connection = mConnections.get(userId);
+ }
+
+ if (connection == null) {
+ throw new IllegalStateException("Connection not ready for user " + userId
+ + " with path " + path);
+ }
+ connection.checkPathReady(path);
}
- /** Callback to listen to session events from the {@link StorageSessionController}. */
- public interface Callback {
- /** Called when a {@link StorageUserConnection} is disconnected. */
- void onUserDisconnected(int userId);
+ /**
+ * Returns {@code true} if {@code vol} is an emulated or public volume,
+ * {@code false} otherwise
+ **/
+ public static boolean isEmulatedOrPublic(VolumeInfo vol) {
+ return vol.type == VolumeInfo.TYPE_EMULATED || vol.type == VolumeInfo.TYPE_PUBLIC;
}
- /** Exception thrown when communication with the {@link ExternalStorageService}. */
+ /** Exception thrown when communication with the {@link ExternalStorageService} fails. */
public static class ExternalStorageServiceException extends Exception {
public ExternalStorageServiceException(Throwable cause) {
super(cause);
}
+
+ public ExternalStorageServiceException(String message) {
+ super(message);
+ }
+
+ public ExternalStorageServiceException(String message, Throwable cause) {
+ super(message, cause);
+ }
+ }
+
+ private boolean shouldHandle(@Nullable VolumeInfo vol) {
+ return mIsFuseEnabled && !mIsResetting && (vol == null || isEmulatedOrPublic(vol));
+ }
+
+ private boolean isReady() {
+ return mExternalStorageServiceComponent != null;
}
}
diff --git a/services/core/java/com/android/server/storage/StorageUserConnection.java b/services/core/java/com/android/server/storage/StorageUserConnection.java
index ff9c900..24b56a4 100644
--- a/services/core/java/com/android/server/storage/StorageUserConnection.java
+++ b/services/core/java/com/android/server/storage/StorageUserConnection.java
@@ -33,29 +33,31 @@
import android.os.ParcelFileDescriptor;
import android.os.ParcelableException;
import android.os.RemoteCallback;
-import android.os.RemoteException;
import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
import android.service.storage.ExternalStorageService;
import android.service.storage.IExternalStorageService;
+import android.text.TextUtils;
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions;
-import java.io.FileDescriptor;
import java.io.IOException;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* Controls the lifecycle of the {@link ActiveConnection} to an {@link ExternalStorageService}
- * for a user and manages storage sessions represented by a {@link Session}.
+ * for a user and manages storage sessions associated with mounted volumes.
*/
public final class StorageUserConnection {
private static final String TAG = "StorageUserConnection";
+ private static final int REMOTE_TIMEOUT_SECONDS = 15;
private final Object mLock = new Object();
private final Context mContext;
@@ -70,68 +72,188 @@
mSessionController = controller;
}
- /** Starts a session for a user */
- public void startSession(FileDescriptor deviceFd, VolumeInfo vol)
- throws ExternalStorageServiceException {
- String sessionId = vol.getId();
- String upperPath = vol.getPath().getPath();
- String lowerPath = vol.getInternalPath().getPath();
- Slog.i(TAG, "Starting session with id: " + sessionId + " and upperPath: " + upperPath
- + " and lowerPath: " + lowerPath);
- Session session = new Session(sessionId, deviceFd, upperPath, lowerPath);
+ /**
+ * Creates and stores a storage {@link Session}.
+ *
+ * Created sessions must be initialised with {@link #initSession} before starting with
+ * {@link #startSession}.
+ *
+ * They must also be cleaned up with {@link #removeSession}.
+ *
+ * @throws IllegalArgumentException if a {@code Session} with {@code sessionId} already exists
+ */
+ public void createSession(String sessionId, ParcelFileDescriptor pfd) {
+ Preconditions.checkNotNull(sessionId);
+ Preconditions.checkNotNull(pfd);
+
synchronized (mLock) {
- // TODO(b/135341433): Ensure we don't replace a session without ending the previous
- mSessions.put(sessionId, session);
- // TODO(b/135341433): If this fails, maybe its at boot, how to handle if not boot?
+ Preconditions.checkArgument(!mSessions.containsKey(sessionId));
+ mSessions.put(sessionId, new Session(sessionId, pfd));
+ }
+ }
+
+ /**
+ * Initialise a storage {@link Session}.
+ *
+ * Initialised sessions can be started with {@link #startSession}.
+ *
+ * They must also be cleaned up with {@link #removeSession}.
+ *
+ * @throws IllegalArgumentException if {@code sessionId} does not exist or is initialised
+ */
+ public void initSession(String sessionId, String upperPath, String lowerPath) {
+ synchronized (mLock) {
+ Session session = mSessions.get(sessionId);
+ if (session == null) {
+ throw new IllegalStateException("Failed to initialise non existent session. Id: "
+ + sessionId + ". Upper path: " + upperPath + ". Lower path: " + lowerPath);
+ } else if (session.isInitialisedLocked()) {
+ throw new IllegalStateException("Already initialised session. Id: "
+ + sessionId + ". Upper path: " + upperPath + ". Lower path: " + lowerPath);
+ } else {
+ session.upperPath = upperPath;
+ session.lowerPath = lowerPath;
+ Slog.i(TAG, "Initialised session: " + session);
+ }
+ }
+ }
+
+ /**
+ * Starts an already created storage {@link Session} for {@code sessionId}.
+ *
+ * It is safe to call this multiple times, however if the session is already started,
+ * subsequent calls will be ignored.
+ *
+ * @throws ExternalStorageServiceException if the session failed to start
+ **/
+ public void startSession(String sessionId) throws ExternalStorageServiceException {
+ Session session;
+ synchronized (mLock) {
+ session = mSessions.get(sessionId);
+ }
+
+ prepareRemote();
+ synchronized (mLock) {
mActiveConnection.startSessionLocked(session);
}
}
/**
- * Ends a session for a user.
+ * Removes a session without ending it or waiting for exit.
*
- * @return {@code true} if there are no more sessions for this user, {@code false} otherwise
+ * This should only be used if the session has certainly been ended because the volume was
+ * unmounted or the user running the session has been stopped. Otherwise, wait for session
+ * with {@link #waitForExit}.
**/
- public boolean endSession(VolumeInfo vol) throws ExternalStorageServiceException {
+ public Session removeSession(String sessionId) {
synchronized (mLock) {
- Session session = mSessions.remove(vol.getId());
+ Session session = mSessions.remove(sessionId);
if (session != null) {
- mActiveConnection.endSessionLocked(session);
- mSessions.remove(session.sessionId);
+ session.close();
+ return session;
}
- boolean isAllSessionsEnded = mSessions.isEmpty();
- if (isAllSessionsEnded) {
- mActiveConnection.close();
- }
- return isAllSessionsEnded;
+ return null;
}
}
- /** Starts all available sessions for a user */
- public void startAllSessions() throws ExternalStorageServiceException {
+
+ /**
+ * Removes a session and waits for exit
+ *
+ * @throws ExternalStorageServiceException if the session may not have exited
+ **/
+ public void removeSessionAndWait(String sessionId) throws ExternalStorageServiceException {
+ Session session = removeSession(sessionId);
+ if (session == null) {
+ Slog.i(TAG, "No session found for id: " + sessionId);
+ return;
+ }
+
+ Slog.i(TAG, "Waiting for session end " + session + " ...");
+ prepareRemote();
synchronized (mLock) {
+ mActiveConnection.endSessionLocked(session);
+ }
+ }
+
+ /** Starts all available sessions for a user without blocking. Any failures will be ignored. */
+ public void startAllSessions() {
+ try {
+ prepareRemote();
+ } catch (ExternalStorageServiceException e) {
+ Slog.e(TAG, "Failed to start all sessions for user: " + mUserId, e);
+ return;
+ }
+
+ synchronized (mLock) {
+ Slog.i(TAG, "Starting " + mSessions.size() + " sessions for user: " + mUserId + "...");
for (Session session : mSessions.values()) {
- mActiveConnection.startSessionLocked(session);
+ try {
+ mActiveConnection.startSessionLocked(session);
+ } catch (IllegalStateException | ExternalStorageServiceException e) {
+ // TODO: Don't crash process? We could get into process crash loop
+ Slog.e(TAG, "Failed to start " + session, e);
+ }
}
}
}
- /** Ends all available sessions for a user */
- public void endAllSessions() throws ExternalStorageServiceException {
+ /**
+ * Closes the connection to the {@link ExternalStorageService}. The connection will typically
+ * be restarted after close.
+ */
+ public void close() {
+ mActiveConnection.close();
+ }
+
+ /** Throws an {@link IllegalArgumentException} if {@code path} is not ready for access */
+ public void checkPathReady(String path) {
synchronized (mLock) {
for (Session session : mSessions.values()) {
- mActiveConnection.endSessionLocked(session);
- mSessions.remove(session.sessionId);
+ if (session.upperPath != null && path.startsWith(session.upperPath)) {
+ if (mActiveConnection.isActiveLocked(session)) {
+ return;
+ }
+ }
}
- mActiveConnection.close();
+ throw new IllegalStateException("Path not ready " + path);
+ }
+ }
+
+ /** Returns all created sessions. */
+ public Set<String> getAllSessionIds() {
+ synchronized (mLock) {
+ return new HashSet<>(mSessions.keySet());
+ }
+ }
+
+ private void prepareRemote() throws ExternalStorageServiceException {
+ try {
+ waitForLatch(mActiveConnection.bind(), "remote_prepare_user " + mUserId);
+ } catch (IllegalStateException | TimeoutException e) {
+ throw new ExternalStorageServiceException("Failed to prepare remote", e);
+ }
+ }
+
+ private void waitForLatch(CountDownLatch latch, String reason) throws TimeoutException {
+ try {
+ if (!latch.await(REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
+ // TODO(b/140025078): Call ActivityManager ANR API?
+ throw new TimeoutException("Latch wait for " + reason + " elapsed");
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new IllegalStateException("Latch wait for " + reason + " interrupted");
}
}
private final class ActiveConnection implements AutoCloseable {
// Lifecycle connection to the external storage service, needed to unbind.
- // We should only try to bind if mServiceConnection is null.
- // Non-null indicates we are connected or connecting.
@GuardedBy("mLock") @Nullable private ServiceConnection mServiceConnection;
+ // True if we are connecting, either bound or binding
+ // False && mRemote != null means we are connected
+ // False && mRemote == null means we are neither connecting nor connected
+ @GuardedBy("mLock") @Nullable private boolean mIsConnecting;
// Binder object representing the external storage service.
// Non-null indicates we are connected
@GuardedBy("mLock") @Nullable private IExternalStorageService mRemote;
@@ -141,58 +263,72 @@
// (and clear the exception state) with the same lock which we hold during
// the entire transaction, there is no risk of race.
@GuardedBy("mLock") @Nullable private ParcelableException mLastException;
+ // Not guarded by any lock intentionally and non final because we cannot
+ // reset latches so need to create a new one after one use
+ private CountDownLatch mLatch;
@Override
public void close() {
+ ServiceConnection oldConnection = null;
synchronized (mLock) {
- if (mServiceConnection != null) {
- mContext.unbindService(mServiceConnection);
- }
+ Slog.i(TAG, "Closing connection for user " + mUserId);
+ mIsConnecting = false;
+ oldConnection = mServiceConnection;
mServiceConnection = null;
mRemote = null;
}
+
+ if (oldConnection != null) {
+ mContext.unbindService(oldConnection);
+ }
+ }
+
+ public boolean isActiveLocked(Session session) {
+ if (!session.isInitialisedLocked()) {
+ Slog.i(TAG, "Session not initialised " + session);
+ return false;
+ }
+
+ if (mRemote == null) {
+ throw new IllegalStateException("Valid session with inactive connection");
+ }
+ return true;
}
public void startSessionLocked(Session session) throws ExternalStorageServiceException {
- if (mServiceConnection == null || mRemote == null) {
- if (mServiceConnection == null) {
- // Not bound
- bindLocked();
- } // else we are binding. In any case when we bind we'll re-start all sessions
+ if (!isActiveLocked(session)) {
return;
}
CountDownLatch latch = new CountDownLatch(1);
- try {
+ try (ParcelFileDescriptor dupedPfd = session.pfd.dup()) {
mRemote.startSession(session.sessionId,
FLAG_SESSION_TYPE_FUSE | FLAG_SESSION_ATTRIBUTE_INDEXABLE,
- new ParcelFileDescriptor(session.deviceFd), session.upperPath,
- session.lowerPath, new RemoteCallback(result ->
+ dupedPfd, session.upperPath, session.lowerPath, new RemoteCallback(result ->
setResultLocked(latch, result)));
-
- } catch (RemoteException e) {
- throw new ExternalStorageServiceException(e);
+ waitForLatch(latch, "start_session " + session);
+ maybeThrowExceptionLocked();
+ } catch (Exception e) {
+ throw new ExternalStorageServiceException("Failed to start session: " + session, e);
}
- waitAndReturnResultLocked(latch);
}
public void endSessionLocked(Session session) throws ExternalStorageServiceException {
- if (mRemote == null) {
- // TODO(b/135341433): This assumes if there is no connection, there are no
- // session resources held. Need to document in the ExternalStorageService
- // API that implementors should end all sessions and clean up resources
- // when the binding is lost, onDestroy?
+ session.close();
+ if (!isActiveLocked(session)) {
+ // Nothing to end, not started yet
return;
}
CountDownLatch latch = new CountDownLatch(1);
try {
mRemote.endSession(session.sessionId, new RemoteCallback(result ->
- setResultLocked(latch, result)));
- } catch (RemoteException e) {
- throw new ExternalStorageServiceException(e);
+ setResultLocked(latch, result)));
+ waitForLatch(latch, "end_session " + session);
+ maybeThrowExceptionLocked();
+ } catch (Exception e) {
+ throw new ExternalStorageServiceException("Failed to end session: " + session, e);
}
- waitAndReturnResultLocked(latch);
}
private void setResultLocked(CountDownLatch latch, Bundle result) {
@@ -200,36 +336,38 @@
latch.countDown();
}
- private void waitAndReturnResultLocked(CountDownLatch latch)
- throws ExternalStorageServiceException {
- try {
- // TODO(b/140025078): Call ActivityManager ANR API?
- latch.await(20, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new IllegalStateException(
- "Interrupted while waiting for ExternalStorageService result");
- }
+ private void maybeThrowExceptionLocked() throws IOException {
if (mLastException != null) {
+ ParcelableException lastException = mLastException;
mLastException = null;
try {
- mLastException.maybeRethrow(IOException.class);
+ lastException.maybeRethrow(IOException.class);
} catch (IOException e) {
- throw new ExternalStorageServiceException(e);
+ throw e;
}
- throw new RuntimeException(mLastException);
+ throw new RuntimeException(lastException);
}
- mLastException = null;
}
- private void bindLocked() {
+ public CountDownLatch bind() throws ExternalStorageServiceException {
ComponentName name = mSessionController.getExternalStorageServiceComponentName();
if (name == null) {
- Slog.i(TAG, "Not ready to bind to the ExternalStorageService for user " + mUserId);
- return;
+ // Not ready to bind
+ throw new ExternalStorageServiceException(
+ "Not ready to bind to the ExternalStorageService for user " + mUserId);
}
- ServiceConnection connection = new ServiceConnection() {
+ synchronized (mLock) {
+ if (mRemote != null || mIsConnecting) {
+ // Connected or connecting (bound or binding)
+ // Will wait on a latch that will countdown when we connect, unless we are
+ // connected and the latch has already countdown, yay!
+ return mLatch;
+ } // else neither connected nor connecting
+
+ mLatch = new CountDownLatch(1);
+ mIsConnecting = true;
+ mServiceConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
Slog.i(TAG, "Service: [" + name + "] connected. User [" + mUserId + "]");
@@ -255,65 +393,81 @@
@Override
public void onNullBinding(ComponentName name) {
- // Should never happen. Service returned null from #onBind.
Slog.wtf(TAG, "Service: [" + name + "] is null. User [" + mUserId + "]");
}
private void handleConnection(IBinder service) {
synchronized (mLock) {
- if (mServiceConnection != null) {
+ if (mIsConnecting) {
mRemote = IExternalStorageService.Stub.asInterface(service);
- } else {
- Slog.wtf(TAG, "Service connected without a connection object??");
+ mIsConnecting = false;
+ mLatch.countDown();
+ // Separate thread so we don't block the main thead
+ return;
}
}
-
- try {
- startAllSessions();
- } catch (ExternalStorageServiceException e) {
- Slog.e(TAG, "Failed to start all sessions", e);
- }
+ Slog.wtf(TAG, "Connection closed to the ExternalStorageService for user "
+ + mUserId);
}
private void handleDisconnection() {
- close();
// Clear all sessions because we will need a new device fd since
// StorageManagerService will reset the device mount state and #startSession
// will be called for any required mounts.
- synchronized (mLock) {
- mSessions.clear();
- }
// Notify StorageManagerService so it can restart all necessary sessions
- mSessionController.getCallback().onUserDisconnected(mUserId);
+ close();
+ new Thread(StorageUserConnection.this::startAllSessions).start();
}
};
+ }
Slog.i(TAG, "Binding to the ExternalStorageService for user " + mUserId);
- // TODO(b/135341433): Verify required service flags BIND_IMPORTANT?
- if (mContext.bindServiceAsUser(new Intent().setComponent(name), connection,
- Context.BIND_AUTO_CREATE, UserHandle.of(mUserId))) {
+ if (mContext.bindServiceAsUser(new Intent().setComponent(name), mServiceConnection,
+ Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT,
+ UserHandle.of(mUserId))) {
Slog.i(TAG, "Bound to the ExternalStorageService for user " + mUserId);
- mServiceConnection = connection;
- // Reset the remote, we will set when we connect
- mRemote = null;
+ return mLatch;
} else {
- Slog.w(TAG, "Failed to bind to the ExternalStorageService for user " + mUserId);
+ synchronized (mLock) {
+ mIsConnecting = false;
+ }
+ throw new ExternalStorageServiceException(
+ "Failed to bind to the ExternalStorageService for user " + mUserId);
}
}
}
- private static final class Session {
+ private static final class Session implements AutoCloseable {
public final String sessionId;
- public final FileDescriptor deviceFd;
- public final String lowerPath;
- public final String upperPath;
+ public final ParcelFileDescriptor pfd;
+ @GuardedBy("mLock")
+ public String lowerPath;
+ @GuardedBy("mLock")
+ public String upperPath;
- Session(String sessionId, FileDescriptor deviceFd, String upperPath,
- String lowerPath) {
+ Session(String sessionId, ParcelFileDescriptor pfd) {
this.sessionId = sessionId;
- this.upperPath = upperPath;
- this.lowerPath = lowerPath;
- this.deviceFd = deviceFd;
+ this.pfd = pfd;
+ }
+
+ @Override
+ public void close() {
+ try {
+ pfd.close();
+ } catch (IOException e) {
+ Slog.i(TAG, "Failed to close session: " + this);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "[SessionId: " + sessionId + ". UpperPath: " + upperPath + ". LowerPath: "
+ + lowerPath + "]";
+ }
+
+ @GuardedBy("mLock")
+ public boolean isInitialisedLocked() {
+ return !TextUtils.isEmpty(upperPath) && !TextUtils.isEmpty(lowerPath);
}
}
}
diff --git a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
index 4d0788f..7d905ba 100644
--- a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
+++ b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
@@ -120,7 +120,9 @@
synchronized (mManagerService.mLock) {
UserState userState = mManagerService.peekUserStateLocked(userId);
if (userState != null) {
- userState.mConnection.cleanupService();
+ if (userState.mConnection != null) {
+ userState.mConnection.cleanupService();
+ }
mManagerService.mUserStates.remove(userId);
}
}
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index 7408dd4..5f5cd3c 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -53,6 +53,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.security.KeyStore;
import android.service.trust.TrustAgentService;
import android.text.TextUtils;
import android.util.ArrayMap;
@@ -135,6 +136,33 @@
@GuardedBy("mUserIsTrusted")
private final SparseBooleanArray mUserIsTrusted = new SparseBooleanArray();
+ /**
+ * Stores the locked state for users on the device. There are three different type of users
+ * which are handled slightly differently:
+ * <ul>
+ * <li> Users with real keyguard
+ * These are users who can be switched to ({@link UserInfo#supportsSwitchToByUser()}). Their
+ * locked state is derived by a combination of user secure state, keyguard state, trust agent
+ * decision and biometric authentication result. These are updated via
+ * {@link #refreshDeviceLockedForUser(int)} and result stored in {@link #mDeviceLockedForUser}.
+ * <li> Managed profiles with unified challenge
+ * Managed profile with unified challenge always shares the same locked state as their parent,
+ * so their locked state is not recorded in {@link #mDeviceLockedForUser}. Instead,
+ * {@link ITrustManager#isDeviceLocked(int)} always resolves their parent user handle and
+ * queries its locked state instead.
+ * <li> Managed profiles with separate challenge
+ * Locked state for profile with separate challenge is determined by other parts of the
+ * framework (mostly PowerManager) and pushed to TrustManagerService via
+ * {@link ITrustManager#setDeviceLockedForUser(int, boolean)}. Although in a corner case when
+ * the profile has a separate but empty challenge, setting its {@link #mDeviceLockedForUser} to
+ * {@code false} is actually done by {@link #refreshDeviceLockedForUser(int)}.
+ * </ul>
+ * TODO: Rename {@link ITrustManager#setDeviceLockedForUser(int, boolean)} to
+ * {@code setDeviceLockedForProfile} to better reflect its purpose. Unifying
+ * {@code setDeviceLockedForProfile} and {@link #setDeviceLockedForUser} would also be nice.
+ * At the moment they both update {@link #mDeviceLockedForUser} but have slightly different
+ * side-effects: one notifies trust agents while the other sends out a broadcast.
+ */
@GuardedBy("mDeviceLockedForUser")
private final SparseBooleanArray mDeviceLockedForUser = new SparseBooleanArray();
@@ -601,6 +629,10 @@
}
}
+ /**
+ * Update the user's locked state. Only applicable to users with a real keyguard
+ * ({@link UserInfo#supportsSwitchToByUser}) and unsecured managed profiles.
+ */
private void refreshDeviceLockedForUser(int userId) {
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_SYSTEM) {
Log.e(TAG, "refreshDeviceLockedForUser(userId=" + userId + "): Invalid user handle,"
@@ -661,6 +693,15 @@
}
if (changed) {
dispatchDeviceLocked(userId, locked);
+
+ KeyStore.getInstance().onUserLockedStateChanged(userId, locked);
+ // Also update the user's profiles who have unified challenge, since they
+ // share the same unlocked state (see {@link #isDeviceLocked(int)})
+ for (int profileHandle : mUserManager.getEnabledProfileIds(userId)) {
+ if (mLockPatternUtils.isManagedProfileWithUnifiedChallenge(profileHandle)) {
+ KeyStore.getInstance().onUserLockedStateChanged(profileHandle, locked);
+ }
+ }
}
}
@@ -1194,6 +1235,10 @@
return "0x" + Integer.toHexString(i);
}
+ /**
+ * Changes the lock status for the given user. This is only applicable to managed profiles,
+ * other users should be handled by Keyguard.
+ */
@Override
public void setDeviceLockedForUser(int userId, boolean locked) {
enforceReportPermission();
@@ -1204,6 +1249,9 @@
synchronized (mDeviceLockedForUser) {
mDeviceLockedForUser.put(userId, locked);
}
+
+ KeyStore.getInstance().onUserLockedStateChanged(userId, locked);
+
if (locked) {
try {
ActivityManager.getService().notifyLockedProfile(userId);
diff --git a/services/core/java/com/android/server/wm/ActivityDisplay.java b/services/core/java/com/android/server/wm/ActivityDisplay.java
index 73c20a7..ebfc65e 100644
--- a/services/core/java/com/android/server/wm/ActivityDisplay.java
+++ b/services/core/java/com/android/server/wm/ActivityDisplay.java
@@ -180,6 +180,7 @@
mDisplayContent.reconfigureDisplayLocked();
onRequestedOverrideConfigurationChanged(
mDisplayContent.getRequestedOverrideConfiguration());
+ mService.mWindowManager.mDisplayNotificationController.dispatchDisplayAdded(this);
}
void onDisplayChanged() {
@@ -213,7 +214,7 @@
if (position == POSITION_BOTTOM) {
position = 0;
} else if (toTop) {
- position = mStacks.size();
+ position = getChildCount();
}
if (DEBUG_STACK) Slog.v(TAG_STACK, "addChild: attaching " + stack
+ " to displayId=" + mDisplayId + " position=" + position);
@@ -253,7 +254,7 @@
void positionChildAtTop(ActivityStack stack, boolean includingParents,
String updateLastFocusedStackReason) {
- positionChildAt(stack, mStacks.size(), includingParents, updateLastFocusedStackReason);
+ positionChildAt(stack, getChildCount(), includingParents, updateLastFocusedStackReason);
}
void positionChildAtBottom(ActivityStack stack) {
@@ -288,7 +289,7 @@
// we are looking for top focusable stack. The condition {@code wasContained} restricts the
// preferred stack is set only when moving an existing stack to top instead of adding a new
// stack that may be too early (e.g. in the middle of launching or reparenting).
- if (wasContained && position >= mStacks.size() - 1 && stack.isFocusableAndVisible()) {
+ if (wasContained && position >= getChildCount() - 1 && stack.isFocusableAndVisible()) {
mPreferredTopFocusableStack = stack;
} else if (mPreferredTopFocusableStack == stack) {
mPreferredTopFocusableStack = null;
@@ -314,14 +315,14 @@
}
private int getTopInsertPosition(ActivityStack stack, int candidatePosition) {
- int position = mStacks.size();
+ int position = getChildCount();
if (stack.inPinnedWindowingMode()) {
// Stack in pinned windowing mode is z-ordered on-top of all other stacks so okay to
// just return the candidate position.
return Math.min(position, candidatePosition);
}
while (position > 0) {
- final ActivityStack targetStack = mStacks.get(position - 1);
+ final ActivityStack targetStack = getChildAt(position - 1);
if (!targetStack.isAlwaysOnTop()) {
// We reached a stack that isn't always-on-top.
break;
@@ -336,8 +337,8 @@
}
<T extends ActivityStack> T getStack(int stackId) {
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack stack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack stack = getChildAt(i);
if (stack.mStackId == stackId) {
return (T) stack;
}
@@ -362,8 +363,8 @@
return (T) mSplitScreenPrimaryStack;
}
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack stack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack stack = getChildAt(i);
if (stack.isCompatible(windowingMode, activityType)) {
return (T) stack;
}
@@ -489,8 +490,8 @@
return mPreferredTopFocusableStack;
}
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack stack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack stack = getChildAt(i);
if (stack.isFocusableAndVisible()) {
return stack;
}
@@ -504,8 +505,8 @@
? currentFocus.getWindowingMode() : WINDOWING_MODE_UNDEFINED;
ActivityStack candidate = null;
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack stack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack stack = getChildAt(i);
if (ignoreCurrent && stack == currentFocus) {
continue;
}
@@ -560,8 +561,8 @@
}
boolean allResumedActivitiesComplete() {
- for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
- final ActivityRecord r = mStacks.get(stackNdx).getResumedActivity();
+ for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) {
+ final ActivityRecord r = getChildAt(stackNdx).getResumedActivity();
if (r != null && !r.isState(RESUMED)) {
return false;
}
@@ -587,8 +588,8 @@
*/
boolean pauseBackStacks(boolean userLeaving, ActivityRecord resuming) {
boolean someActivityPaused = false;
- for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
- final ActivityStack stack = mStacks.get(stackNdx);
+ for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) {
+ final ActivityStack stack = getChildAt(stackNdx);
final ActivityRecord resumedActivity = stack.getResumedActivity();
if (resumedActivity != null
&& (stack.getVisibility(resuming) != STACK_VISIBILITY_VISIBLE
@@ -652,8 +653,8 @@
final ArrayList<ActivityStack> stacks = new ArrayList<>();
for (int j = windowingModes.length - 1 ; j >= 0; --j) {
final int windowingMode = windowingModes[j];
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack stack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack stack = getChildAt(i);
if (!stack.isActivityTypeStandardOrUndefined()) {
continue;
}
@@ -680,8 +681,8 @@
final ArrayList<ActivityStack> stacks = new ArrayList<>();
for (int j = activityTypes.length - 1 ; j >= 0; --j) {
final int activityType = activityTypes[j];
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack stack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack stack = getChildAt(i);
if (stack.getActivityType() == activityType) {
stacks.add(stack);
}
@@ -752,8 +753,8 @@
mService.deferWindowLayout();
try {
// Adjust the windowing mode of any stack in secondary split-screen to fullscreen.
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack otherStack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack otherStack = getChildAt(i);
if (!otherStack.inSplitScreenSecondaryWindowingMode()) {
continue;
}
@@ -781,8 +782,8 @@
mService.deferWindowLayout();
try {
// Adjust the windowing mode of any affected by split-screen to split-screen secondary.
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack otherStack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack otherStack = getChildAt(i);
if (otherStack == mSplitScreenPrimaryStack
|| !otherStack.affectedBySplitScreenResize()) {
continue;
@@ -930,7 +931,7 @@
* some stacks are not focusable (e.g. PiP).
*/
ActivityStack getTopStack() {
- return mStacks.isEmpty() ? null : mStacks.get(mStacks.size() - 1);
+ return mStacks.isEmpty() ? null : getChildAt(getChildCount() - 1);
}
boolean isTopStack(ActivityStack stack) {
@@ -938,8 +939,8 @@
}
boolean isTopNotPinnedStack(ActivityStack stack) {
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack current = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack current = getChildAt(i);
if (!current.inPinnedWindowingMode()) {
return current == stack;
}
@@ -948,8 +949,8 @@
}
ActivityStack getTopStackInWindowingMode(int windowingMode) {
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack current = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack current = getChildAt(i);
if (windowingMode == current.getWindowingMode()) {
return current;
}
@@ -979,8 +980,8 @@
// Look in other focusable stacks.
if (topRunning == null) {
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- final ActivityStack stack = mStacks.get(i);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ final ActivityStack stack = getChildAt(i);
// Only consider focusable stacks other than the current focused one.
if (stack == focusedStack || !stack.isFocusable()) {
continue;
@@ -1112,8 +1113,8 @@
}
void onLockTaskPackagesUpdated() {
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- mStacks.get(i).onLockTaskPackagesUpdated();
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ getChildAt(i).onLockTaskPackagesUpdated();
}
}
@@ -1165,7 +1166,7 @@
@Override
public String toString() {
- return "ActivityDisplay={" + mDisplayId + " numStacks=" + mStacks.size() + "}";
+ return "ActivityDisplay={" + mDisplayId + " numStacks=" + getChildCount() + "}";
}
@Override
@@ -1224,10 +1225,10 @@
final ActivityDisplay toDisplay = mRootActivityContainer.getDefaultDisplay();
mRootActivityContainer.mStackSupervisor.beginDeferResume();
try {
- int numStacks = mStacks.size();
+ int numStacks = getChildCount();
// Keep the order from bottom to top.
for (int stackNdx = 0; stackNdx < numStacks; stackNdx++) {
- final ActivityStack stack = mStacks.get(stackNdx);
+ final ActivityStack stack = getChildAt(stackNdx);
// Always finish non-standard type stacks.
if (destroyContentOnRemoval || !stack.isActivityTypeStandardOrUndefined()) {
stack.finishAllActivitiesImmediately();
@@ -1244,8 +1245,8 @@
}
// Stacks may be removed from this display. Ensure each stack will be processed and
// the loop will end.
- stackNdx -= numStacks - mStacks.size();
- numStacks = mStacks.size();
+ stackNdx -= numStacks - getChildCount();
+ numStacks = getChildCount();
}
} finally {
mRootActivityContainer.mStackSupervisor.endDeferResume();
@@ -1271,7 +1272,7 @@
return;
}
- final ActivityStack stack = mStacks.size() == 1 ? mStacks.get(0) : null;
+ final ActivityStack stack = getChildCount() == 1 ? getChildAt(0) : null;
if (stack != null && stack.isActivityTypeHome() && stack.getAllTasks().isEmpty()) {
// Release this display if an empty home stack is the only thing left.
// Since it is the last stack, this display will be released along with the stack
@@ -1348,7 +1349,7 @@
*/
ActivityStack getStackAbove(ActivityStack stack) {
final int stackIndex = mStacks.indexOf(stack) + 1;
- return (stackIndex < mStacks.size()) ? mStacks.get(stackIndex) : null;
+ return (stackIndex < getChildCount()) ? getChildAt(stackIndex) : null;
}
/**
@@ -1365,9 +1366,9 @@
positionChildAtBottom(stack);
// Find the next position where the stack should be placed
- final int numStacks = mStacks.size();
+ final int numStacks = getChildCount();
for (int stackNdx = 0; stackNdx < numStacks; stackNdx++) {
- final ActivityStack s = mStacks.get(stackNdx);
+ final ActivityStack s = getChildAt(stackNdx);
if (s == stack) {
continue;
}
@@ -1553,7 +1554,7 @@
}
public void dump(PrintWriter pw, String prefix) {
- pw.println(prefix + "displayId=" + mDisplayId + " stacks=" + mStacks.size()
+ pw.println(prefix + "displayId=" + mDisplayId + " stacks=" + getChildCount()
+ (mSingleTaskInstance ? " mSingleTaskInstance" : ""));
final String myPrefix = prefix + " ";
if (mHomeStack != null) {
@@ -1577,8 +1578,8 @@
}
public void dumpStacks(PrintWriter pw) {
- for (int i = mStacks.size() - 1; i >= 0; --i) {
- pw.print(mStacks.get(i).mStackId);
+ for (int i = getChildCount() - 1; i >= 0; --i) {
+ pw.print(getChildAt(i).mStackId);
if (i > 0) {
pw.print(",");
}
@@ -1601,8 +1602,8 @@
} else {
proto.write(FOCUSED_STACK_ID, INVALID_STACK_ID);
}
- for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
- final ActivityStack stack = mStacks.get(stackNdx);
+ for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) {
+ final ActivityStack stack = getChildAt(stackNdx);
stack.writeToProto(proto, STACKS, logLevel);
}
proto.end(token);
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 081bd2b..e80c9b3 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -1159,7 +1159,7 @@
this.task = task;
}
- TaskStack getStack() {
+ ActivityStack getStack() {
return task != null ? task.getTaskStack() : null;
}
@@ -1201,7 +1201,7 @@
} else if (mLastParent != null && mLastParent.getTaskStack() != null) {
task.getTaskStack().mExitingActivities.remove(this);
}
- final TaskStack stack = getStack();
+ final ActivityStack stack = getStack();
// If we reparent, make sure to remove ourselves from the old animation registry.
if (mAnimatingActivityRegistry != null) {
@@ -1265,7 +1265,7 @@
if (prevDc.mFocusedApp == this) {
prevDc.setFocusedApp(null);
- final TaskStack stack = dc.getTopStack();
+ final ActivityStack stack = dc.getTopStack();
if (stack != null) {
final Task task = stack.getTopChild();
if (task != null && task.getTopChild() == this) {
@@ -2658,14 +2658,16 @@
EventLog.writeEvent(EventLogTags.AM_DESTROY_ACTIVITY, mUserId,
System.identityHashCode(this), task.mTaskId, shortComponentName, reason);
+ final ActivityStack stack = getActivityStack();
+ if (hasProcess() && !stack.inLruList(this)) {
+ Slog.w(TAG, "Activity " + this + " being finished, but not in LRU list");
+ }
+
boolean removedFromHistory = false;
cleanUp(false /* cleanServices */, false /* setState */);
- final ActivityStack stack = getActivityStack();
- final boolean hadApp = hasProcess();
-
- if (hadApp) {
+ if (hasProcess()) {
if (removeFromApp) {
app.removeActivity(this);
if (!app.hasActivities()) {
@@ -2730,10 +2732,6 @@
configChangeFlags = 0;
- if (!stack.removeActivityFromLRUList(this) && hadApp) {
- Slog.w(TAG, "Activity " + this + " being finished, but not in LRU list");
- }
-
return removedFromHistory;
}
@@ -3023,7 +3021,7 @@
getDisplayContent().mNoAnimationNotifyOnTransitionFinished.add(token);
}
- final TaskStack stack = getStack();
+ final ActivityStack stack = getStack();
if (delayed && !isEmpty()) {
// set the token aside because it has an active animation to be finished
ProtoLog.v(WM_DEBUG_ADD_REMOVE,
@@ -3753,7 +3751,7 @@
// Notify the pinned stack upon all windows drawn. If there was an animation in
// progress then this signal will resume that animation.
- final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
+ final ActivityStack pinnedStack = mDisplayContent.getPinnedStack();
if (pinnedStack != null) {
pinnedStack.onAllWindowsDrawn();
}
@@ -5783,7 +5781,7 @@
getTransit(), task)) {
task.getBounds(mTmpRect);
} else {
- final TaskStack stack = getStack();
+ final ActivityStack stack = getStack();
if (stack == null) {
return;
}
@@ -6543,7 +6541,7 @@
void savePinnedStackBounds() {
// Leaving PiP to fullscreen, save the snap fraction based on the pre-animation bounds
// for the next re-entry into PiP (assuming the activity is not hidden or destroyed)
- final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
+ final ActivityStack pinnedStack = mDisplayContent.getPinnedStack();
if (pinnedStack == null) return;
final Rect stackBounds;
if (pinnedStack.lastAnimatingBoundsWasToFullscreen()) {
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index 8d90d6d..a91998a 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -16,12 +16,15 @@
package com.android.server.wm;
+import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT;
+import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
+import static android.app.WindowConfiguration.PINNED_WINDOWING_MODE_ELEVATION_IN_DIP;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
@@ -33,10 +36,17 @@
import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT;
import static android.content.pm.ActivityInfo.FLAG_RESUME_WHILE_PAUSING;
import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
+import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Display.FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD;
import static android.view.Display.INVALID_DISPLAY;
+import static android.view.WindowManager.DOCKED_BOTTOM;
+import static android.view.WindowManager.DOCKED_INVALID;
+import static android.view.WindowManager.DOCKED_LEFT;
+import static android.view.WindowManager.DOCKED_RIGHT;
+import static android.view.WindowManager.DOCKED_TOP;
import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE;
import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;
import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE;
@@ -48,13 +58,10 @@
import static android.view.WindowManager.TRANSIT_TASK_TO_BACK;
import static android.view.WindowManager.TRANSIT_TASK_TO_FRONT;
-import static com.android.server.am.ActivityStackProto.BOUNDS;
import static com.android.server.am.ActivityStackProto.DISPLAY_ID;
import static com.android.server.am.ActivityStackProto.FULLSCREEN;
-import static com.android.server.am.ActivityStackProto.ID;
import static com.android.server.am.ActivityStackProto.RESUMED_ACTIVITY;
import static com.android.server.am.ActivityStackProto.STACK;
-import static com.android.server.am.ActivityStackProto.TASKS;
import static com.android.server.wm.ActivityRecord.FINISH_RESULT_REMOVED;
import static com.android.server.wm.ActivityStack.ActivityState.PAUSED;
import static com.android.server.wm.ActivityStack.ActivityState.PAUSING;
@@ -97,8 +104,24 @@
import static com.android.server.wm.ActivityTaskManagerService.H.FIRST_ACTIVITY_STACK_MSG;
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_FREE_RESIZE;
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE;
+import static com.android.server.wm.BoundsAnimationController.FADE_IN;
+import static com.android.server.wm.BoundsAnimationController.NO_PIP_MODE_CHANGED_CALLBACKS;
+import static com.android.server.wm.BoundsAnimationController.SCHEDULE_PIP_MODE_CHANGED_ON_END;
+import static com.android.server.wm.BoundsAnimationController.SCHEDULE_PIP_MODE_CHANGED_ON_START;
+import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER;
import static com.android.server.wm.RootActivityContainer.FindTaskResult;
+import static com.android.server.wm.StackProto.ADJUSTED_BOUNDS;
+import static com.android.server.wm.StackProto.ADJUSTED_FOR_IME;
+import static com.android.server.wm.StackProto.ADJUST_DIVIDER_AMOUNT;
+import static com.android.server.wm.StackProto.ADJUST_IME_AMOUNT;
+import static com.android.server.wm.StackProto.ANIMATING_BOUNDS;
+import static com.android.server.wm.StackProto.DEFER_REMOVAL;
+import static com.android.server.wm.StackProto.FILLS_PARENT;
+import static com.android.server.wm.StackProto.MINIMIZE_AMOUNT;
+import static com.android.server.wm.StackProto.WINDOW_CONTAINER;
import static com.android.server.wm.Task.REPARENT_LEAVE_STACK_IN_PLACE;
+import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
+import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_MOVEMENT;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
@@ -111,6 +134,7 @@
import android.app.ActivityOptions;
import android.app.AppGlobals;
import android.app.IActivityController;
+import android.app.RemoteAction;
import android.app.ResultInfo;
import android.app.WindowConfiguration.ActivityType;
import android.app.WindowConfiguration.WindowingMode;
@@ -124,7 +148,9 @@
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.res.Configuration;
+import android.graphics.Point;
import android.graphics.Rect;
+import android.graphics.Region;
import android.net.Uri;
import android.os.Binder;
import android.os.Debug;
@@ -138,17 +164,24 @@
import android.os.UserHandle;
import android.service.voice.IVoiceInteractionSession;
import android.util.ArraySet;
+import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.IntArray;
import android.util.Log;
import android.util.Slog;
import android.util.proto.ProtoOutputStream;
import android.view.Display;
+import android.view.DisplayCutout;
+import android.view.DisplayInfo;
+import android.view.RemoteAnimationTarget;
+import android.view.SurfaceControl;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IVoiceInteractor;
import com.android.internal.os.logging.MetricsLoggerWrapper;
+import com.android.internal.policy.DividerSnapAlgorithm;
+import com.android.internal.policy.DockedDividerUtils;
import com.android.internal.util.function.pooled.PooledLambda;
import com.android.server.Watchdog;
import com.android.server.am.ActivityManagerService;
@@ -167,7 +200,8 @@
/**
* State and management of a single stack of activities.
*/
-class ActivityStack extends TaskStack {
+class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarget,
+ ConfigurationContainerListener {
private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityStack" : TAG_ATM;
private static final String TAG_ADD_REMOVE = TAG + POSTFIX_ADD_REMOVE;
private static final String TAG_APP = TAG + POSTFIX_APP;
@@ -228,52 +262,12 @@
/** Stack is completely invisible. */
static final int STACK_VISIBILITY_INVISIBLE = 2;
- // TODO(display-unify): Remove after display unification.
- protected void onParentChanged(ActivityDisplay newParent, ActivityDisplay oldParent) {
- onParentChanged(
- newParent != null ? newParent.mDisplayContent : null,
- oldParent != null ? oldParent.mDisplayContent : null);
- }
+ /** Minimum size of an adjusted stack bounds relative to original stack bounds. Used to
+ * restrict IME adjustment so that a min portion of top stack remains visible.*/
+ private static final float ADJUSTED_STACK_FRACTION_MIN = 0.3f;
- @Override
- protected void onParentChanged(
- ConfigurationContainer newParent, ConfigurationContainer oldParent) {
- final ActivityDisplay display = newParent != null
- ? ((WindowContainer) newParent).getDisplayContent().mActivityDisplay : null;
- final ActivityDisplay oldDisplay = oldParent != null
- ? ((WindowContainer) oldParent).getDisplayContent().mActivityDisplay : null;
-
- mDisplayId = (display != null) ? display.mDisplayId : INVALID_DISPLAY;
- mPrevDisplayId = (oldDisplay != null) ? oldDisplay.mDisplayId : INVALID_DISPLAY;
-
- if (display != null) {
- // Rotations are relative to the display. This means if there are 2 displays rotated
- // differently (eg. 2 monitors with one landscape and one portrait), moving a stack
- // from one to the other could look like a rotation change. To prevent this
- // apparent rotation change (and corresponding bounds rotation), pretend like our
- // current rotation is already the same as the new display.
- // Note, if ActivityStack or related logic ever gets nested, this logic will need
- // to move to onConfigurationChanged.
- getConfiguration().windowConfiguration.setRotation(
- display.getWindowConfiguration().getRotation());
- }
- super.onParentChanged(newParent, oldParent);
- if (display != null && inSplitScreenPrimaryWindowingMode()) {
- // If we created a docked stack we want to resize it so it resizes all other stacks
- // in the system.
- getStackDockedModeBounds(null /* dockedBounds */, null /* currentTempTaskBounds */,
- mTmpRect /* outStackBounds */, mTmpRect2 /* outTempTaskBounds */);
- mStackSupervisor.resizeDockedStackLocked(getRequestedOverrideBounds(), mTmpRect,
- mTmpRect2, null, null, PRESERVE_WINDOWS);
- }
- mRootActivityContainer.updateUIDsPresentOnDisplay();
-
- // Resume next focusable stack after reparenting to another display if we aren't removing
- // the prevous display.
- if (oldDisplay != null && oldDisplay.isRemoving()) {
- postReparent();
- }
- }
+ /** Dimming amount for non-focused stack when stacks are IME-adjusted. */
+ private static final float IME_ADJUST_DIM_AMOUNT = 0.25f;
enum ActivityState {
INITIALIZING,
@@ -297,7 +291,7 @@
* The first entry in the list is the least recently used.
* It contains HistoryRecord objects.
*/
- private final ArrayList<ActivityRecord> mLRUActivities = new ArrayList<>();
+ private final ArrayList<ActivityRecord> mLruActivities = new ArrayList<>();
/**
* When we are in the process of pausing an activity, before starting the
@@ -362,11 +356,71 @@
// Id of the previous display the stack was on.
int mPrevDisplayId = INVALID_DISPLAY;
+ /** Unique identifier */
+ final int mStackId;
+
+ /** For comparison with DisplayContent bounds. */
+ private Rect mTmpRect = new Rect();
+ private Rect mTmpRect2 = new Rect();
+ private Rect mTmpRect3 = new Rect();
+
+ /** For Pinned stack controlling. */
+ private Rect mTmpToBounds = new Rect();
+
+ /** Stack bounds adjusted to screen content area (taking into account IM windows, etc.) */
+ private final Rect mAdjustedBounds = new Rect();
+
+ /**
+ * Fully adjusted IME bounds. These are different from {@link #mAdjustedBounds} because they
+ * represent the state when the animation has ended.
+ */
+ private final Rect mFullyAdjustedImeBounds = new Rect();
+
+ /** ActivityRecords that are exiting, but still on screen for animations. */
+ final ArrayList<ActivityRecord> mExitingActivities = new ArrayList<>();
+
+ /** Detach this stack from its display when animation completes. */
+ // TODO: maybe tie this to WindowContainer#removeChild some how...
+ private boolean mDeferRemoval;
+
+ private final Rect mTmpAdjustedBounds = new Rect();
+ private boolean mAdjustedForIme;
+ private boolean mImeGoingAway;
+ private WindowState mImeWin;
+ private float mMinimizeAmount;
+ private float mAdjustImeAmount;
+ private float mAdjustDividerAmount;
+ private final int mDockedStackMinimizeThickness;
+
+ // If this is true, we are in the bounds animating mode. The task will be down or upscaled to
+ // perfectly fit the region it would have been cropped to. We may also avoid certain logic we
+ // would otherwise apply while resizing, while resizing in the bounds animating mode.
+ private boolean mBoundsAnimating = false;
+ // Set when an animation has been requested but has not yet started from the UI thread. This is
+ // cleared when the animation actually starts.
+ private boolean mBoundsAnimatingRequested = false;
+ private boolean mBoundsAnimatingToFullscreen = false;
+ private boolean mCancelCurrentBoundsAnimation = false;
+ private Rect mBoundsAnimationTarget = new Rect();
+ private Rect mBoundsAnimationSourceHintBounds = new Rect();
+ private @BoundsAnimationController.AnimationType int mAnimationType;
+
+ Rect mPreAnimationBounds = new Rect();
+
+ private Dimmer mDimmer = new Dimmer(this);
+
+ /**
+ * For {@link #prepareSurfaces}.
+ */
+ private final Rect mTmpDimBoundsRect = new Rect();
+ private final Point mLastSurfaceSize = new Point();
+
+ private final AnimatingActivityRegistry mAnimatingActivityRegistry =
+ new AnimatingActivityRegistry();
+
/** Stores the override windowing-mode from before a transient mode change (eg. split) */
private int mRestoreOverrideWindowingMode = WINDOWING_MODE_UNDEFINED;
- private final Rect mTmpRect = new Rect();
- private final Rect mTmpRect2 = new Rect();
private final ActivityOptions mTmpOptions = ActivityOptions.makeBasic();
/** List for processing through a set of activities */
@@ -474,12 +528,18 @@
ActivityStack(ActivityDisplay display, int stackId, ActivityStackSupervisor supervisor,
int windowingMode, int activityType, boolean onTop) {
- super(supervisor.mService.mWindowManager, stackId);
+ super(supervisor.mService.mWindowManager);
+ mStackId = stackId;
+ mDockedStackMinimizeThickness =
+ supervisor.mService.mWindowManager.mContext.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.docked_stack_minimize_thickness);
+ EventLog.writeEvent(com.android.server.EventLogTags.WM_STACK_CREATED, stackId);
mStackSupervisor = supervisor;
mService = supervisor.mService;
mRootActivityContainer = mService.mRootActivityContainer;
mHandler = new ActivityStackHandler(supervisor.mLooper);
mWindowManager = mService.mWindowManager;
+ mRemoteToken = new RemoteToken(this);
mCurrentUser = mService.mAmInternal.getCurrentUserId();
// Set display id before setting activity and window type to make sure it won't affect
// stacks on a wrong display.
@@ -529,6 +589,27 @@
getBounds(newBounds);
super.onConfigurationChanged(newParentConfig);
+
+ // Only need to update surface size here since the super method will handle updating
+ // surface position.
+ updateSurfaceSize(getPendingTransaction());
+
+ if (mDisplayContent == null) {
+ return;
+ }
+
+ if (prevWindowingMode != getWindowingMode()) {
+ mDisplayContent.onStackWindowingModeChanged(this);
+
+ if (inSplitScreenSecondaryWindowingMode()) {
+ // When the stack is resized due to entering split screen secondary, offset the
+ // windows to compensate for the new stack position.
+ forAllWindows(w -> {
+ w.mWinAnimator.setOffsetPositionForStackResize(true);
+ }, true);
+ }
+ }
+
final ActivityDisplay display = getDisplay();
if (display == null ) {
return;
@@ -835,20 +916,6 @@
return mRootActivityContainer.getActivityDisplay(mDisplayId);
}
- void positionChildAtTop(Task child) {
- positionChildAtTop(child, true /* includingParents */);
- }
-
- private void positionChildAtBottom(Task child) {
- // If there are other focusable stacks on the display, the z-order of the display should not
- // be changed just because a task was placed at the bottom. E.g. if it is moving the topmost
- // task to bottom, the next focusable stack on the same display should be focused.
- final ActivityStack nextFocusableStack = getDisplay().getNextFocusableStack(
- child.getStack(), true /* ignoreCurrent */);
- positionChildAtBottom(child, nextFocusableStack == null /* includingParents */);
- child.updateTaskMovement(true);
- }
-
/**
* Defers updating the bounds of the stack. If the stack was resized/repositioned while
* deferring, the bounds will update in {@link #continueUpdateBounds()}.
@@ -1060,14 +1127,15 @@
}
/** @return {@code true} if LRU list contained the specified activity. */
- final boolean removeActivityFromLRUList(ActivityRecord activity) {
- return mLRUActivities.remove(activity);
+ final boolean inLruList(ActivityRecord activity) {
+ return mLruActivities.contains(activity);
}
- final boolean updateLRUListLocked(ActivityRecord r) {
- final boolean hadit = mLRUActivities.remove(r);
- mLRUActivities.add(r);
- return hadit;
+ /** @return {@code true} if the given activity was contained in LRU list. */
+ final boolean updateLruList(ActivityRecord r) {
+ final boolean contained = mLruActivities.remove(r);
+ mLruActivities.add(r);
+ return contained;
}
final boolean isHomeOrRecentsStack() {
@@ -2653,7 +2721,7 @@
next.app.updateProcessInfo(false /* updateServiceConnectionActivities */,
true /* activityChange */, true /* updateOomAdj */);
- updateLRUListLocked(next);
+ updateLruList(next);
// Have the window manager re-evaluate the orientation of
// the screen based on the new activity order.
@@ -3643,10 +3711,10 @@
* an activity moves away from the stack.
*/
void onActivityRemovedFromStack(ActivityRecord r) {
- removeActivityFromLRUList(r);
removeTimeoutsForActivity(r);
mExitingActivities.remove(r);
+ mLruActivities.remove(r);
if (mResumedActivity != null && mResumedActivity == r) {
setResumedActivity(null, "onActivityRemovedFromStack");
@@ -3657,9 +3725,12 @@
}
void onActivityAddedToStack(ActivityRecord r) {
- if(r.getState() == RESUMED) {
+ if (r.isState(RESUMED)) {
setResumedActivity(r, "onActivityAddedToStack");
}
+ if (r.hasProcess()) {
+ updateLruList(r);
+ }
}
/// HANDLER INTERFACE BEGIN
@@ -3817,7 +3888,7 @@
}
private boolean removeHistoryRecordsForAppLocked(WindowProcessController app) {
- removeHistoryRecordsForAppLocked(mLRUActivities, app, "mLRUActivities");
+ removeHistoryRecordsForAppLocked(mLruActivities, app, "mLruActivities");
removeHistoryRecordsForAppLocked(mStackSupervisor.mStoppingActivities, app,
"mStoppingActivities");
removeHistoryRecordsForAppLocked(mStackSupervisor.mGoingToSleepActivities, app,
@@ -4381,7 +4452,7 @@
boolean printed = dumpActivitiesLocked(fd, pw, dumpAll, dumpClient, dumpPackage,
needSep);
- printed |= dumpHistoryList(fd, pw, mLRUActivities, " ", "Run", false,
+ printed |= dumpHistoryList(fd, pw, mLruActivities, " ", "Run", false,
!dumpAll, false, dumpPackage, true,
" Running activities (most recent first):", null);
@@ -4580,11 +4651,6 @@
// We only want to move the parents to the parents if we are creating this task at the
// top of its stack.
addChild(task, toTop ? MAX_VALUE : 0, showForAllUsers, toTop /*moveParents*/);
-
- if (toTop) {
- // TODO(stack-merge): figure-out a way to remove this call.
- positionChildAtTop(task);
- }
}
void positionChildAt(Task task, int position) {
@@ -4598,15 +4664,19 @@
final ActivityRecord topRunningActivity = task.topRunningActivityLocked();
final boolean wasResumed = topRunningActivity == task.getStack().mResumedActivity;
- // TODO(stack-merge): Can all of these be consolidated to just making the super call in the
- // else?
- if (position >= getChildCount()) {
- positionChildAtTop(task);
- } else if (position <= 0) {
- positionChildAtBottom(task);
- } else {
- super.positionChildAt(task, position);
+ boolean toTop = position >= getChildCount();
+ boolean includingParents = toTop || getDisplay().getNextFocusableStack(this,
+ true /* ignoreCurrent */) == null;
+ if (WindowManagerDebugConfig.DEBUG_STACK) {
+ Slog.i(TAG_WM, "positionChildAt: positioning task=" + task + " at " + position);
}
+ positionChildAt(position, task, includingParents);
+ task.updateTaskMovement(toTop);
+ if (getDisplayContent().mAppTransition.isTransitionSet()) {
+ task.setSendingToBottom(!toTop);
+ }
+ getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
+
// TODO: Investigate if this random code is really needed.
if (task.voiceSession != null) {
@@ -4658,7 +4728,7 @@
// Apps may depend on onResume()/onPause() being called in pairs.
if (setResume) {
r.setState(RESUMED, "moveToFrontAndResumeStateIfNeeded");
- updateLRUListLocked(r);
+ updateLruList(r);
}
// If the activity was previously pausing, then ensure we transfer that as well
if (setPause) {
@@ -4688,8 +4758,66 @@
return;
}
}
- super.animateResizePinnedStack(
- toBounds, sourceHintBounds, animationDuration, fromFullscreen);
+
+ // Get the from-bounds
+ final Rect fromBounds = new Rect();
+ getBounds(fromBounds);
+
+ // Get non-null fullscreen to-bounds for animating if the bounds are null
+ @BoundsAnimationController.SchedulePipModeChangedState int schedulePipModeChangedState =
+ NO_PIP_MODE_CHANGED_CALLBACKS;
+ final boolean toFullscreen = toBounds == null;
+ if (toFullscreen) {
+ if (fromFullscreen) {
+ throw new IllegalArgumentException("Should not defer scheduling PiP mode"
+ + " change on animation to fullscreen.");
+ }
+ schedulePipModeChangedState = SCHEDULE_PIP_MODE_CHANGED_ON_START;
+
+ mWmService.getStackBounds(
+ WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mTmpToBounds);
+ if (!mTmpToBounds.isEmpty()) {
+ // If there is a fullscreen bounds, use that
+ toBounds = new Rect(mTmpToBounds);
+ } else {
+ // Otherwise, use the display bounds
+ toBounds = new Rect();
+ getDisplayContent().getBounds(toBounds);
+ }
+ } else if (fromFullscreen) {
+ schedulePipModeChangedState = SCHEDULE_PIP_MODE_CHANGED_ON_END;
+ }
+
+ setAnimationFinalBounds(sourceHintBounds, toBounds, toFullscreen);
+
+ final Rect finalToBounds = toBounds;
+ final @BoundsAnimationController.SchedulePipModeChangedState int
+ finalSchedulePipModeChangedState = schedulePipModeChangedState;
+ final DisplayContent displayContent = getDisplayContent();
+ @BoundsAnimationController.AnimationType int intendedAnimationType =
+ displayContent.mBoundsAnimationController.getAnimationType();
+ if (intendedAnimationType == FADE_IN) {
+ if (fromFullscreen) {
+ setPinnedStackAlpha(0f);
+ }
+ if (toBounds.width() == fromBounds.width()
+ && toBounds.height() == fromBounds.height()) {
+ intendedAnimationType = BoundsAnimationController.BOUNDS;
+ } else if (!fromFullscreen && !toBounds.equals(fromBounds)) {
+ // intendedAnimationType may have been reset at the end of RecentsAnimation,
+ // force it to BOUNDS type if we know for certain we're animating to
+ // a different bounds, especially for expand and collapse of PiP window.
+ intendedAnimationType = BoundsAnimationController.BOUNDS;
+ }
+ }
+
+ final @BoundsAnimationController.AnimationType int animationType = intendedAnimationType;
+ mCancelCurrentBoundsAnimation = false;
+ displayContent.mBoundsAnimationController.getHandler().post(() -> {
+ displayContent.mBoundsAnimationController.animateBounds(this, fromBounds,
+ finalToBounds, animationDuration, finalSchedulePipModeChangedState,
+ fromFullscreen, toFullscreen, animationType);
+ });
}
void dismissPip() {
@@ -4706,6 +4834,12 @@
throw new RuntimeException("There should be only one task in a pinned stack.");
}
+ // give pinned stack a chance to save current bounds, this should happen before reparent.
+ final ActivityRecord top = topRunningNonOverlayTaskActivity();
+ if (top != null && top.isVisible()) {
+ top.savePinnedStackBounds();
+ }
+
mWindowManager.inSurfaceTransaction(() -> {
final Task task = mChildren.get(0);
setWindowingMode(WINDOWING_MODE_UNDEFINED);
@@ -4737,6 +4871,1580 @@
return mStackId;
}
+ Task findHomeTask() {
+ if (!isActivityTypeHome() || mChildren.isEmpty()) {
+ return null;
+ }
+ return mChildren.get(mChildren.size() - 1);
+ }
+
+ void prepareFreezingTaskBounds() {
+ for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; --taskNdx) {
+ final Task task = mChildren.get(taskNdx);
+ task.prepareFreezingBounds();
+ }
+ }
+
+ /**
+ * Overrides the adjusted bounds, i.e. sets temporary layout bounds which are different from
+ * the normal task bounds.
+ *
+ * @param bounds The adjusted bounds.
+ */
+ private void setAdjustedBounds(Rect bounds) {
+ if (mAdjustedBounds.equals(bounds) && !isAnimatingForIme()) {
+ return;
+ }
+
+ mAdjustedBounds.set(bounds);
+ final boolean adjusted = !mAdjustedBounds.isEmpty();
+ Rect insetBounds = null;
+ if (adjusted && isAdjustedForMinimizedDockedStack()) {
+ insetBounds = getRawBounds();
+ } else if (adjusted && mAdjustedForIme) {
+ if (mImeGoingAway) {
+ insetBounds = getRawBounds();
+ } else {
+ insetBounds = mFullyAdjustedImeBounds;
+ }
+ }
+ alignTasksToAdjustedBounds(adjusted ? mAdjustedBounds : getRawBounds(), insetBounds);
+ mDisplayContent.setLayoutNeeded();
+
+ updateSurfaceBounds();
+ }
+
+ private void alignTasksToAdjustedBounds(Rect adjustedBounds, Rect tempInsetBounds) {
+ if (matchParentBounds()) {
+ return;
+ }
+
+ final boolean alignBottom = mAdjustedForIme && getDockSide() == DOCKED_TOP;
+
+ // Update bounds of containing tasks.
+ for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; --taskNdx) {
+ final Task task = mChildren.get(taskNdx);
+ task.alignToAdjustedBounds(adjustedBounds, tempInsetBounds, alignBottom);
+ }
+ }
+
+ @Override
+ public int setBounds(Rect bounds) {
+ return setBounds(getRequestedOverrideBounds(), bounds);
+ }
+
+ private int setBounds(Rect existing, Rect bounds) {
+ if (equivalentBounds(existing, bounds)) {
+ return BOUNDS_CHANGE_NONE;
+ }
+
+ final int result = super.setBounds(!inMultiWindowMode() ? null : bounds);
+
+ updateAdjustedBounds();
+
+ updateSurfaceBounds();
+ return result;
+ }
+
+ /** Bounds of the stack without adjusting for other factors in the system like visibility
+ * of docked stack.
+ * Most callers should be using {@link ConfigurationContainer#getRequestedOverrideBounds} a
+ * it takes into consideration other system factors. */
+ void getRawBounds(Rect out) {
+ out.set(getRawBounds());
+ }
+
+ private Rect getRawBounds() {
+ return super.getBounds();
+ }
+
+ @Override
+ public void getBounds(Rect bounds) {
+ bounds.set(getBounds());
+ }
+
+ @Override
+ public Rect getBounds() {
+ // If we're currently adjusting for IME or minimized docked stack, we use the adjusted
+ // bounds; otherwise, no need to adjust the output bounds if fullscreen or the docked
+ // stack is visible since it is already what we want to represent to the rest of the
+ // system.
+ if (!mAdjustedBounds.isEmpty()) {
+ return mAdjustedBounds;
+ } else {
+ return super.getBounds();
+ }
+ }
+
+ /**
+ * Sets the bounds animation target bounds ahead of an animation. This can't currently be done
+ * in onAnimationStart() since that is started on the UiThread.
+ */
+ private void setAnimationFinalBounds(Rect sourceHintBounds, Rect destBounds,
+ boolean toFullscreen) {
+ if (mAnimationType == BoundsAnimationController.BOUNDS) {
+ mBoundsAnimatingRequested = true;
+ }
+ mBoundsAnimatingToFullscreen = toFullscreen;
+ if (destBounds != null) {
+ mBoundsAnimationTarget.set(destBounds);
+ } else {
+ mBoundsAnimationTarget.setEmpty();
+ }
+ if (sourceHintBounds != null) {
+ mBoundsAnimationSourceHintBounds.set(sourceHintBounds);
+ } else if (!mBoundsAnimating) {
+ // If the bounds are already animating, we don't want to reset the source hint. This is
+ // because the source hint is sent when starting the animation from the client that
+ // requested to enter pip. Other requests can adjust the pip bounds during an animation,
+ // but could accidentally reset the source hint bounds.
+ mBoundsAnimationSourceHintBounds.setEmpty();
+ }
+
+ mPreAnimationBounds.set(getRawBounds());
+ }
+
+ /**
+ * @return the final bounds for the bounds animation.
+ */
+ void getFinalAnimationBounds(Rect outBounds) {
+ outBounds.set(mBoundsAnimationTarget);
+ }
+
+ /**
+ * @return the final source bounds for the bounds animation.
+ */
+ void getFinalAnimationSourceHintBounds(Rect outBounds) {
+ outBounds.set(mBoundsAnimationSourceHintBounds);
+ }
+
+ /**
+ * @return the final animation bounds if the task stack is currently being animated, or the
+ * current stack bounds otherwise.
+ */
+ void getAnimationOrCurrentBounds(Rect outBounds) {
+ if ((mBoundsAnimatingRequested || mBoundsAnimating) && !mBoundsAnimationTarget.isEmpty()) {
+ getFinalAnimationBounds(outBounds);
+ return;
+ }
+ getBounds(outBounds);
+ }
+
+ /** Bounds of the stack with other system factors taken into consideration. */
+ void getDimBounds(Rect out) {
+ getBounds(out);
+ }
+
+ /**
+ * Updates the passed-in {@code inOutBounds} based on the current state of the
+ * pinned controller. This gets run *after* the override configuration is updated, so it's
+ * safe to rely on the controller's state in here (though eventually this dependence should
+ * be removed).
+ *
+ * This does NOT modify this TaskStack's configuration. However, it does, for the time-being,
+ * update pinned controller state.
+ *
+ * @param inOutBounds the bounds to update (both input and output).
+ * @return true if bounds were updated to some non-empty value.
+ */
+ boolean calculatePinnedBoundsForConfigChange(Rect inOutBounds) {
+ boolean animating = false;
+ if ((mBoundsAnimatingRequested || mBoundsAnimating) && !mBoundsAnimationTarget.isEmpty()) {
+ animating = true;
+ getFinalAnimationBounds(mTmpRect2);
+ } else {
+ mTmpRect2.set(inOutBounds);
+ }
+ boolean updated = mDisplayContent.mPinnedStackControllerLocked.onTaskStackBoundsChanged(
+ mTmpRect2, mTmpRect3);
+ if (updated) {
+ inOutBounds.set(mTmpRect3);
+
+ // The final boundary is updated while there is an existing boundary animation. Let's
+ // cancel this animation to prevent the obsolete animation overwritten updated bounds.
+ if (animating && !inOutBounds.equals(mBoundsAnimationTarget)) {
+ final DisplayContent displayContent = getDisplayContent();
+ displayContent.mBoundsAnimationController.getHandler().post(() ->
+ displayContent.mBoundsAnimationController.cancel(this));
+ }
+ // Once we've set the bounds based on the rotation of the old bounds in the new
+ // orientation, clear the animation target bounds since they are obsolete, and
+ // cancel any currently running animations
+ mBoundsAnimationTarget.setEmpty();
+ mBoundsAnimationSourceHintBounds.setEmpty();
+ mCancelCurrentBoundsAnimation = true;
+ }
+ return updated;
+ }
+
+ /**
+ * Updates the passed-in {@code inOutBounds} based on the current state of the
+ * docked controller. This gets run *after* the override configuration is updated, so it's
+ * safe to rely on the controller's state in here (though eventually this dependence should
+ * be removed).
+ *
+ * This does NOT modify this TaskStack's configuration. However, it does, for the time-being,
+ * update docked controller state.
+ *
+ * @param parentConfig the parent configuration for reference.
+ * @param inOutBounds the bounds to update (both input and output).
+ */
+ void calculateDockedBoundsForConfigChange(Configuration parentConfig, Rect inOutBounds) {
+ final boolean primary =
+ getRequestedOverrideWindowingMode() == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
+ repositionSplitScreenStackAfterRotation(parentConfig, primary, inOutBounds);
+ final DisplayCutout cutout = mDisplayContent.getDisplayInfo().displayCutout;
+ snapDockedStackAfterRotation(parentConfig, cutout, inOutBounds);
+ if (primary) {
+ final int newDockSide = getDockSide(parentConfig, inOutBounds);
+ // Update the dock create mode and clear the dock create bounds, these
+ // might change after a rotation and the original values will be invalid.
+ mWmService.setDockedStackCreateStateLocked(
+ (newDockSide == DOCKED_LEFT || newDockSide == DOCKED_TOP)
+ ? SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT
+ : SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT,
+ null);
+ mDisplayContent.getDockedDividerController().notifyDockSideChanged(newDockSide);
+ }
+ }
+
+ /**
+ * Some primary split screen sides are not allowed by the policy. This method queries the policy
+ * and moves the primary stack around if needed.
+ *
+ * @param parentConfig the configuration of the stack's parent.
+ * @param primary true if adjusting the primary docked stack, false for secondary.
+ * @param inOutBounds the bounds of the stack to adjust.
+ */
+ void repositionSplitScreenStackAfterRotation(Configuration parentConfig, boolean primary,
+ Rect inOutBounds) {
+ final int dockSide = getDockSide(mDisplayContent, parentConfig, inOutBounds);
+ final int otherDockSide = DockedDividerUtils.invertDockSide(dockSide);
+ final int primaryDockSide = primary ? dockSide : otherDockSide;
+ if (mDisplayContent.getDockedDividerController()
+ .canPrimaryStackDockTo(primaryDockSide,
+ parentConfig.windowConfiguration.getBounds(),
+ parentConfig.windowConfiguration.getRotation())) {
+ return;
+ }
+ final Rect parentBounds = parentConfig.windowConfiguration.getBounds();
+ switch (otherDockSide) {
+ case DOCKED_LEFT:
+ int movement = inOutBounds.left;
+ inOutBounds.left -= movement;
+ inOutBounds.right -= movement;
+ break;
+ case DOCKED_RIGHT:
+ movement = parentBounds.right - inOutBounds.right;
+ inOutBounds.left += movement;
+ inOutBounds.right += movement;
+ break;
+ case DOCKED_TOP:
+ movement = inOutBounds.top;
+ inOutBounds.top -= movement;
+ inOutBounds.bottom -= movement;
+ break;
+ case DOCKED_BOTTOM:
+ movement = parentBounds.bottom - inOutBounds.bottom;
+ inOutBounds.top += movement;
+ inOutBounds.bottom += movement;
+ break;
+ }
+ }
+
+ /**
+ * Snaps the bounds after rotation to the closest snap target for the docked stack.
+ */
+ void snapDockedStackAfterRotation(Configuration parentConfig, DisplayCutout displayCutout,
+ Rect outBounds) {
+
+ // Calculate the current position.
+ final int dividerSize = mDisplayContent.getDockedDividerController().getContentWidth();
+ final int dockSide = getDockSide(parentConfig, outBounds);
+ final int dividerPosition = DockedDividerUtils.calculatePositionForBounds(outBounds,
+ dockSide, dividerSize);
+ final int displayWidth = parentConfig.windowConfiguration.getBounds().width();
+ final int displayHeight = parentConfig.windowConfiguration.getBounds().height();
+
+ // Snap the position to a target.
+ final int rotation = parentConfig.windowConfiguration.getRotation();
+ final int orientation = parentConfig.orientation;
+ mDisplayContent.getDisplayPolicy().getStableInsetsLw(rotation, displayWidth, displayHeight,
+ displayCutout, outBounds);
+ final DividerSnapAlgorithm algorithm = new DividerSnapAlgorithm(
+ mWmService.mContext.getResources(), displayWidth, displayHeight,
+ dividerSize, orientation == Configuration.ORIENTATION_PORTRAIT, outBounds,
+ getDockSide(), isMinimizedDockAndHomeStackResizable());
+ final DividerSnapAlgorithm.SnapTarget target =
+ algorithm.calculateNonDismissingSnapTarget(dividerPosition);
+
+ // Recalculate the bounds based on the position of the target.
+ DockedDividerUtils.calculateBoundsForPosition(target.position, dockSide,
+ outBounds, displayWidth, displayHeight,
+ dividerSize);
+ }
+
+ /**
+ * Put a Task in this stack. Used for adding only.
+ * When task is added to top of the stack, the entire branch of the hierarchy (including stack
+ * and display) will be brought to top.
+ * @param task The task to add.
+ * @param position Target position to add the task to.
+ * @param showForAllUsers Whether to show the task regardless of the current user.
+ */
+ void addChild(Task task, int position, boolean showForAllUsers, boolean moveParents) {
+ // Add child task.
+ addChild(task, null);
+
+ // Move child to a proper position, as some restriction for position might apply.
+ position = positionChildAt(
+ position, task, moveParents /* includingParents */, showForAllUsers);
+ }
+
+ @Override
+ void addChild(Task task, int position) {
+ addChild(task, position, task.showForAllUsers(), false /* includingParents */);
+ }
+
+ void positionChildAtTop(Task child) {
+ if (child == null) {
+ // TODO: Fix the call-points that cause this to happen.
+ return;
+ }
+
+ positionChildAt(POSITION_TOP, child, true /* includingParents */);
+ child.updateTaskMovement(true);
+
+ final DisplayContent displayContent = getDisplayContent();
+ if (displayContent.mAppTransition.isTransitionSet()) {
+ child.setSendingToBottom(false);
+ }
+ displayContent.layoutAndAssignWindowLayersIfNeeded();
+ }
+
+ private void positionChildAtBottom(Task child) {
+ // If there are other focusable stacks on the display, the z-order of the display should not
+ // be changed just because a task was placed at the bottom. E.g. if it is moving the topmost
+ // task to bottom, the next focusable stack on the same display should be focused.
+ final ActivityStack nextFocusableStack = getDisplay().getNextFocusableStack(
+ child.getStack(), true /* ignoreCurrent */);
+ positionChildAtBottom(child, nextFocusableStack == null /* includingParents */);
+ child.updateTaskMovement(true);
+ }
+
+ @VisibleForTesting
+ void positionChildAtBottom(Task child, boolean includingParents) {
+ if (child == null) {
+ // TODO: Fix the call-points that cause this to happen.
+ return;
+ }
+
+ positionChildAt(POSITION_BOTTOM, child, includingParents);
+
+ if (getDisplayContent().mAppTransition.isTransitionSet()) {
+ child.setSendingToBottom(true);
+ }
+ getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
+ }
+
+ @Override
+ void positionChildAt(int position, Task child, boolean includingParents) {
+ positionChildAt(position, child, includingParents, child.showForAllUsers());
+ }
+
+ /**
+ * Overridden version of {@link ActivityStack#positionChildAt(int, Task, boolean)}. Used in
+ * {@link ActivityStack#addChild(Task, int, boolean showForAllUsers, boolean)}, as it can
+ * receive showForAllUsers param from {@link ActivityRecord} instead of
+ * {@link Task#showForAllUsers()}.
+ */
+ private int positionChildAt(int position, Task child, boolean includingParents,
+ boolean showForAllUsers) {
+ final int targetPosition = findPositionForTask(child, position, showForAllUsers);
+ super.positionChildAt(targetPosition, child, includingParents);
+
+ // Log positioning.
+ if (DEBUG_TASK_MOVEMENT) {
+ Slog.d(TAG_WM, "positionTask: task=" + this + " position=" + position);
+ }
+
+ final int toTop = targetPosition == mChildren.size() - 1 ? 1 : 0;
+ EventLog.writeEvent(com.android.server.EventLogTags.WM_TASK_MOVED, child.mTaskId, toTop,
+ targetPosition);
+
+ return targetPosition;
+ }
+
+ @Override
+ void onChildPositionChanged(WindowContainer child) {
+ if (!mChildren.contains(child)) {
+ return;
+ }
+
+ final Task task = (Task) child;
+ final boolean isTop = getTopChild() == task;
+ task.updateTaskMovement(isTop);
+ if (isTop) {
+ final DisplayContent displayContent = getDisplayContent();
+ if (displayContent.mAppTransition.isTransitionSet()) {
+ task.setSendingToBottom(false);
+ }
+ displayContent.layoutAndAssignWindowLayersIfNeeded();
+ }
+ }
+
+ // TODO(display-unify): Remove after display unification.
+ protected void onParentChanged(ActivityDisplay newParent, ActivityDisplay oldParent) {
+ onParentChanged(
+ newParent != null ? newParent.mDisplayContent : null,
+ oldParent != null ? oldParent.mDisplayContent : null);
+ }
+
+ @Override
+ protected void onParentChanged(
+ ConfigurationContainer newParent, ConfigurationContainer oldParent) {
+ final ActivityDisplay display = newParent != null
+ ? ((WindowContainer) newParent).getDisplayContent().mActivityDisplay : null;
+ final ActivityDisplay oldDisplay = oldParent != null
+ ? ((WindowContainer) oldParent).getDisplayContent().mActivityDisplay : null;
+
+ mDisplayId = (display != null) ? display.mDisplayId : INVALID_DISPLAY;
+ mPrevDisplayId = (oldDisplay != null) ? oldDisplay.mDisplayId : INVALID_DISPLAY;
+
+ if (display != null) {
+ // Rotations are relative to the display. This means if there are 2 displays rotated
+ // differently (eg. 2 monitors with one landscape and one portrait), moving a stack
+ // from one to the other could look like a rotation change. To prevent this
+ // apparent rotation change (and corresponding bounds rotation), pretend like our
+ // current rotation is already the same as the new display.
+ // Note, if ActivityStack or related logic ever gets nested, this logic will need
+ // to move to onConfigurationChanged.
+ getConfiguration().windowConfiguration.setRotation(
+ display.getWindowConfiguration().getRotation());
+ }
+ super.onParentChanged(newParent, oldParent);
+ if (getParent() == null && mDisplayContent != null) {
+ EventLog.writeEvent(com.android.server.EventLogTags.WM_STACK_REMOVED, mStackId);
+
+ mDisplayContent = null;
+ mWmService.mWindowPlacerLocked.requestTraversal();
+ }
+ if (display != null && inSplitScreenPrimaryWindowingMode()) {
+ // If we created a docked stack we want to resize it so it resizes all other stacks
+ // in the system.
+ getStackDockedModeBounds(null /* dockedBounds */, null /* currentTempTaskBounds */,
+ mTmpRect /* outStackBounds */, mTmpRect2 /* outTempTaskBounds */);
+ mStackSupervisor.resizeDockedStackLocked(getRequestedOverrideBounds(), mTmpRect,
+ mTmpRect2, null, null, PRESERVE_WINDOWS);
+ }
+ mRootActivityContainer.updateUIDsPresentOnDisplay();
+
+ // Resume next focusable stack after reparenting to another display if we aren't removing
+ // the prevous display.
+ if (oldDisplay != null && oldDisplay.isRemoving()) {
+ postReparent();
+ }
+ }
+
+ void reparent(DisplayContent newParent, boolean onTop) {
+ // Real parent of stack is within display object, so we have to delegate re-parenting there.
+ newParent.moveStackToDisplay(this, onTop);
+ }
+
+ // TODO: We should really have users as a window container in the hierarchy so that we don't
+ // have to do complicated things like we are doing in this method.
+ int findPositionForTask(Task task, int targetPosition, boolean showForAllUsers) {
+ final boolean canShowTask =
+ showForAllUsers || mWmService.isCurrentProfileLocked(task.mUserId);
+
+ final int stackSize = mChildren.size();
+ int minPosition = 0;
+ int maxPosition = stackSize - 1;
+
+ if (canShowTask) {
+ minPosition = computeMinPosition(minPosition, stackSize);
+ } else {
+ maxPosition = computeMaxPosition(maxPosition);
+ }
+
+ // preserve POSITION_BOTTOM/POSITION_TOP positions if they are still valid.
+ if (targetPosition == POSITION_BOTTOM && minPosition == 0) {
+ return POSITION_BOTTOM;
+ } else if (targetPosition == POSITION_TOP && maxPosition == (stackSize - 1)) {
+ return POSITION_TOP;
+ }
+ // Reset position based on minimum/maximum possible positions.
+ return Math.min(Math.max(targetPosition, minPosition), maxPosition);
+ }
+
+ /** Calculate the minimum possible position for a task that can be shown to the user.
+ * The minimum position will be above all other tasks that can't be shown.
+ * @param minPosition The minimum position the caller is suggesting.
+ * We will start adjusting up from here.
+ * @param size The size of the current task list.
+ */
+ private int computeMinPosition(int minPosition, int size) {
+ while (minPosition < size) {
+ final Task tmpTask = mChildren.get(minPosition);
+ final boolean canShowTmpTask =
+ tmpTask.showForAllUsers()
+ || mWmService.isCurrentProfileLocked(tmpTask.mUserId);
+ if (canShowTmpTask) {
+ break;
+ }
+ minPosition++;
+ }
+ return minPosition;
+ }
+
+ /** Calculate the maximum possible position for a task that can't be shown to the user.
+ * The maximum position will be below all other tasks that can be shown.
+ * @param maxPosition The maximum position the caller is suggesting.
+ * We will start adjusting down from here.
+ */
+ private int computeMaxPosition(int maxPosition) {
+ while (maxPosition > 0) {
+ final Task tmpTask = mChildren.get(maxPosition);
+ final boolean canShowTmpTask =
+ tmpTask.showForAllUsers()
+ || mWmService.isCurrentProfileLocked(tmpTask.mUserId);
+ if (!canShowTmpTask) {
+ break;
+ }
+ maxPosition--;
+ }
+ return maxPosition;
+ }
+
+ private void updateSurfaceBounds() {
+ updateSurfaceSize(getPendingTransaction());
+ updateSurfacePosition();
+ scheduleAnimation();
+ }
+
+ /**
+ * Calculate an amount by which to expand the stack bounds in each direction.
+ * Used to make room for shadows in the pinned windowing mode.
+ */
+ int getStackOutset() {
+ DisplayContent displayContent = getDisplayContent();
+ if (inPinnedWindowingMode() && displayContent != null) {
+ final DisplayMetrics displayMetrics = displayContent.getDisplayMetrics();
+
+ // We multiply by two to match the client logic for converting view elevation
+ // to insets, as in {@link WindowManager.LayoutParams#setSurfaceInsets}
+ return (int) Math.ceil(
+ mWmService.dipToPixel(PINNED_WINDOWING_MODE_ELEVATION_IN_DIP, displayMetrics)
+ * 2);
+ }
+ return 0;
+ }
+
+ @Override
+ void getRelativeDisplayedPosition(Point outPos) {
+ super.getRelativeDisplayedPosition(outPos);
+ final int outset = getStackOutset();
+ outPos.x -= outset;
+ outPos.y -= outset;
+ }
+
+ private void updateSurfaceSize(SurfaceControl.Transaction transaction) {
+ if (mSurfaceControl == null) {
+ return;
+ }
+
+ final Rect stackBounds = getDisplayedBounds();
+ int width = stackBounds.width();
+ int height = stackBounds.height();
+
+ final int outset = getStackOutset();
+ width += 2 * outset;
+ height += 2 * outset;
+
+ if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) {
+ return;
+ }
+ transaction.setWindowCrop(mSurfaceControl, width, height);
+ mLastSurfaceSize.set(width, height);
+ }
+
+ @VisibleForTesting
+ Point getLastSurfaceSize() {
+ return mLastSurfaceSize;
+ }
+
+ @Override
+ void onDisplayChanged(DisplayContent dc) {
+ super.onDisplayChanged(dc);
+ updateSurfaceBounds();
+ }
+
+ /**
+ * Determines the stack and task bounds of the other stack when in docked mode. The current task
+ * bounds is passed in but depending on the stack, the task and stack must match. Only in
+ * minimized mode with resizable launcher, the other stack ignores calculating the stack bounds
+ * and uses the task bounds passed in as the stack and task bounds, otherwise the stack bounds
+ * is calculated and is also used for its task bounds.
+ * If any of the out bounds are empty, it represents default bounds
+ *
+ * @param currentTempTaskBounds the current task bounds of the other stack
+ * @param outStackBounds the calculated stack bounds of the other stack
+ * @param outTempTaskBounds the calculated task bounds of the other stack
+ */
+ void getStackDockedModeBounds(Rect dockedBounds,
+ Rect currentTempTaskBounds, Rect outStackBounds, Rect outTempTaskBounds) {
+ final Configuration parentConfig = getParent().getConfiguration();
+ outTempTaskBounds.setEmpty();
+
+ if (dockedBounds == null || dockedBounds.isEmpty()) {
+ // Calculate the primary docked bounds.
+ final boolean dockedOnTopOrLeft = mWmService.mDockedStackCreateMode
+ == SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
+ getStackDockedModeBounds(parentConfig,
+ true /* primary */, outStackBounds, dockedBounds,
+ mDisplayContent.mDividerControllerLocked.getContentWidth(), dockedOnTopOrLeft);
+ return;
+ }
+ final int dockedSide = getDockSide(parentConfig, dockedBounds);
+
+ // When the home stack is resizable, should always have the same stack and task bounds
+ if (isActivityTypeHome()) {
+ final Task homeTask = findHomeTask();
+ if (homeTask == null || homeTask.isResizeable()) {
+ // Calculate the home stack bounds when in docked mode and the home stack is
+ // resizeable.
+ getDisplayContent().mDividerControllerLocked
+ .getHomeStackBoundsInDockedMode(parentConfig,
+ dockedSide, outStackBounds);
+ } else {
+ // Home stack isn't resizeable, so don't specify stack bounds.
+ outStackBounds.setEmpty();
+ }
+
+ outTempTaskBounds.set(outStackBounds);
+ return;
+ }
+
+ // When minimized state, the stack bounds for all non-home and docked stack bounds should
+ // match the passed task bounds
+ if (isMinimizedDockAndHomeStackResizable() && currentTempTaskBounds != null) {
+ outStackBounds.set(currentTempTaskBounds);
+ return;
+ }
+
+ if (dockedSide == DOCKED_INVALID) {
+ // Not sure how you got here...Only thing we can do is return current bounds.
+ Slog.e(TAG_WM, "Failed to get valid docked side for docked stack");
+ outStackBounds.set(getRawBounds());
+ return;
+ }
+
+ final boolean dockedOnTopOrLeft = dockedSide == DOCKED_TOP || dockedSide == DOCKED_LEFT;
+ getStackDockedModeBounds(parentConfig,
+ false /* primary */, outStackBounds, dockedBounds,
+ mDisplayContent.mDividerControllerLocked.getContentWidth(), dockedOnTopOrLeft);
+ }
+
+ /**
+ * Outputs the bounds a stack should be given the presence of a docked stack on the display.
+ * @param parentConfig The parent configuration.
+ * @param primary {@code true} if getting the primary stack bounds.
+ * @param outBounds Output bounds that should be used for the stack.
+ * @param dockedBounds Bounds of the docked stack.
+ * @param dockDividerWidth We need to know the width of the divider make to the output bounds
+ * close to the side of the dock.
+ * @param dockOnTopOrLeft If the docked stack is on the top or left side of the screen.
+ */
+ private void getStackDockedModeBounds(Configuration parentConfig, boolean primary,
+ Rect outBounds, Rect dockedBounds, int dockDividerWidth,
+ boolean dockOnTopOrLeft) {
+ final Rect displayRect = parentConfig.windowConfiguration.getBounds();
+ final boolean splitHorizontally = displayRect.width() > displayRect.height();
+
+ outBounds.set(displayRect);
+ if (primary) {
+ if (mWmService.mDockedStackCreateBounds != null) {
+ outBounds.set(mWmService.mDockedStackCreateBounds);
+ return;
+ }
+
+ // The initial bounds of the docked stack when it is created about half the screen space
+ // and its bounds can be adjusted after that. The bounds of all other stacks are
+ // adjusted to occupy whatever screen space the docked stack isn't occupying.
+ final DisplayCutout displayCutout = mDisplayContent.getDisplayInfo().displayCutout;
+ mDisplayContent.getDisplayPolicy().getStableInsetsLw(
+ parentConfig.windowConfiguration.getRotation(),
+ displayRect.width(), displayRect.height(), displayCutout, mTmpRect2);
+ final int position = new DividerSnapAlgorithm(mWmService.mContext.getResources(),
+ displayRect.width(),
+ displayRect.height(),
+ dockDividerWidth,
+ parentConfig.orientation == ORIENTATION_PORTRAIT,
+ mTmpRect2).getMiddleTarget().position;
+
+ if (dockOnTopOrLeft) {
+ if (splitHorizontally) {
+ outBounds.right = position;
+ } else {
+ outBounds.bottom = position;
+ }
+ } else {
+ if (splitHorizontally) {
+ outBounds.left = position + dockDividerWidth;
+ } else {
+ outBounds.top = position + dockDividerWidth;
+ }
+ }
+ return;
+ }
+
+ // Other stacks occupy whatever space is left by the docked stack.
+ if (!dockOnTopOrLeft) {
+ if (splitHorizontally) {
+ outBounds.right = dockedBounds.left - dockDividerWidth;
+ } else {
+ outBounds.bottom = dockedBounds.top - dockDividerWidth;
+ }
+ } else {
+ if (splitHorizontally) {
+ outBounds.left = dockedBounds.right + dockDividerWidth;
+ } else {
+ outBounds.top = dockedBounds.bottom + dockDividerWidth;
+ }
+ }
+ DockedDividerUtils.sanitizeStackBounds(outBounds, !dockOnTopOrLeft);
+ }
+
+ void resetDockedStackToMiddle() {
+ if (!inSplitScreenPrimaryWindowingMode()) {
+ throw new IllegalStateException("Not a docked stack=" + this);
+ }
+
+ mWmService.mDockedStackCreateBounds = null;
+
+ final Rect bounds = new Rect();
+ final Rect tempBounds = new Rect();
+ getStackDockedModeBounds(null /* dockedBounds */, null /* currentTempTaskBounds */,
+ bounds, tempBounds);
+ mStackSupervisor.resizeDockedStackLocked(bounds, null /* tempTaskBounds */,
+ null /* tempTaskInsetBounds */, null /* tempOtherTaskBounds */,
+ null /* tempOtherTaskInsetBounds */, false /* preserveWindows */,
+ false /* deferResume */);
+ }
+
+ @Override
+ void removeIfPossible() {
+ if (isAnimating(TRANSITION | CHILDREN)) {
+ mDeferRemoval = true;
+ return;
+ }
+ removeImmediately();
+ }
+
+ /**
+ * Adjusts the stack bounds if the IME is visible.
+ *
+ * @param imeWin The IME window.
+ * @param keepLastAmount Use {@code true} to keep the last adjusted amount from
+ * {@link DockedStackDividerController} for adjusting the stack bounds,
+ * Use {@code false} to reset adjusted amount as 0.
+ * @see #updateAdjustForIme(float, float, boolean)
+ */
+ void setAdjustedForIme(WindowState imeWin, boolean keepLastAmount) {
+ mImeWin = imeWin;
+ mImeGoingAway = false;
+ if (!mAdjustedForIme || keepLastAmount) {
+ mAdjustedForIme = true;
+ DockedStackDividerController controller = getDisplayContent().mDividerControllerLocked;
+ final float adjustImeAmount = keepLastAmount ? controller.mLastAnimationProgress : 0f;
+ final float adjustDividerAmount = keepLastAmount ? controller.mLastDividerProgress : 0f;
+ updateAdjustForIme(adjustImeAmount, adjustDividerAmount, true /* force */);
+ }
+ }
+
+ boolean isAdjustedForIme() {
+ return mAdjustedForIme;
+ }
+
+ boolean isAnimatingForIme() {
+ return mImeWin != null && mImeWin.isAnimatingLw();
+ }
+
+ /**
+ * Update the stack's bounds (crop or position) according to the IME window's
+ * current position. When IME window is animated, the bottom stack is animated
+ * together to track the IME window's current position, and the top stack is
+ * cropped as necessary.
+ *
+ * @return true if a traversal should be performed after the adjustment.
+ */
+ boolean updateAdjustForIme(float adjustAmount, float adjustDividerAmount, boolean force) {
+ if (adjustAmount != mAdjustImeAmount
+ || adjustDividerAmount != mAdjustDividerAmount || force) {
+ mAdjustImeAmount = adjustAmount;
+ mAdjustDividerAmount = adjustDividerAmount;
+ updateAdjustedBounds();
+ return isVisible();
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Resets the adjustment after it got adjusted for the IME.
+ * @param adjustBoundsNow if true, reset and update the bounds immediately and forget about
+ * animations; otherwise, set flag and animates the window away together
+ * with IME window.
+ */
+ void resetAdjustedForIme(boolean adjustBoundsNow) {
+ if (adjustBoundsNow) {
+ mImeWin = null;
+ mImeGoingAway = false;
+ mAdjustImeAmount = 0f;
+ mAdjustDividerAmount = 0f;
+ if (!mAdjustedForIme) {
+ return;
+ }
+ mAdjustedForIme = false;
+ updateAdjustedBounds();
+ mWmService.setResizeDimLayer(false, getWindowingMode(), 1.0f);
+ } else {
+ mImeGoingAway |= mAdjustedForIme;
+ }
+ }
+
+ /**
+ * Sets the amount how much we currently minimize our stack.
+ *
+ * @param minimizeAmount The amount, between 0 and 1.
+ * @return Whether the amount has changed and a layout is needed.
+ */
+ boolean setAdjustedForMinimizedDock(float minimizeAmount) {
+ if (minimizeAmount != mMinimizeAmount) {
+ mMinimizeAmount = minimizeAmount;
+ updateAdjustedBounds();
+ return isVisible();
+ } else {
+ return false;
+ }
+ }
+
+ boolean shouldIgnoreInput() {
+ return isAdjustedForMinimizedDockedStack()
+ || (inSplitScreenPrimaryWindowingMode() && isMinimizedDockAndHomeStackResizable());
+ }
+
+ /**
+ * Puts all visible tasks that are adjusted for IME into resizing mode and adds the windows
+ * to the list of to be drawn windows the service is waiting for.
+ */
+ void beginImeAdjustAnimation() {
+ for (int j = mChildren.size() - 1; j >= 0; j--) {
+ final Task task = mChildren.get(j);
+ if (task.hasContentToDisplay()) {
+ task.setDragResizing(true, DRAG_RESIZE_MODE_DOCKED_DIVIDER);
+ task.setWaitingForDrawnIfResizingChanged();
+ }
+ }
+ }
+
+ /**
+ * Resets the resizing state of all windows.
+ */
+ void endImeAdjustAnimation() {
+ for (int j = mChildren.size() - 1; j >= 0; j--) {
+ mChildren.get(j).setDragResizing(false, DRAG_RESIZE_MODE_DOCKED_DIVIDER);
+ }
+ }
+
+ int getMinTopStackBottom(final Rect displayContentRect, int originalStackBottom) {
+ return displayContentRect.top + (int)
+ ((originalStackBottom - displayContentRect.top) * ADJUSTED_STACK_FRACTION_MIN);
+ }
+
+ private boolean adjustForIME(final WindowState imeWin) {
+ // To prevent task stack resize animation may flicking when playing app transition
+ // animation & IME window enter animation in parallel, we need to make sure app
+ // transition is done and then adjust task size for IME, skip the new adjusted frame when
+ // app transition is still running.
+ if (getDisplayContent().mAppTransition.isRunning()) {
+ return false;
+ }
+
+ final int dockedSide = getDockSide();
+ final boolean dockedTopOrBottom = dockedSide == DOCKED_TOP || dockedSide == DOCKED_BOTTOM;
+ if (imeWin == null || !dockedTopOrBottom) {
+ return false;
+ }
+
+ final Rect displayStableRect = mTmpRect;
+ final Rect contentBounds = mTmpRect2;
+
+ // Calculate the content bounds excluding the area occupied by IME
+ getDisplayContent().getStableRect(displayStableRect);
+ contentBounds.set(displayStableRect);
+ int imeTop = Math.max(imeWin.getFrameLw().top, contentBounds.top);
+
+ imeTop += imeWin.getGivenContentInsetsLw().top;
+ if (contentBounds.bottom > imeTop) {
+ contentBounds.bottom = imeTop;
+ }
+
+ final int yOffset = displayStableRect.bottom - contentBounds.bottom;
+
+ final int dividerWidth =
+ getDisplayContent().mDividerControllerLocked.getContentWidth();
+ final int dividerWidthInactive =
+ getDisplayContent().mDividerControllerLocked.getContentWidthInactive();
+
+ if (dockedSide == DOCKED_TOP) {
+ // If this stack is docked on top, we make it smaller so the bottom stack is not
+ // occluded by IME. We shift its bottom up by the height of the IME, but
+ // leaves at least 30% of the top stack visible.
+ final int minTopStackBottom =
+ getMinTopStackBottom(displayStableRect, getRawBounds().bottom);
+ final int bottom = Math.max(
+ getRawBounds().bottom - yOffset + dividerWidth - dividerWidthInactive,
+ minTopStackBottom);
+ mTmpAdjustedBounds.set(getRawBounds());
+ mTmpAdjustedBounds.bottom = (int) (mAdjustImeAmount * bottom + (1 - mAdjustImeAmount)
+ * getRawBounds().bottom);
+ mFullyAdjustedImeBounds.set(getRawBounds());
+ } else {
+ // When the stack is on bottom and has no focus, it's only adjusted for divider width.
+ final int dividerWidthDelta = dividerWidthInactive - dividerWidth;
+
+ // When the stack is on bottom and has focus, it needs to be moved up so as to
+ // not occluded by IME, and at the same time adjusted for divider width.
+ // We try to move it up by the height of the IME window, but only to the extent
+ // that leaves at least 30% of the top stack visible.
+ // 'top' is where the top of bottom stack will move to in this case.
+ final int topBeforeImeAdjust =
+ getRawBounds().top - dividerWidth + dividerWidthInactive;
+ final int minTopStackBottom =
+ getMinTopStackBottom(displayStableRect,
+ getRawBounds().top - dividerWidth);
+ final int top = Math.max(
+ getRawBounds().top - yOffset, minTopStackBottom + dividerWidthInactive);
+
+ mTmpAdjustedBounds.set(getRawBounds());
+ // Account for the adjustment for IME and divider width separately.
+ // (top - topBeforeImeAdjust) is the amount of movement due to IME only,
+ // and dividerWidthDelta is due to divider width change only.
+ mTmpAdjustedBounds.top =
+ getRawBounds().top + (int) (mAdjustImeAmount * (top - topBeforeImeAdjust)
+ + mAdjustDividerAmount * dividerWidthDelta);
+ mFullyAdjustedImeBounds.set(getRawBounds());
+ mFullyAdjustedImeBounds.top = top;
+ mFullyAdjustedImeBounds.bottom = top + getRawBounds().height();
+ }
+ return true;
+ }
+
+ private boolean adjustForMinimizedDockedStack(float minimizeAmount) {
+ final int dockSide = getDockSide();
+ if (dockSide == DOCKED_INVALID && !mTmpAdjustedBounds.isEmpty()) {
+ return false;
+ }
+
+ if (dockSide == DOCKED_TOP) {
+ mWmService.getStableInsetsLocked(DEFAULT_DISPLAY, mTmpRect);
+ int topInset = mTmpRect.top;
+ mTmpAdjustedBounds.set(getRawBounds());
+ mTmpAdjustedBounds.bottom = (int) (minimizeAmount * topInset + (1 - minimizeAmount)
+ * getRawBounds().bottom);
+ } else if (dockSide == DOCKED_LEFT) {
+ mTmpAdjustedBounds.set(getRawBounds());
+ final int width = getRawBounds().width();
+ mTmpAdjustedBounds.right =
+ (int) (minimizeAmount * mDockedStackMinimizeThickness
+ + (1 - minimizeAmount) * getRawBounds().right);
+ mTmpAdjustedBounds.left = mTmpAdjustedBounds.right - width;
+ } else if (dockSide == DOCKED_RIGHT) {
+ mTmpAdjustedBounds.set(getRawBounds());
+ mTmpAdjustedBounds.left =
+ (int) (minimizeAmount * (getRawBounds().right - mDockedStackMinimizeThickness)
+ + (1 - minimizeAmount) * getRawBounds().left);
+ }
+ return true;
+ }
+
+ private boolean isMinimizedDockAndHomeStackResizable() {
+ return mDisplayContent.mDividerControllerLocked.isMinimizedDock()
+ && mDisplayContent.mDividerControllerLocked.isHomeStackResizable();
+ }
+
+ /**
+ * @return the distance in pixels how much the stack gets minimized from it's original size
+ */
+ int getMinimizeDistance() {
+ final int dockSide = getDockSide();
+ if (dockSide == DOCKED_INVALID) {
+ return 0;
+ }
+
+ if (dockSide == DOCKED_TOP) {
+ mWmService.getStableInsetsLocked(DEFAULT_DISPLAY, mTmpRect);
+ int topInset = mTmpRect.top;
+ return getRawBounds().bottom - topInset;
+ } else if (dockSide == DOCKED_LEFT || dockSide == DOCKED_RIGHT) {
+ return getRawBounds().width() - mDockedStackMinimizeThickness;
+ } else {
+ return 0;
+ }
+ }
+
+ /**
+ * Updates the adjustment depending on it's current state.
+ */
+ private void updateAdjustedBounds() {
+ boolean adjust = false;
+ if (mMinimizeAmount != 0f) {
+ adjust = adjustForMinimizedDockedStack(mMinimizeAmount);
+ } else if (mAdjustedForIme) {
+ adjust = adjustForIME(mImeWin);
+ }
+ if (!adjust) {
+ mTmpAdjustedBounds.setEmpty();
+ }
+ setAdjustedBounds(mTmpAdjustedBounds);
+
+ final boolean isImeTarget = (mWmService.getImeFocusStackLocked() == this);
+ if (mAdjustedForIme && adjust && !isImeTarget) {
+ final float alpha = Math.max(mAdjustImeAmount, mAdjustDividerAmount)
+ * IME_ADJUST_DIM_AMOUNT;
+ mWmService.setResizeDimLayer(true, getWindowingMode(), alpha);
+ }
+ }
+
+ void applyAdjustForImeIfNeeded(Task task) {
+ if (mMinimizeAmount != 0f || !mAdjustedForIme || mAdjustedBounds.isEmpty()) {
+ return;
+ }
+
+ final Rect insetBounds = mImeGoingAway ? getRawBounds() : mFullyAdjustedImeBounds;
+ task.alignToAdjustedBounds(mAdjustedBounds, insetBounds, getDockSide() == DOCKED_TOP);
+ mDisplayContent.setLayoutNeeded();
+ }
+
+
+ boolean isAdjustedForMinimizedDockedStack() {
+ return mMinimizeAmount != 0f;
+ }
+
+ /**
+ * @return {@code true} if we have a {@link Task} that is animating (currently only used for the
+ * recents animation); {@code false} otherwise.
+ */
+ boolean isTaskAnimating() {
+ for (int j = mChildren.size() - 1; j >= 0; j--) {
+ final Task task = mChildren.get(j);
+ if (task.isTaskAnimating()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ void dump(PrintWriter pw, String prefix, boolean dumpAll) {
+ pw.println(prefix + "mStackId=" + mStackId);
+ pw.println(prefix + "mDeferRemoval=" + mDeferRemoval);
+ pw.println(prefix + "mBounds=" + getRawBounds().toShortString());
+ if (mMinimizeAmount != 0f) {
+ pw.println(prefix + "mMinimizeAmount=" + mMinimizeAmount);
+ }
+ if (mAdjustedForIme) {
+ pw.println(prefix + "mAdjustedForIme=true");
+ pw.println(prefix + "mAdjustImeAmount=" + mAdjustImeAmount);
+ pw.println(prefix + "mAdjustDividerAmount=" + mAdjustDividerAmount);
+ }
+ if (!mAdjustedBounds.isEmpty()) {
+ pw.println(prefix + "mAdjustedBounds=" + mAdjustedBounds.toShortString());
+ }
+ for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) {
+ mChildren.get(taskNdx).dump(pw, prefix + " ", dumpAll);
+ }
+ if (!mExitingActivities.isEmpty()) {
+ pw.println();
+ pw.println(" Exiting application tokens:");
+ for (int i = mExitingActivities.size() - 1; i >= 0; i--) {
+ WindowToken token = mExitingActivities.get(i);
+ pw.print(" Exiting App #"); pw.print(i);
+ pw.print(' '); pw.print(token);
+ pw.println(':');
+ token.dump(pw, " ", dumpAll);
+ }
+ }
+ mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix);
+ }
+
+ @Override
+ boolean fillsParent() {
+ return matchParentBounds();
+ }
+
+ String getName() {
+ return toShortString();
+ }
+
+ public String toShortString() {
+ return "Stack=" + mStackId;
+ }
+
+ /**
+ * For docked workspace (or workspace that's side-by-side to the docked), provides
+ * information which side of the screen was the dock anchored.
+ */
+ int getDockSide() {
+ return getDockSide(mDisplayContent.getConfiguration(), getRawBounds());
+ }
+
+ int getDockSideForDisplay(DisplayContent dc) {
+ return getDockSide(dc, dc.getConfiguration(), getRawBounds());
+ }
+
+ int getDockSide(Configuration parentConfig, Rect bounds) {
+ if (mDisplayContent == null) {
+ return DOCKED_INVALID;
+ }
+ return getDockSide(mDisplayContent, parentConfig, bounds);
+ }
+
+ private int getDockSide(DisplayContent dc, Configuration parentConfig, Rect bounds) {
+ return dc.getDockedDividerController().getDockSide(bounds,
+ parentConfig.windowConfiguration.getBounds(),
+ parentConfig.orientation, parentConfig.windowConfiguration.getRotation());
+ }
+
+ boolean hasTaskForUser(int userId) {
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final Task task = mChildren.get(i);
+ if (task.mUserId == userId) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ void findTaskForResizePoint(int x, int y, int delta,
+ DisplayContent.TaskForResizePointSearchResult results) {
+ if (!getWindowConfiguration().canResizeTask()) {
+ results.searchDone = true;
+ return;
+ }
+
+ for (int i = mChildren.size() - 1; i >= 0; --i) {
+ final Task task = mChildren.get(i);
+ if (task.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {
+ results.searchDone = true;
+ return;
+ }
+
+ // We need to use the task's dim bounds (which is derived from the visible bounds of
+ // its apps windows) for any touch-related tests. Can't use the task's original
+ // bounds because it might be adjusted to fit the content frame. One example is when
+ // the task is put to top-left quadrant, the actual visible area would not start at
+ // (0,0) after it's adjusted for the status bar.
+ task.getDimBounds(mTmpRect);
+ mTmpRect.inset(-delta, -delta);
+ if (mTmpRect.contains(x, y)) {
+ mTmpRect.inset(delta, delta);
+
+ results.searchDone = true;
+
+ if (!mTmpRect.contains(x, y)) {
+ results.taskForResize = task;
+ return;
+ }
+ // User touched inside the task. No need to look further,
+ // focus transfer will be handled in ACTION_UP.
+ return;
+ }
+ }
+ }
+
+ void setTouchExcludeRegion(Task focusedTask, int delta, Region touchExcludeRegion,
+ Rect contentRect, Rect postExclude) {
+ for (int i = mChildren.size() - 1; i >= 0; --i) {
+ final Task task = mChildren.get(i);
+ ActivityRecord topVisibleActivity = task.getTopVisibleActivity();
+ if (topVisibleActivity == null || !topVisibleActivity.hasContentToDisplay()) {
+ continue;
+ }
+
+ /**
+ * Exclusion region is the region that TapDetector doesn't care about.
+ * Here we want to remove all non-focused tasks from the exclusion region.
+ * We also remove the outside touch area for resizing for all freeform
+ * tasks (including the focused).
+ *
+ * We save the focused task region once we find it, and add it back at the end.
+ *
+ * If the task is home stack and it is resizable in the minimized state, we want to
+ * exclude the docked stack from touch so we need the entire screen area and not just a
+ * small portion which the home stack currently is resized to.
+ */
+
+ if (task.isActivityTypeHome() && isMinimizedDockAndHomeStackResizable()) {
+ mDisplayContent.getBounds(mTmpRect);
+ } else {
+ task.getDimBounds(mTmpRect);
+ }
+
+ if (task == focusedTask) {
+ // Add the focused task rect back into the exclude region once we are done
+ // processing stacks.
+ postExclude.set(mTmpRect);
+ }
+
+ final boolean isFreeformed = task.inFreeformWindowingMode();
+ if (task != focusedTask || isFreeformed) {
+ if (isFreeformed) {
+ // If the task is freeformed, enlarge the area to account for outside
+ // touch area for resize.
+ mTmpRect.inset(-delta, -delta);
+ // Intersect with display content rect. If we have system decor (status bar/
+ // navigation bar), we want to exclude that from the tap detection.
+ // Otherwise, if the app is partially placed under some system button (eg.
+ // Recents, Home), pressing that button would cause a full series of
+ // unwanted transfer focus/resume/pause, before we could go home.
+ mTmpRect.intersect(contentRect);
+ }
+ touchExcludeRegion.op(mTmpRect, Region.Op.DIFFERENCE);
+ }
+ }
+ }
+
+ public boolean setPinnedStackSize(Rect stackBounds, Rect tempTaskBounds) {
+ // Hold the lock since this is called from the BoundsAnimator running on the UiThread
+ synchronized (mWmService.mGlobalLock) {
+ if (mCancelCurrentBoundsAnimation) {
+ return false;
+ }
+ }
+
+ try {
+ mWmService.mActivityTaskManager.resizePinnedStack(stackBounds, tempTaskBounds);
+ } catch (RemoteException e) {
+ // I don't believe you.
+ }
+ return true;
+ }
+
+ void onAllWindowsDrawn() {
+ if (!mBoundsAnimating && !mBoundsAnimatingRequested) {
+ return;
+ }
+
+ getDisplayContent().mBoundsAnimationController.onAllWindowsDrawn();
+ }
+
+ @Override // AnimatesBounds
+ public boolean onAnimationStart(boolean schedulePipModeChangedCallback, boolean forceUpdate,
+ @BoundsAnimationController.AnimationType int animationType) {
+ // Hold the lock since this is called from the BoundsAnimator running on the UiThread
+ synchronized (mWmService.mGlobalLock) {
+ if (!isAttached()) {
+ // Don't run the animation if the stack is already detached
+ return false;
+ }
+
+ if (animationType == BoundsAnimationController.BOUNDS) {
+ mBoundsAnimatingRequested = false;
+ mBoundsAnimating = true;
+ }
+ mAnimationType = animationType;
+
+ // If we are changing UI mode, as in the PiP to fullscreen
+ // transition, then we need to wait for the window to draw.
+ if (schedulePipModeChangedCallback) {
+ forAllWindows((w) -> {
+ w.mWinAnimator.resetDrawState();
+ }, false /* traverseTopToBottom */);
+ }
+ }
+
+ if (inPinnedWindowingMode()) {
+ try {
+ mWmService.mActivityTaskManager.notifyPinnedStackAnimationStarted();
+ } catch (RemoteException e) {
+ // I don't believe you...
+ }
+
+ if ((schedulePipModeChangedCallback || animationType == FADE_IN)) {
+ // We need to schedule the PiP mode change before the animation up. It is possible
+ // in this case for the animation down to not have been completed, so always
+ // force-schedule and update to the client to ensure that it is notified that it
+ // is no longer in picture-in-picture mode
+ updatePictureInPictureModeForPinnedStackAnimation(null, forceUpdate);
+ }
+ }
+ return true;
+ }
+
+ @Override // AnimatesBounds
+ public void onAnimationEnd(boolean schedulePipModeChangedCallback, Rect finalStackSize,
+ boolean moveToFullscreen) {
+ synchronized (mWmService.mGlobalLock) {
+ if (inPinnedWindowingMode()) {
+ // Update to the final bounds if requested. This is done here instead of in the
+ // bounds animator to allow us to coordinate this after we notify the PiP mode
+ // changed
+
+ if (schedulePipModeChangedCallback) {
+ // We need to schedule the PiP mode change after the animation down, so use the
+ // final bounds
+ updatePictureInPictureModeForPinnedStackAnimation(mBoundsAnimationTarget,
+ false /* forceUpdate */);
+ }
+
+ if (mAnimationType == BoundsAnimationController.FADE_IN) {
+ setPinnedStackAlpha(1f);
+ mWmService.mAtmService.notifyPinnedStackAnimationEnded();
+ return;
+ }
+
+ if (finalStackSize != null && !mCancelCurrentBoundsAnimation) {
+ setPinnedStackSize(finalStackSize, null);
+ } else {
+ // We have been canceled, so the final stack size is null, still run the
+ // animation-end logic
+ onPipAnimationEndResize();
+ }
+
+ mWmService.mAtmService.notifyPinnedStackAnimationEnded();
+ if (moveToFullscreen) {
+ ((ActivityStack) this).dismissPip();
+ }
+ } else {
+ // No PiP animation, just run the normal animation-end logic
+ onPipAnimationEndResize();
+ }
+ }
+ }
+
+ /**
+ * Sets the current picture-in-picture aspect ratio.
+ */
+ void setPictureInPictureAspectRatio(float aspectRatio) {
+ if (!mWmService.mAtmService.mSupportsPictureInPicture) {
+ return;
+ }
+
+ final DisplayContent displayContent = getDisplayContent();
+ if (displayContent == null) {
+ return;
+ }
+
+ if (!inPinnedWindowingMode()) {
+ return;
+ }
+
+ final PinnedStackController pinnedStackController =
+ getDisplayContent().getPinnedStackController();
+
+ if (Float.compare(aspectRatio, pinnedStackController.getAspectRatio()) == 0) {
+ return;
+ }
+
+ // Notify the pinned stack controller about aspect ratio change.
+ // This would result a callback delivered from SystemUI to WM to start animation,
+ // if the bounds are ought to be altered due to aspect ratio change.
+ pinnedStackController.setAspectRatio(
+ pinnedStackController.isValidPictureInPictureAspectRatio(aspectRatio)
+ ? aspectRatio : -1f);
+ }
+
+ /**
+ * Sets the current picture-in-picture actions.
+ */
+ void setPictureInPictureActions(List<RemoteAction> actions) {
+ if (!mWmService.mAtmService.mSupportsPictureInPicture) {
+ return;
+ }
+
+ if (!inPinnedWindowingMode()) {
+ return;
+ }
+
+ getDisplayContent().getPinnedStackController().setActions(actions);
+ }
+
+ /** Called immediately prior to resizing the tasks at the end of the pinned stack animation. */
+ void onPipAnimationEndResize() {
+ mBoundsAnimating = false;
+ for (int i = 0; i < mChildren.size(); i++) {
+ final Task t = mChildren.get(i);
+ t.clearPreserveNonFloatingState();
+ }
+ mWmService.requestTraversal();
+ }
+
+ @Override
+ public boolean shouldDeferStartOnMoveToFullscreen() {
+ synchronized (mWmService.mGlobalLock) {
+ if (!isAttached()) {
+ // Unnecessary to pause the animation because the stack is detached.
+ return false;
+ }
+
+ // Workaround for the recents animation -- normally we need to wait for the new activity
+ // to show before starting the PiP animation, but because we start and show the home
+ // activity early for the recents animation prior to the PiP animation starting, there
+ // is no subsequent all-drawn signal. In this case, we can skip the pause when the home
+ // stack is already visible and drawn.
+ final ActivityStack homeStack = mDisplayContent.getHomeStack();
+ if (homeStack == null) {
+ return true;
+ }
+ final Task homeTask = homeStack.getTopChild();
+ if (homeTask == null) {
+ return true;
+ }
+ final ActivityRecord homeApp = homeTask.getTopVisibleActivity();
+ if (!homeTask.isVisible() || homeApp == null) {
+ return true;
+ }
+ return !homeApp.allDrawn;
+ }
+ }
+
+ /**
+ * @return True if we are currently animating the pinned stack from fullscreen to non-fullscreen
+ * bounds and we have a deferred PiP mode changed callback set with the animation.
+ */
+ public boolean deferScheduleMultiWindowModeChanged() {
+ if (inPinnedWindowingMode()) {
+ // For the pinned stack, the deferring of the multi-window mode changed is tied to the
+ // transition animation into picture-in-picture, and is called once the animation
+ // completes, or is interrupted in a way that would leave the stack in a non-fullscreen
+ // state.
+ // @see BoundsAnimationController
+ // @see BoundsAnimationControllerTests
+ return (mBoundsAnimatingRequested || mBoundsAnimating);
+ }
+ return false;
+ }
+
+ public boolean isForceScaled() {
+ return mBoundsAnimating;
+ }
+
+ public boolean isAnimatingBounds() {
+ return mBoundsAnimating;
+ }
+
+ public boolean lastAnimatingBoundsWasToFullscreen() {
+ return mBoundsAnimatingToFullscreen;
+ }
+
+ public boolean isAnimatingBoundsToFullscreen() {
+ return isAnimatingBounds() && lastAnimatingBoundsWasToFullscreen();
+ }
+
+ public boolean pinnedStackResizeDisallowed() {
+ if (mBoundsAnimating && mCancelCurrentBoundsAnimation) {
+ return true;
+ }
+ return false;
+ }
+
+ /** Returns true if a removal action is still being deferred. */
+ boolean checkCompleteDeferredRemoval() {
+ if (isAnimating(TRANSITION | CHILDREN)) {
+ return true;
+ }
+ if (mDeferRemoval) {
+ removeImmediately();
+ }
+
+ return super.checkCompleteDeferredRemoval();
+ }
+
+ @Override
+ int getOrientation() {
+ return (canSpecifyOrientation()) ? super.getOrientation() : SCREEN_ORIENTATION_UNSET;
+ }
+
+ private boolean canSpecifyOrientation() {
+ final int windowingMode = getWindowingMode();
+ final int activityType = getActivityType();
+ return windowingMode == WINDOWING_MODE_FULLSCREEN
+ || activityType == ACTIVITY_TYPE_HOME
+ || activityType == ACTIVITY_TYPE_RECENTS
+ || activityType == ACTIVITY_TYPE_ASSISTANT;
+ }
+
+ @Override
+ Dimmer getDimmer() {
+ return mDimmer;
+ }
+
+ @Override
+ void prepareSurfaces() {
+ mDimmer.resetDimStates();
+ super.prepareSurfaces();
+ getDimBounds(mTmpDimBoundsRect);
+
+ // Bounds need to be relative, as the dim layer is a child.
+ mTmpDimBoundsRect.offsetTo(0, 0);
+ if (mDimmer.updateDims(getPendingTransaction(), mTmpDimBoundsRect)) {
+ scheduleAnimation();
+ }
+ }
+
+ @Override
+ public boolean setPinnedStackAlpha(float alpha) {
+ // Hold the lock since this is called from the BoundsAnimator running on the UiThread
+ synchronized (mWmService.mGlobalLock) {
+ final SurfaceControl sc = getSurfaceControl();
+ if (sc == null || !sc.isValid()) {
+ // If the stack is already removed, don't bother updating any stack animation
+ return false;
+ }
+ getPendingTransaction().setAlpha(sc, mCancelCurrentBoundsAnimation ? 1 : alpha);
+ scheduleAnimation();
+ return !mCancelCurrentBoundsAnimation;
+ }
+ }
+
+ public DisplayInfo getDisplayInfo() {
+ return mDisplayContent.getDisplayInfo();
+ }
+
+ void dim(float alpha) {
+ mDimmer.dimAbove(getPendingTransaction(), alpha);
+ scheduleAnimation();
+ }
+
+ void stopDimming() {
+ mDimmer.stopDim(getPendingTransaction());
+ scheduleAnimation();
+ }
+
+ AnimatingActivityRegistry getAnimatingActivityRegistry() {
+ return mAnimatingActivityRegistry;
+ }
+
+ @Override
+ void getAnimationFrames(Rect outFrame, Rect outInsets, Rect outStableInsets,
+ Rect outSurfaceInsets) {
+ final Task task = getTopChild();
+ if (task != null) {
+ task.getAnimationFrames(outFrame, outInsets, outStableInsets, outSurfaceInsets);
+ } else {
+ super.getAnimationFrames(outFrame, outInsets, outStableInsets, outSurfaceInsets);
+ }
+ }
+
+ @Override
+ RemoteAnimationTarget createRemoteAnimationTarget(
+ RemoteAnimationController.RemoteAnimationRecord record) {
+ final Task task = getTopChild();
+ return task != null ? task.createRemoteAnimationTarget(record) : null;
+ }
+
@Override
public String toString() {
return "ActivityStack{" + Integer.toHexString(System.identityHashCode(this))
@@ -4780,10 +6488,10 @@
@WindowTraceLogLevel int logLevel) {
final long token = proto.start(fieldId);
writeToProtoInnerStackOnly(proto, STACK, logLevel);
- proto.write(ID, mStackId);
+ proto.write(com.android.server.am.ActivityStackProto.ID, mStackId);
for (int taskNdx = getChildCount() - 1; taskNdx >= 0; --taskNdx) {
final Task task = getChildAt(taskNdx);
- task.writeToProto(proto, TASKS, logLevel);
+ task.writeToProto(proto, com.android.server.am.ActivityStackProto.TASKS, logLevel);
}
if (mResumedActivity != null) {
mResumedActivity.writeIdentifierToProto(proto, RESUMED_ACTIVITY);
@@ -4791,11 +6499,36 @@
proto.write(DISPLAY_ID, mDisplayId);
if (!matchParentBounds()) {
final Rect bounds = getRequestedOverrideBounds();
- bounds.writeToProto(proto, BOUNDS);
+ bounds.writeToProto(proto, com.android.server.am.ActivityStackProto.BOUNDS);
}
// TODO: Remove, no longer needed with windowingMode.
proto.write(FULLSCREEN, matchParentBounds());
proto.end(token);
}
+
+ // TODO(proto-merge): Remove once protos for ActivityStack and TaskStack are merged.
+ void writeToProtoInnerStackOnly(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
+ final long token = proto.start(fieldId);
+ super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
+ proto.write(StackProto.ID, mStackId);
+ for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) {
+ mChildren.get(taskNdx).writeToProtoInnerTaskOnly(proto, StackProto.TASKS, logLevel);
+ }
+ proto.write(FILLS_PARENT, matchParentBounds());
+ getRawBounds().writeToProto(proto, StackProto.BOUNDS);
+ proto.write(DEFER_REMOVAL, mDeferRemoval);
+ proto.write(MINIMIZE_AMOUNT, mMinimizeAmount);
+ proto.write(ADJUSTED_FOR_IME, mAdjustedForIme);
+ proto.write(ADJUST_IME_AMOUNT, mAdjustImeAmount);
+ proto.write(ADJUST_DIVIDER_AMOUNT, mAdjustDividerAmount);
+ mAdjustedBounds.writeToProto(proto, ADJUSTED_BOUNDS);
+ proto.write(ANIMATING_BOUNDS, mBoundsAnimating);
+ proto.end(token);
+ }
}
diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index 79fae06..016654f 100644
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -913,7 +913,7 @@
}
r.launchFailed = false;
- if (stack.updateLRUListLocked(r)) {
+ if (stack.updateLruList(r)) {
Slog.w(TAG, "Activity " + r + " being launched, but already in LRU list");
}
@@ -1709,15 +1709,6 @@
return;
}
- // It is possible for the bounds animation from the WM to call this but be delayed by
- // another AM call that is holding the AMS lock. In such a case, the pinnedBounds may be
- // incorrect if AMS.resizeStackWithBoundsFromWindowManager() is already called while waiting
- // for the AMS lock to be freed. So check and make sure these bounds are still good.
- // TODO(stack-merge): Is this still relevant?
- if (stack.pinnedStackResizeDisallowed()) {
- return;
- }
-
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "resizePinnedStack");
mService.deferWindowLayout();
try {
diff --git a/services/core/java/com/android/server/wm/ActivityStartController.java b/services/core/java/com/android/server/wm/ActivityStartController.java
index 3c79c32..d3fd450 100644
--- a/services/core/java/com/android/server/wm/ActivityStartController.java
+++ b/services/core/java/com/android/server/wm/ActivityStartController.java
@@ -182,9 +182,17 @@
final ActivityDisplay display =
mService.mRootActivityContainer.getActivityDisplay(displayId);
- // Make sure home stack exist on display.
- final ActivityStack homeStack =
- display.getOrCreateStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
+ // The home activity will be started later, defer resuming to avoid unneccerary operations
+ // (e.g. start home recursively) when creating home stack.
+ mSupervisor.beginDeferResume();
+ final ActivityStack homeStack;
+ try {
+ // Make sure home stack exist on display.
+ homeStack = display.getOrCreateStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME,
+ ON_TOP);
+ } finally {
+ mSupervisor.endDeferResume();
+ }
mLastHomeActivityStartResult = obtainStarter(intent, "startHomeActivity: " + reason)
.setOutActivity(tmpOutRecord)
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 3ef848c..79c76b9 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -3243,7 +3243,7 @@
private void sanitizeAndApplyConfigChange(ConfigurationContainer container,
WindowContainerTransaction.Change change) {
- if (!(container instanceof Task)) {
+ if (!(container instanceof Task || container instanceof ActivityStack)) {
throw new RuntimeException("Invalid token in task transaction");
}
// The "client"-facing API should prevent bad changes; however, just in case, sanitize
diff --git a/services/core/java/com/android/server/wm/CircularDisplayMask.java b/services/core/java/com/android/server/wm/CircularDisplayMask.java
deleted file mode 100644
index b73b481..0000000
--- a/services/core/java/com/android/server/wm/CircularDisplayMask.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.wm;
-
-
-import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
-import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
-
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Point;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.util.Slog;
-import android.view.Display;
-import android.view.Surface;
-import android.view.Surface.OutOfResourcesException;
-import android.view.SurfaceControl;
-
-import java.util.function.Supplier;
-
-class CircularDisplayMask {
- private static final String TAG = TAG_WITH_CLASS_NAME ? "CircularDisplayMask" : TAG_WM;
-
- // size of the chin
- private int mScreenOffset = 0;
- // Display dimensions
- private Point mScreenSize;
-
- private final SurfaceControl mSurfaceControl;
- private final Surface mSurface;
- private int mLastDW;
- private int mLastDH;
- private boolean mDrawNeeded;
- private Paint mPaint;
- private int mRotation;
- private boolean mVisible;
- private boolean mDimensionsUnequal = false;
- private int mMaskThickness;
-
- CircularDisplayMask(Supplier<Surface> surfaceFactory, DisplayContent dc, int zOrder,
- int screenOffset, int maskThickness, SurfaceControl.Transaction t) {
- final Display display = dc.getDisplay();
- mSurface = surfaceFactory.get();
- mScreenSize = new Point();
- display.getSize(mScreenSize);
- if (mScreenSize.x != mScreenSize.y + screenOffset) {
- Slog.w(TAG, "Screen dimensions of displayId = " + display.getDisplayId() +
- "are not equal, circularMask will not be drawn.");
- mDimensionsUnequal = true;
- }
-
- SurfaceControl ctrl = null;
- try {
- ctrl = dc.makeOverlay()
- .setName("CircularDisplayMask")
- .setBufferSize(mScreenSize.x, mScreenSize.y) // not a typo
- .setFormat(PixelFormat.TRANSLUCENT)
- .build();
-
- t.setLayerStack(ctrl, display.getLayerStack());
- t.setLayer(ctrl, zOrder);
- t.setPosition(ctrl, 0, 0);
- t.show(ctrl);
- mSurface.copyFrom(ctrl);
- } catch (OutOfResourcesException e) {
- }
- mSurfaceControl = ctrl;
- mDrawNeeded = true;
- mPaint = new Paint();
- mPaint.setAntiAlias(true);
- mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
- mScreenOffset = screenOffset;
- mMaskThickness = maskThickness;
- }
-
- private void drawIfNeeded(SurfaceControl.Transaction t) {
- if (!mDrawNeeded || !mVisible || mDimensionsUnequal) {
- return;
- }
- mDrawNeeded = false;
-
- Rect dirty = new Rect(0, 0, mScreenSize.x, mScreenSize.y);
- Canvas c = null;
- try {
- c = mSurface.lockCanvas(dirty);
- } catch (IllegalArgumentException e) {
- } catch (Surface.OutOfResourcesException e) {
- }
- if (c == null) {
- return;
- }
- switch (mRotation) {
- case Surface.ROTATION_0:
- case Surface.ROTATION_90:
- // chin bottom or right
- t.setPosition(mSurfaceControl, 0, 0);
- break;
- case Surface.ROTATION_180:
- // chin top
- t.setPosition(mSurfaceControl, 0, -mScreenOffset);
- break;
- case Surface.ROTATION_270:
- // chin left
- t.setPosition(mSurfaceControl, -mScreenOffset, 0);
- break;
- }
-
- int circleRadius = mScreenSize.x / 2;
- c.drawColor(Color.BLACK);
-
- // The radius is reduced by mMaskThickness to provide an anti aliasing effect on the
- // display edges.
- c.drawCircle(circleRadius, circleRadius, circleRadius - mMaskThickness, mPaint);
- mSurface.unlockCanvasAndPost(c);
- }
-
- // Note: caller responsible for being inside
- // Surface.openTransaction() / closeTransaction()
- public void setVisibility(boolean on, SurfaceControl.Transaction t) {
- if (mSurfaceControl == null) {
- return;
- }
- mVisible = on;
- drawIfNeeded(t);
- if (on) {
- t.show(mSurfaceControl);
- } else {
- t.hide(mSurfaceControl);
- }
- }
-
- void positionSurface(int dw, int dh, int rotation, SurfaceControl.Transaction t) {
- if (mLastDW == dw && mLastDH == dh && mRotation == rotation) {
- return;
- }
- mLastDW = dw;
- mLastDH = dh;
- mDrawNeeded = true;
- mRotation = rotation;
- drawIfNeeded(t);
- }
-
-}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 7cca08f..b4dd55d 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -556,9 +556,9 @@
// Last systemUiVisibility we dispatched to windows.
private int mLastDispatchedSystemUiVisibility = 0;
- private final ArrayList<TaskStack> mTmpAlwaysOnTopStacks = new ArrayList<>();
- private final ArrayList<TaskStack> mTmpNormalStacks = new ArrayList<>();
- private final ArrayList<TaskStack> mTmpHomeStacks = new ArrayList<>();
+ private final ArrayList<ActivityStack> mTmpAlwaysOnTopStacks = new ArrayList<>();
+ private final ArrayList<ActivityStack> mTmpNormalStacks = new ArrayList<>();
+ private final ArrayList<ActivityStack> mTmpHomeStacks = new ArrayList<>();
/** Corner radius that windows should have in order to match the display. */
private final float mWindowCornerRadius;
@@ -1173,6 +1173,9 @@
if (!isReady() || mActivityDisplay == null) {
return;
}
+ if (mDisplayRotation.isWaitingForRemoteRotation()) {
+ return;
+ }
final boolean configUpdated = mActivityDisplay.updateDisplayOverrideConfigurationLocked();
if (configUpdated) {
return;
@@ -1798,15 +1801,15 @@
return (mDisplay.getFlags() & FLAG_PRIVATE) != 0;
}
- TaskStack getHomeStack() {
+ ActivityStack getHomeStack() {
return mTaskStackContainers.getHomeStack();
}
/**
* @return The primary split-screen stack, but only if it is visible, and {@code null} otherwise.
*/
- TaskStack getSplitScreenPrimaryStack() {
- TaskStack stack = mTaskStackContainers.getSplitScreenPrimaryStack();
+ ActivityStack getSplitScreenPrimaryStack() {
+ ActivityStack stack = mTaskStackContainers.getSplitScreenPrimaryStack();
return (stack != null && stack.isVisible()) ? stack : null;
}
@@ -1818,11 +1821,11 @@
* Like {@link #getSplitScreenPrimaryStack}, but also returns the stack if it's currently
* not visible.
*/
- TaskStack getSplitScreenPrimaryStackIgnoringVisibility() {
+ ActivityStack getSplitScreenPrimaryStackIgnoringVisibility() {
return mTaskStackContainers.getSplitScreenPrimaryStack();
}
- TaskStack getPinnedStack() {
+ ActivityStack getPinnedStack() {
return mTaskStackContainers.getPinnedStack();
}
@@ -1834,7 +1837,7 @@
* Returns the topmost stack on the display that is compatible with the input windowing mode.
* Null is no compatible stack on the display.
*/
- TaskStack getTopStackInWindowingMode(int windowingMode) {
+ ActivityStack getTopStackInWindowingMode(int windowingMode) {
return getStack(windowingMode, ACTIVITY_TYPE_UNDEFINED);
}
@@ -1842,17 +1845,17 @@
* Returns the topmost stack on the display that is compatible with the input windowing mode and
* activity type. Null is no compatible stack on the display.
*/
- TaskStack getStack(int windowingMode, int activityType) {
+ ActivityStack getStack(int windowingMode, int activityType) {
return mTaskStackContainers.getStack(windowingMode, activityType);
}
@VisibleForTesting
- WindowList<TaskStack> getStacks() {
+ WindowList<ActivityStack> getStacks() {
return mTaskStackContainers.mChildren;
}
@VisibleForTesting
- TaskStack getTopStack() {
+ ActivityStack getTopStack() {
return mTaskStackContainers.getTopStack();
}
@@ -1860,7 +1863,7 @@
return mTaskStackContainers.getVisibleTasks();
}
- void onStackWindowingModeChanged(TaskStack stack) {
+ void onStackWindowingModeChanged(ActivityStack stack) {
mTaskStackContainers.onStackWindowingModeChanged(stack);
}
@@ -2204,17 +2207,17 @@
out.set(mDisplayFrames.mStable);
}
- void setStackOnDisplay(TaskStack stack, int position) {
+ void setStackOnDisplay(ActivityStack stack, int position) {
if (DEBUG_STACK) Slog.d(TAG_WM, "Set stack=" + stack + " on displayId=" + mDisplayId);
mTaskStackContainers.addChild(stack, position);
}
- void moveStackToDisplay(TaskStack stack, boolean onTop) {
+ void moveStackToDisplay(ActivityStack stack, boolean onTop) {
stack.reparent(mTaskStackContainers, onTop ? POSITION_TOP: POSITION_BOTTOM);
}
// TODO(display-unify): No longer needed then.
- void removeStackFromDisplay(TaskStack stack) {
+ void removeStackFromDisplay(ActivityStack stack) {
mTaskStackContainers.removeChild(stack);
}
@@ -2247,7 +2250,7 @@
getParent().positionChildAt(position, this, includingParents);
}
- void positionStackAt(int position, TaskStack child, boolean includingParents) {
+ void positionStackAt(int position, ActivityStack child, boolean includingParents) {
mTaskStackContainers.positionChildAt(position, child, includingParents);
layoutAndAssignWindowLayersIfNeeded();
}
@@ -2257,7 +2260,7 @@
*/
boolean pointWithinAppWindow(int x, int y) {
final int[] targetWindowType = {-1};
- final Consumer fn = PooledLambda.obtainConsumer((w, nonArg) -> {
+ final PooledConsumer fn = PooledLambda.obtainConsumer((w, nonArg) -> {
if (targetWindowType[0] != -1) {
return;
}
@@ -2268,7 +2271,7 @@
}
}, PooledLambda.__(WindowState.class), mTmpRect);
forAllWindows(fn, true /* traverseTopToBottom */);
- ((PooledConsumer) fn).recycle();
+ fn.recycle();
return FIRST_APPLICATION_WINDOW <= targetWindowType[0]
&& targetWindowType[0] <= LAST_APPLICATION_WINDOW;
}
@@ -2281,7 +2284,7 @@
final int delta = dipToPixel(RESIZE_HANDLE_WIDTH_IN_DP, mDisplayMetrics);
mTmpTaskForResizePointSearchResult.reset();
for (int stackNdx = mTaskStackContainers.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
- final TaskStack stack = mTaskStackContainers.getChildAt(stackNdx);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(stackNdx);
if (!stack.getWindowConfiguration().canResizeTask()) {
return null;
}
@@ -2304,7 +2307,7 @@
mTmpRect2.setEmpty();
for (int stackNdx = mTaskStackContainers.getChildCount() - 1; stackNdx >= 0;
--stackNdx) {
- final TaskStack stack = mTaskStackContainers.getChildAt(stackNdx);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(stackNdx);
stack.setTouchExcludeRegion(focusedTask, delta, mTouchExcludeRegion,
mDisplayFrames.mContent, mTmpRect2);
}
@@ -2391,6 +2394,7 @@
mWindowingLayer.release();
mOverlayLayer.release();
mInputMonitor.onDisplayRemoved();
+ mWmService.mDisplayNotificationController.dispatchDisplayRemoved(mActivityDisplay);
} finally {
mDisplayReady = false;
mRemovingDisplay = false;
@@ -2433,7 +2437,7 @@
boolean updated = false;
for (int i = mTaskStackContainers.getChildCount() - 1; i >= 0; --i) {
- final TaskStack stack = mTaskStackContainers.getChildAt(i);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(i);
if (stack == null || !stack.isAdjustedForIme()) {
continue;
}
@@ -2462,7 +2466,7 @@
boolean clearImeAdjustAnimation() {
boolean changed = false;
for (int i = mTaskStackContainers.getChildCount() - 1; i >= 0; --i) {
- final TaskStack stack = mTaskStackContainers.getChildAt(i);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(i);
if (stack != null && stack.isAdjustedForIme()) {
stack.resetAdjustedForIme(true /* adjustBoundsNow */);
changed = true;
@@ -2473,7 +2477,7 @@
void beginImeAdjustAnimation() {
for (int i = mTaskStackContainers.getChildCount() - 1; i >= 0; --i) {
- final TaskStack stack = mTaskStackContainers.getChildAt(i);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(i);
if (stack.isVisible() && stack.isAdjustedForIme()) {
stack.beginImeAdjustAnimation();
}
@@ -2484,10 +2488,10 @@
final WindowState imeWin = mInputMethodWindow;
final boolean imeVisible = imeWin != null && imeWin.isVisibleLw() && imeWin.isDisplayedLw()
&& !mDividerControllerLocked.isImeHideRequested();
- final TaskStack dockedStack = getSplitScreenPrimaryStack();
+ final ActivityStack dockedStack = getSplitScreenPrimaryStack();
final boolean dockVisible = dockedStack != null;
final Task topDockedTask = dockVisible ? dockedStack.getTopChild() : null;
- final TaskStack imeTargetStack = mWmService.getImeFocusStackLocked();
+ final ActivityStack imeTargetStack = mWmService.getImeFocusStackLocked();
final int imeDockSide = (dockVisible && imeTargetStack != null) ?
imeTargetStack.getDockSide() : DOCKED_INVALID;
final boolean imeOnTop = (imeDockSide == DOCKED_TOP);
@@ -2511,7 +2515,7 @@
if (imeVisible && dockVisible && (imeOnTop || imeOnBottom) && !dockMinimized) {
for (int i = mTaskStackContainers.getChildCount() - 1; i >= 0; --i) {
- final TaskStack stack = mTaskStackContainers.getChildAt(i);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(i);
final boolean isDockedOnBottom = stack.getDockSide() == DOCKED_BOTTOM;
if (stack.isVisible() && (imeOnBottom || isDockedOnBottom)
&& stack.inSplitScreenWindowingMode()) {
@@ -2524,7 +2528,7 @@
imeOnBottom /*ime*/, true /*divider*/, true /*animate*/, imeWin, imeHeight);
} else {
for (int i = mTaskStackContainers.getChildCount() - 1; i >= 0; --i) {
- final TaskStack stack = mTaskStackContainers.getChildAt(i);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(i);
stack.resetAdjustedForIme(!dockVisible);
}
mDividerControllerLocked.setAdjustedForIme(
@@ -2535,7 +2539,7 @@
void prepareFreezingTaskBounds() {
for (int stackNdx = mTaskStackContainers.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
- final TaskStack stack = mTaskStackContainers.getChildAt(stackNdx);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(stackNdx);
stack.prepareFreezingTaskBounds();
}
}
@@ -2616,7 +2620,7 @@
super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
proto.write(ID, mDisplayId);
for (int stackNdx = mTaskStackContainers.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
- final TaskStack stack = mTaskStackContainers.getChildAt(stackNdx);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(stackNdx);
stack.writeToProtoInnerStackOnly(proto, STACKS, logLevel);
}
mDividerControllerLocked.writeToProto(proto, DOCKED_STACK_DIVIDER_CONTROLLER);
@@ -2731,7 +2735,7 @@
pw.println();
pw.println(prefix + "Application tokens in top down Z order:");
for (int stackNdx = mTaskStackContainers.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
- final TaskStack stack = mTaskStackContainers.getChildAt(stackNdx);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(stackNdx);
stack.dump(pw, prefix + " ", dumpAll);
}
@@ -2761,15 +2765,15 @@
pw.println();
// Dump stack references
- final TaskStack homeStack = getHomeStack();
+ final ActivityStack homeStack = getHomeStack();
if (homeStack != null) {
pw.println(prefix + "homeStack=" + homeStack.getName());
}
- final TaskStack pinnedStack = getPinnedStack();
+ final ActivityStack pinnedStack = getPinnedStack();
if (pinnedStack != null) {
pw.println(prefix + "pinnedStack=" + pinnedStack.getName());
}
- final TaskStack splitScreenPrimaryStack = getSplitScreenPrimaryStack();
+ final ActivityStack splitScreenPrimaryStack = getSplitScreenPrimaryStack();
if (splitScreenPrimaryStack != null) {
pw.println(prefix + "splitScreenPrimaryStack=" + splitScreenPrimaryStack.getName());
}
@@ -2802,7 +2806,7 @@
/** Returns true if the stack in the windowing mode is visible. */
boolean isStackVisible(int windowingMode) {
- final TaskStack stack = getTopStackInWindowingMode(windowingMode);
+ final ActivityStack stack = getTopStackInWindowingMode(windowingMode);
return stack != null && stack.isVisible();
}
@@ -3907,7 +3911,7 @@
* Window container class that contains all containers on this display relating to Apps.
* I.e Activities.
*/
- private final class TaskStackContainers extends DisplayChildWindowContainer<TaskStack> {
+ private final class TaskStackContainers extends DisplayChildWindowContainer<ActivityStack> {
/**
* A control placed at the appropriate level for transitions to occur.
*/
@@ -3932,9 +3936,9 @@
// Cached reference to some special stacks we tend to get a lot so we don't need to loop
// through the list to find them.
- private TaskStack mHomeStack = null;
- private TaskStack mPinnedStack = null;
- private TaskStack mSplitScreenPrimaryStack = null;
+ private ActivityStack mHomeStack = null;
+ private ActivityStack mPinnedStack = null;
+ private ActivityStack mSplitScreenPrimaryStack = null;
TaskStackContainers(WindowManagerService service) {
super(service);
@@ -3950,7 +3954,7 @@
* Returns the topmost stack on the display that is compatible with the input windowing mode
* and activity type. Null is no compatible stack on the display.
*/
- TaskStack getStack(int windowingMode, int activityType) {
+ ActivityStack getStack(int windowingMode, int activityType) {
if (activityType == ACTIVITY_TYPE_HOME) {
return mHomeStack;
}
@@ -3960,7 +3964,7 @@
return mSplitScreenPrimaryStack;
}
for (int i = mTaskStackContainers.getChildCount() - 1; i >= 0; --i) {
- final TaskStack stack = mTaskStackContainers.getChildAt(i);
+ final ActivityStack stack = mTaskStackContainers.getChildAt(i);
if (activityType == ACTIVITY_TYPE_UNDEFINED
&& windowingMode == stack.getWindowingMode()) {
// Passing in undefined type means we want to match the topmost stack with the
@@ -3975,23 +3979,23 @@
}
@VisibleForTesting
- TaskStack getTopStack() {
+ ActivityStack getTopStack() {
return mTaskStackContainers.getChildCount() > 0
? mTaskStackContainers.getChildAt(mTaskStackContainers.getChildCount() - 1) : null;
}
- TaskStack getHomeStack() {
+ ActivityStack getHomeStack() {
if (mHomeStack == null && mDisplayId == DEFAULT_DISPLAY) {
Slog.e(TAG_WM, "getHomeStack: Returning null from this=" + this);
}
return mHomeStack;
}
- TaskStack getPinnedStack() {
+ ActivityStack getPinnedStack() {
return mPinnedStack;
}
- TaskStack getSplitScreenPrimaryStack() {
+ ActivityStack getSplitScreenPrimaryStack() {
return mSplitScreenPrimaryStack;
}
@@ -4005,7 +4009,7 @@
return visibleTasks;
}
- void onStackWindowingModeChanged(TaskStack stack) {
+ void onStackWindowingModeChanged(ActivityStack stack) {
removeStackReferenceIfNeeded(stack);
addStackReferenceIfNeeded(stack);
if (stack == mPinnedStack && getTopStack() != stack) {
@@ -4014,7 +4018,7 @@
}
}
- private void addStackReferenceIfNeeded(TaskStack stack) {
+ private void addStackReferenceIfNeeded(ActivityStack stack) {
if (stack.isActivityTypeHome()) {
if (mHomeStack != null) {
throw new IllegalArgumentException("addStackReferenceIfNeeded: home stack="
@@ -4042,7 +4046,7 @@
}
}
- private void removeStackReferenceIfNeeded(TaskStack stack) {
+ private void removeStackReferenceIfNeeded(ActivityStack stack) {
if (stack == mHomeStack) {
mHomeStack = null;
} else if (stack == mPinnedStack) {
@@ -4057,14 +4061,13 @@
}
@Override
- void addChild(TaskStack stack, int position) {
+ void addChild(ActivityStack stack, int position) {
addStackReferenceIfNeeded(stack);
position = findPositionForStack(position, stack, true /* adding */);
super.addChild(stack, position);
if (mActivityDisplay != null) {
- // TODO(stack-merge): Remove cast.
- mActivityDisplay.addChild((ActivityStack) stack, position, true /*fromDc*/);
+ mActivityDisplay.addChild(stack, position, true /*fromDc*/);
}
// The reparenting case is handled in WindowContainer.
@@ -4075,11 +4078,10 @@
}
@Override
- protected void removeChild(TaskStack stack) {
+ protected void removeChild(ActivityStack stack) {
super.removeChild(stack);
if (mActivityDisplay != null) {
- // TODO(stack-merge): Remove cast.
- mActivityDisplay.onChildRemoved((ActivityStack) stack);
+ mActivityDisplay.onChildRemoved(stack);
}
removeStackReferenceIfNeeded(stack);
}
@@ -4091,7 +4093,7 @@
}
@Override
- void positionChildAt(int position, TaskStack child, boolean includingParents) {
+ void positionChildAt(int position, ActivityStack child, boolean includingParents) {
if (child.getWindowConfiguration().isAlwaysOnTop()
&& position != POSITION_TOP) {
// This stack is always-on-top, override the default behavior.
@@ -4130,7 +4132,8 @@
* @param adding Flag indicates whether we're adding a new stack or positioning an existing.
* @return The proper position for the stack.
*/
- private int findPositionForStack(int requestedPosition, TaskStack stack, boolean adding) {
+ private int findPositionForStack(int requestedPosition, ActivityStack stack,
+ boolean adding) {
if (stack.inPinnedWindowingMode()) {
return POSITION_TOP;
}
@@ -4312,7 +4315,7 @@
assignStackOrdering(t);
for (int i = 0; i < mChildren.size(); i++) {
- final TaskStack s = mChildren.get(i);
+ final ActivityStack s = mChildren.get(i);
s.assignChildLayers(t);
}
}
@@ -4325,7 +4328,7 @@
mTmpHomeStacks.clear();
mTmpNormalStacks.clear();
for (int i = 0; i < mChildren.size(); ++i) {
- final TaskStack s = mChildren.get(i);
+ final ActivityStack s = mChildren.get(i);
if (s.isAlwaysOnTop()) {
mTmpAlwaysOnTopStacks.add(s);
} else if (s.isActivityTypeHome()) {
@@ -4345,7 +4348,7 @@
int layerForSplitScreenDividerAnchor = layer++;
int layerForAnimationLayer = layer++;
for (int i = 0; i < mTmpNormalStacks.size(); i++) {
- final TaskStack s = mTmpNormalStacks.get(i);
+ final ActivityStack s = mTmpNormalStacks.get(i);
s.assignLayer(t, layer++);
if (s.inSplitScreenWindowingMode()) {
// The split screen divider anchor is located above the split screen window.
diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java
index dc6b491..6b47c8a 100644
--- a/services/core/java/com/android/server/wm/DisplayFrames.java
+++ b/services/core/java/com/android/server/wm/DisplayFrames.java
@@ -39,20 +39,11 @@
public final int mDisplayId;
/**
- * The current size of the screen; really; extends into the overscan area of the screen and
- * doesn't account for any system elements like the status bar.
- */
- public final Rect mOverscan = new Rect();
-
- /**
* The current visible size of the screen; really; (ir)regardless of whether the status bar can
* be hidden but not extending into the overscan area.
*/
public final Rect mUnrestricted = new Rect();
- /** Like mOverscan*, but allowed to move into the overscan region where appropriate. */
- public final Rect mRestrictedOverscan = new Rect();
-
/**
* The current size of the screen; these may be different than (0,0)-(dw,dh) if the status bar
* can't be hidden; in that case it effectively carves out that area of the display from all
@@ -109,8 +100,6 @@
*/
public final Rect mDisplayCutoutSafe = new Rect();
- private final Rect mDisplayInfoOverscan = new Rect();
- private final Rect mRotatedDisplayInfoOverscan = new Rect();
public int mDisplayWidth;
public int mDisplayHeight;
@@ -125,43 +114,13 @@
mDisplayWidth = info.logicalWidth;
mDisplayHeight = info.logicalHeight;
mRotation = info.rotation;
- mDisplayInfoOverscan.set(
- info.overscanLeft, info.overscanTop, info.overscanRight, info.overscanBottom);
mDisplayInfoCutout = displayCutout != null ? displayCutout : WmDisplayCutout.NO_CUTOUT;
}
public void onBeginLayout() {
- switch (mRotation) {
- case ROTATION_90:
- mRotatedDisplayInfoOverscan.left = mDisplayInfoOverscan.top;
- mRotatedDisplayInfoOverscan.top = mDisplayInfoOverscan.right;
- mRotatedDisplayInfoOverscan.right = mDisplayInfoOverscan.bottom;
- mRotatedDisplayInfoOverscan.bottom = mDisplayInfoOverscan.left;
- break;
- case ROTATION_180:
- mRotatedDisplayInfoOverscan.left = mDisplayInfoOverscan.right;
- mRotatedDisplayInfoOverscan.top = mDisplayInfoOverscan.bottom;
- mRotatedDisplayInfoOverscan.right = mDisplayInfoOverscan.left;
- mRotatedDisplayInfoOverscan.bottom = mDisplayInfoOverscan.top;
- break;
- case ROTATION_270:
- mRotatedDisplayInfoOverscan.left = mDisplayInfoOverscan.bottom;
- mRotatedDisplayInfoOverscan.top = mDisplayInfoOverscan.left;
- mRotatedDisplayInfoOverscan.right = mDisplayInfoOverscan.top;
- mRotatedDisplayInfoOverscan.bottom = mDisplayInfoOverscan.right;
- break;
- default:
- mRotatedDisplayInfoOverscan.set(mDisplayInfoOverscan);
- break;
- }
-
- mRestrictedOverscan.set(0, 0, mDisplayWidth, mDisplayHeight);
- mOverscan.set(mRestrictedOverscan);
- mSystem.set(mRestrictedOverscan);
- mUnrestricted.set(mRotatedDisplayInfoOverscan);
- mUnrestricted.right = mDisplayWidth - mUnrestricted.right;
- mUnrestricted.bottom = mDisplayHeight - mUnrestricted.bottom;
+ mUnrestricted.set(0, 0, mDisplayWidth, mDisplayHeight);
mRestricted.set(mUnrestricted);
+ mSystem.set(mUnrestricted);
mDock.set(mUnrestricted);
mContent.set(mUnrestricted);
mVoiceContent.set(mUnrestricted);
@@ -175,16 +134,16 @@
if (!mDisplayCutout.getDisplayCutout().isEmpty()) {
final DisplayCutout c = mDisplayCutout.getDisplayCutout();
if (c.getSafeInsetLeft() > 0) {
- mDisplayCutoutSafe.left = mRestrictedOverscan.left + c.getSafeInsetLeft();
+ mDisplayCutoutSafe.left = mUnrestricted.left + c.getSafeInsetLeft();
}
if (c.getSafeInsetTop() > 0) {
- mDisplayCutoutSafe.top = mRestrictedOverscan.top + c.getSafeInsetTop();
+ mDisplayCutoutSafe.top = mUnrestricted.top + c.getSafeInsetTop();
}
if (c.getSafeInsetRight() > 0) {
- mDisplayCutoutSafe.right = mRestrictedOverscan.right - c.getSafeInsetRight();
+ mDisplayCutoutSafe.right = mUnrestricted.right - c.getSafeInsetRight();
}
if (c.getSafeInsetBottom() > 0) {
- mDisplayCutoutSafe.bottom = mRestrictedOverscan.bottom - c.getSafeInsetBottom();
+ mDisplayCutoutSafe.bottom = mUnrestricted.bottom - c.getSafeInsetBottom();
}
}
}
@@ -210,12 +169,8 @@
dumpFrame(mSystem, "mSystem", myPrefix, pw);
dumpFrame(mContent, "mContent", myPrefix, pw);
dumpFrame(mVoiceContent, "mVoiceContent", myPrefix, pw);
- dumpFrame(mOverscan, "mOverscan", myPrefix, pw);
- dumpFrame(mRestrictedOverscan, "mRestrictedOverscan", myPrefix, pw);
dumpFrame(mRestricted, "mRestricted", myPrefix, pw);
dumpFrame(mUnrestricted, "mUnrestricted", myPrefix, pw);
- dumpFrame(mDisplayInfoOverscan, "mDisplayInfoOverscan", myPrefix, pw);
- dumpFrame(mRotatedDisplayInfoOverscan, "mRotatedDisplayInfoOverscan", myPrefix, pw);
pw.println(myPrefix + "mDisplayCutout=" + mDisplayCutout);
}
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 6a6b2517..f8c1ad9 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -163,7 +163,6 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.policy.ScreenDecorationsUtils;
-import com.android.internal.util.ScreenShapeHelper;
import com.android.internal.util.ScreenshotHelper;
import com.android.internal.util.function.TriConsumer;
import com.android.internal.view.AppearanceRegion;
@@ -294,9 +293,6 @@
private boolean mIsFreeformWindowOverlappingWithNavBar;
- /** Cached value of {@link ScreenShapeHelper#getWindowOutsetBottomPx} */
- @Px private int mWindowOutsetBottom;
-
private final StatusBarController mStatusBarController;
private final BarController mNavigationBarController;
@@ -1209,7 +1205,6 @@
* @param outContentInsets The areas covered by system windows, expressed as positive insets.
* @param outStableInsets The areas covered by stable system windows irrespective of their
* current visibility. Expressed as positive insets.
- * @param outOutsets The areas that are not real display, but we would like to treat as such.
* @param outDisplayCutout The area that has been cut away from the display.
* @return Whether to always consume the system bars.
* See {@link #areSystemBarsForcedShownLw(WindowState)}.
@@ -1217,28 +1212,11 @@
public boolean getLayoutHintLw(LayoutParams attrs, Rect taskBounds,
DisplayFrames displayFrames, boolean floatingStack, Rect outFrame,
Rect outContentInsets, Rect outStableInsets,
- Rect outOutsets, DisplayCutout.ParcelableWrapper outDisplayCutout) {
+ DisplayCutout.ParcelableWrapper outDisplayCutout) {
final int fl = PolicyControl.getWindowFlags(null, attrs);
final int pfl = attrs.privateFlags;
final int requestedSysUiVis = PolicyControl.getSystemUiVisibility(null, attrs);
final int sysUiVis = requestedSysUiVis | getImpliedSysUiFlagsForLayout(attrs);
- final int displayRotation = displayFrames.mRotation;
-
- final boolean useOutsets = outOutsets != null && shouldUseOutsets(attrs, fl);
- if (useOutsets) {
- int outset = mWindowOutsetBottom;
- if (outset > 0) {
- if (displayRotation == Surface.ROTATION_0) {
- outOutsets.bottom += outset;
- } else if (displayRotation == Surface.ROTATION_90) {
- outOutsets.right += outset;
- } else if (displayRotation == Surface.ROTATION_180) {
- outOutsets.top += outset;
- } else if (displayRotation == Surface.ROTATION_270) {
- outOutsets.left += outset;
- }
- }
- }
final boolean layoutInScreen = (fl & FLAG_LAYOUT_IN_SCREEN) != 0;
final boolean layoutInScreenAndInsetDecor = layoutInScreen
@@ -1268,8 +1246,8 @@
} else {
cf = displayFrames.mStable;
}
- } else if ((fl & FLAG_FULLSCREEN) != 0 || (fl & FLAG_LAYOUT_IN_OVERSCAN) != 0) {
- cf = displayFrames.mOverscan;
+ } else if ((fl & FLAG_FULLSCREEN) != 0) {
+ cf = displayFrames.mUnrestricted;
} else {
cf = displayFrames.mCurrent;
}
@@ -1312,11 +1290,6 @@
return impliedFlags;
}
- private static boolean shouldUseOutsets(WindowManager.LayoutParams attrs, int fl) {
- return attrs.type == TYPE_WALLPAPER || (fl & (WindowManager.LayoutParams.FLAG_FULLSCREEN
- | WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN)) != 0;
- }
-
private final Runnable mClearHideNavigationFlag = new Runnable() {
@Override
public void run() {
@@ -1482,11 +1455,9 @@
w.getWindowFrames().setFrames(displayFrames.mUnrestricted /* parentFrame */,
displayFrames.mUnrestricted /* displayFrame */,
- displayFrames.mUnrestricted /* overscanFrame */,
displayFrames.mUnrestricted /* contentFrame */,
displayFrames.mUnrestricted /* visibleFrame */, sTmpRect /* decorFrame */,
- displayFrames.mUnrestricted /* stableFrame */,
- displayFrames.mUnrestricted /* outsetFrame */);
+ displayFrames.mUnrestricted /* stableFrame */);
w.getWindowFrames().setDisplayCutout(displayFrames.mDisplayCutout);
w.computeFrameLw();
final Rect frame = w.getFrameLw();
@@ -1530,7 +1501,6 @@
displayFrames.mVoiceContent.set(dockFrame);
displayFrames.mSystem.set(dockFrame);
displayFrames.mContent.set(dockFrame);
- displayFrames.mRestrictedOverscan.set(dockFrame);
}
private boolean layoutStatusBar(DisplayFrames displayFrames, int sysui,
@@ -1544,9 +1514,9 @@
final WindowFrames windowFrames = mStatusBar.getWindowFrames();
windowFrames.setFrames(displayFrames.mUnrestricted /* parentFrame */,
displayFrames.mUnrestricted /* displayFrame */,
- displayFrames.mStable /* overscanFrame */, displayFrames.mStable /* contentFrame */,
+ displayFrames.mStable /* contentFrame */,
displayFrames.mStable /* visibleFrame */, sTmpRect /* decorFrame */,
- displayFrames.mStable /* stableFrame */, displayFrames.mStable /* outsetFrame */);
+ displayFrames.mStable /* stableFrame */);
windowFrames.setDisplayCutout(displayFrames.mDisplayCutout);
// Let the status bar determine its size.
@@ -1630,8 +1600,7 @@
mNavigationBarController.setBarShowingLw(true);
} else if (navVisible) {
mNavigationBarController.setBarShowingLw(true);
- dockFrame.bottom = displayFrames.mRestricted.bottom =
- displayFrames.mRestrictedOverscan.bottom = top;
+ dockFrame.bottom = displayFrames.mRestricted.bottom = top;
} else {
// We currently want to hide the navigation UI - unless we expanded the status bar.
mNavigationBarController.setBarShowingLw(statusBarForcesShowingNavigation);
@@ -1653,8 +1622,7 @@
mNavigationBarController.setBarShowingLw(true);
} else if (navVisible) {
mNavigationBarController.setBarShowingLw(true);
- dockFrame.right = displayFrames.mRestricted.right =
- displayFrames.mRestrictedOverscan.right = left;
+ dockFrame.right = displayFrames.mRestricted.right = left;
} else {
// We currently want to hide the navigation UI - unless we expanded the status bar.
mNavigationBarController.setBarShowingLw(statusBarForcesShowingNavigation);
@@ -1676,8 +1644,7 @@
mNavigationBarController.setBarShowingLw(true);
} else if (navVisible) {
mNavigationBarController.setBarShowingLw(true);
- dockFrame.left = displayFrames.mRestricted.left =
- displayFrames.mRestrictedOverscan.left = right;
+ dockFrame.left = displayFrames.mRestricted.left = right;
} else {
// We currently want to hide the navigation UI - unless we expanded the status bar.
mNavigationBarController.setBarShowingLw(statusBarForcesShowingNavigation);
@@ -1699,11 +1666,10 @@
// And compute the final frame.
sTmpRect.setEmpty();
mNavigationBar.getWindowFrames().setFrames(navigationFrame /* parentFrame */,
- navigationFrame /* displayFrame */, navigationFrame /* overscanFrame */,
+ navigationFrame /* displayFrame */,
displayFrames.mDisplayCutoutSafe /* contentFrame */,
navigationFrame /* visibleFrame */, sTmpRect /* decorFrame */,
- navigationFrame /* stableFrame */,
- displayFrames.mDisplayCutoutSafe /* outsetFrame */);
+ navigationFrame /* stableFrame */);
mNavigationBar.getWindowFrames().setDisplayCutout(displayFrames.mDisplayCutout);
mNavigationBar.computeFrameLw();
mNavigationBarController.setContentFrame(mNavigationBar.getContentFrameLw());
@@ -1713,7 +1679,7 @@
}
private void setAttachedWindowFrames(WindowState win, int fl, int adjust, WindowState attached,
- boolean insetDecors, Rect pf, Rect df, Rect of, Rect cf, Rect vf,
+ boolean insetDecors, Rect pf, Rect df, Rect cf, Rect vf,
DisplayFrames displayFrames) {
if (!win.isInputMethodTarget() && attached.isInputMethodTarget()) {
// Here's a special case: if the child window is not the 'dock window'
@@ -1725,29 +1691,25 @@
// compute the frames that would be appropriate without the dock.
vf.set(displayFrames.mDock);
cf.set(displayFrames.mDock);
- of.set(displayFrames.mDock);
df.set(displayFrames.mDock);
} else {
- // In case we forced the window to draw behind the navigation bar, restrict df/of to
- // DF.RestrictedOverscan to simulate old compat behavior.
+ // In case we forced the window to draw behind the navigation bar, restrict df to
+ // DF.Restricted to simulate old compat behavior.
Rect parentDisplayFrame = attached.getDisplayFrameLw();
- Rect parentOverscan = attached.getOverscanFrameLw();
final WindowManager.LayoutParams attachedAttrs = attached.mAttrs;
if ((attachedAttrs.privateFlags & PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS) != 0
&& (attachedAttrs.flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0
&& (attachedAttrs.systemUiVisibility
& SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0) {
- parentOverscan = new Rect(parentOverscan);
- parentOverscan.intersect(displayFrames.mRestrictedOverscan);
parentDisplayFrame = new Rect(parentDisplayFrame);
- parentDisplayFrame.intersect(displayFrames.mRestrictedOverscan);
+ parentDisplayFrame.intersect(displayFrames.mRestricted);
}
// The effective display frame of the attached window depends on whether it is taking
// care of insetting its content. If not, we need to use the parent's content frame so
// that the entire window is positioned within that content. Otherwise we can use the
- // overscan frame and let the attached window take care of positioning its content
+ // parent display frame and let the attached window take care of positioning its content
// appropriately.
if (adjust != SOFT_INPUT_ADJUST_RESIZE) {
// Set the content frame of the attached window to the parent's decor frame
@@ -1755,7 +1717,7 @@
// setting {@link WindowManager.LayoutParams#FLAG_LAYOUT_ATTACHED_IN_DECOR} flag.
// Otherwise, use the overscan frame.
cf.set((fl & FLAG_LAYOUT_ATTACHED_IN_DECOR) != 0
- ? attached.getContentFrameLw() : parentOverscan);
+ ? attached.getContentFrameLw() : parentDisplayFrame);
} else {
// If the window is resizing, then we want to base the content frame on our attached
// content frame to resize...however, things can be tricky if the attached window is
@@ -1770,7 +1732,6 @@
}
}
df.set(insetDecors ? parentDisplayFrame : cf);
- of.set(insetDecors ? parentOverscan : cf);
vf.set(attached.getVisibleFrameLw());
}
// The LAYOUT_IN_SCREEN flag is used to determine whether the attached window should be
@@ -1820,7 +1781,6 @@
return;
}
final WindowManager.LayoutParams attrs = win.getAttrs();
- final boolean isDefaultDisplay = win.isDefaultDisplay();
final int type = attrs.type;
final int fl = PolicyControl.getWindowFlags(win, attrs);
@@ -1831,11 +1791,9 @@
final WindowFrames windowFrames = win.getWindowFrames();
- windowFrames.setHasOutsets(false);
sTmpLastParentFrame.set(windowFrames.mParentFrame);
final Rect pf = windowFrames.mParentFrame;
final Rect df = windowFrames.mDisplayFrame;
- final Rect of = windowFrames.mOverscanFrame;
final Rect cf = windowFrames.mContentFrame;
final Rect vf = windowFrames.mVisibleFrame;
final Rect dcf = windowFrames.mDecorFrame;
@@ -1860,21 +1818,20 @@
if (type == TYPE_INPUT_METHOD) {
vf.set(displayFrames.mDock);
cf.set(displayFrames.mDock);
- of.set(displayFrames.mDock);
df.set(displayFrames.mDock);
windowFrames.mParentFrame.set(displayFrames.mDock);
// IM dock windows layout below the nav bar...
- pf.bottom = df.bottom = of.bottom = displayFrames.mUnrestricted.bottom;
+ pf.bottom = df.bottom = displayFrames.mUnrestricted.bottom;
// ...with content insets above the nav bar
cf.bottom = vf.bottom = displayFrames.mStable.bottom;
if (mStatusBar != null && mFocusedWindow == mStatusBar && canReceiveInput(mStatusBar)) {
// The status bar forces the navigation bar while it's visible. Make sure the IME
// avoids the navigation bar in that case.
if (mNavigationBarPosition == NAV_BAR_RIGHT) {
- pf.right = df.right = of.right = cf.right = vf.right =
+ pf.right = df.right = cf.right = vf.right =
displayFrames.mStable.right;
} else if (mNavigationBarPosition == NAV_BAR_LEFT) {
- pf.left = df.left = of.left = cf.left = vf.left = displayFrames.mStable.left;
+ pf.left = df.left = cf.left = vf.left = displayFrames.mStable.left;
}
}
@@ -1897,7 +1854,6 @@
// IM dock windows always go to the bottom of the screen.
attrs.gravity = Gravity.BOTTOM;
} else if (type == TYPE_VOICE_INTERACTION) {
- of.set(displayFrames.mUnrestricted);
df.set(displayFrames.mUnrestricted);
pf.set(displayFrames.mUnrestricted);
if (adjust != SOFT_INPUT_ADJUST_RESIZE) {
@@ -1911,9 +1867,8 @@
vf.set(cf);
}
} else if (type == TYPE_WALLPAPER) {
- layoutWallpaper(displayFrames, pf, df, of, cf);
+ layoutWallpaper(displayFrames, pf, df, cf);
} else if (win == mStatusBar) {
- of.set(displayFrames.mUnrestricted);
df.set(displayFrames.mUnrestricted);
pf.set(displayFrames.mUnrestricted);
cf.set(displayFrames.mStable);
@@ -1967,7 +1922,7 @@
if (attached != null) {
// If this window is attached to another, our display
// frame is the same as the one we are attached to.
- setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, of, cf, vf,
+ setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, cf, vf,
displayFrames);
} else {
if (type == TYPE_STATUS_BAR_PANEL || type == TYPE_STATUS_BAR_SUB_PANEL) {
@@ -1977,24 +1932,17 @@
//
// However, they should still dodge the navigation bar if it exists.
- pf.left = df.left = of.left = hasNavBar
+ pf.left = df.left = hasNavBar
? displayFrames.mDock.left : displayFrames.mUnrestricted.left;
- pf.top = df.top = of.top = displayFrames.mUnrestricted.top;
- pf.right = df.right = of.right = hasNavBar
+ pf.top = df.top = displayFrames.mUnrestricted.top;
+ pf.right = df.right = hasNavBar
? displayFrames.mRestricted.right
: displayFrames.mUnrestricted.right;
- pf.bottom = df.bottom = of.bottom = hasNavBar
+ pf.bottom = df.bottom = hasNavBar
? displayFrames.mRestricted.bottom
: displayFrames.mUnrestricted.bottom;
if (DEBUG_LAYOUT) Slog.v(TAG, "Laying out status bar window: " + pf);
- } else if ((fl & FLAG_LAYOUT_IN_OVERSCAN) != 0
- && type >= FIRST_APPLICATION_WINDOW && type <= LAST_SUB_WINDOW) {
- // Asking to layout into the overscan region, so give it that pure
- // unrestricted area.
- of.set(displayFrames.mOverscan);
- df.set(displayFrames.mOverscan);
- pf.set(displayFrames.mOverscan);
} else if ((sysUiFl & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0
&& (type >= FIRST_APPLICATION_WINDOW && type <= LAST_SUB_WINDOW
|| type == TYPE_VOLUME_OVERLAY
@@ -2003,19 +1951,11 @@
// extend into the unrestricted overscan screen area. We only do this for
// application windows and certain system windows to ensure no window that
// can be above the nav bar can do this.
- df.set(displayFrames.mOverscan);
- pf.set(displayFrames.mOverscan);
- // We need to tell the app about where the frame inside the overscan is, so
- // it can inset its content by that amount -- it didn't ask to actually
- // extend itself into the overscan region.
- of.set(displayFrames.mUnrestricted);
+ df.set(displayFrames.mUnrestricted);
+ pf.set(displayFrames.mUnrestricted);
} else {
- df.set(displayFrames.mRestrictedOverscan);
- pf.set(displayFrames.mRestrictedOverscan);
- // We need to tell the app about where the frame inside the overscan
- // is, so it can inset its content by that amount -- it didn't ask
- // to actually extend itself into the overscan region.
- of.set(displayFrames.mUnrestricted);
+ df.set(displayFrames.mRestricted);
+ pf.set(displayFrames.mRestricted);
}
if ((fl & FLAG_FULLSCREEN) == 0) {
@@ -2053,19 +1993,17 @@
// gets everything, period.
if (type == TYPE_STATUS_BAR_PANEL || type == TYPE_STATUS_BAR_SUB_PANEL) {
cf.set(displayFrames.mUnrestricted);
- of.set(displayFrames.mUnrestricted);
df.set(displayFrames.mUnrestricted);
pf.set(displayFrames.mUnrestricted);
if (hasNavBar) {
- pf.left = df.left = of.left = cf.left = displayFrames.mDock.left;
- pf.right = df.right = of.right = cf.right = displayFrames.mRestricted.right;
- pf.bottom = df.bottom = of.bottom = cf.bottom =
+ pf.left = df.left = cf.left = displayFrames.mDock.left;
+ pf.right = df.right = cf.right = displayFrames.mRestricted.right;
+ pf.bottom = df.bottom = cf.bottom =
displayFrames.mRestricted.bottom;
}
if (DEBUG_LAYOUT) Slog.v(TAG, "Laying out IN_SCREEN status bar window: " + pf);
} else if (type == TYPE_NAVIGATION_BAR || type == TYPE_NAVIGATION_BAR_PANEL) {
// The navigation bar has Real Ultimate Power.
- of.set(displayFrames.mUnrestricted);
df.set(displayFrames.mUnrestricted);
pf.set(displayFrames.mUnrestricted);
if (DEBUG_LAYOUT) Slog.v(TAG, "Laying out navigation bar window: " + pf);
@@ -2073,24 +2011,14 @@
&& ((fl & FLAG_FULLSCREEN) != 0)) {
// Fullscreen secure system overlays get what they ask for. Screenshot region
// selection overlay should also expand to full screen.
- cf.set(displayFrames.mOverscan);
- of.set(displayFrames.mOverscan);
- df.set(displayFrames.mOverscan);
- pf.set(displayFrames.mOverscan);
+ cf.set(displayFrames.mUnrestricted);
+ df.set(displayFrames.mUnrestricted);
+ pf.set(displayFrames.mUnrestricted);
} else if (type == TYPE_BOOT_PROGRESS) {
// Boot progress screen always covers entire display.
- cf.set(displayFrames.mOverscan);
- of.set(displayFrames.mOverscan);
- df.set(displayFrames.mOverscan);
- pf.set(displayFrames.mOverscan);
- } else if ((fl & FLAG_LAYOUT_IN_OVERSCAN) != 0
- && type >= FIRST_APPLICATION_WINDOW && type <= LAST_SUB_WINDOW) {
- // Asking to layout into the overscan region, so give it that pure unrestricted
- // area.
- cf.set(displayFrames.mOverscan);
- of.set(displayFrames.mOverscan);
- df.set(displayFrames.mOverscan);
- pf.set(displayFrames.mOverscan);
+ cf.set(displayFrames.mUnrestricted);
+ df.set(displayFrames.mUnrestricted);
+ pf.set(displayFrames.mUnrestricted);
} else if ((sysUiFl & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0
&& (type == TYPE_STATUS_BAR
|| type == TYPE_TOAST
@@ -2105,11 +2033,9 @@
// ask for layout in only content. We can't currently figure out
// what the screen would be if only laying out to hide the nav bar.
cf.set(displayFrames.mUnrestricted);
- of.set(displayFrames.mUnrestricted);
df.set(displayFrames.mUnrestricted);
pf.set(displayFrames.mUnrestricted);
} else if ((sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) != 0) {
- of.set(displayFrames.mRestricted);
df.set(displayFrames.mRestricted);
pf.set(displayFrames.mRestricted);
@@ -2123,7 +2049,6 @@
}
} else {
cf.set(displayFrames.mRestricted);
- of.set(displayFrames.mRestricted);
df.set(displayFrames.mRestricted);
pf.set(displayFrames.mRestricted);
}
@@ -2140,7 +2065,7 @@
+ "): attached to " + attached);
// A child window should be placed inside of the same visible
// frame that its parent had.
- setAttachedWindowFrames(win, fl, adjust, attached, false, pf, df, of, cf, vf,
+ setAttachedWindowFrames(win, fl, adjust, attached, false, pf, df, cf, vf,
displayFrames);
} else {
if (DEBUG_LAYOUT) Slog.v(TAG, "layoutWindowLw(" + attrs.getTitle()
@@ -2152,28 +2077,23 @@
// top of the status bar. They are protected by the STATUS_BAR_SERVICE
// permission, so they have the same privileges as the status bar itself.
cf.set(displayFrames.mRestricted);
- of.set(displayFrames.mRestricted);
df.set(displayFrames.mRestricted);
pf.set(displayFrames.mRestricted);
} else if (type == TYPE_TOAST || type == TYPE_SYSTEM_ALERT) {
// These dialogs are stable to interim decor changes.
cf.set(displayFrames.mStable);
- of.set(displayFrames.mStable);
df.set(displayFrames.mStable);
pf.set(displayFrames.mStable);
} else {
pf.set(displayFrames.mContent);
if (win.isVoiceInteraction()) {
cf.set(displayFrames.mVoiceContent);
- of.set(displayFrames.mVoiceContent);
df.set(displayFrames.mVoiceContent);
} else if (adjust != SOFT_INPUT_ADJUST_RESIZE) {
cf.set(displayFrames.mDock);
- of.set(displayFrames.mDock);
df.set(displayFrames.mDock);
} else {
cf.set(displayFrames.mContent);
- of.set(displayFrames.mContent);
df.set(displayFrames.mContent);
}
if (adjust != SOFT_INPUT_ADJUST_NOTHING) {
@@ -2252,34 +2172,8 @@
df.left = df.top = -10000;
df.right = df.bottom = 10000;
if (type != TYPE_WALLPAPER) {
- of.left = of.top = cf.left = cf.top = vf.left = vf.top = -10000;
- of.right = of.bottom = cf.right = cf.bottom = vf.right = vf.bottom = 10000;
- }
- }
-
- // If the device has a chin (e.g. some watches), a dead area at the bottom of the screen we
- // need to provide information to the clients that want to pretend that you can draw there.
- // We only want to apply outsets to certain types of windows. For example, we never want to
- // apply the outsets to floating dialogs, because they wouldn't make sense there.
- final boolean useOutsets = shouldUseOutsets(attrs, fl);
- if (isDefaultDisplay && useOutsets) {
- final Rect osf = windowFrames.mOutsetFrame;
- osf.set(cf.left, cf.top, cf.right, cf.bottom);
- windowFrames.setHasOutsets(true);
- int outset = mWindowOutsetBottom;
- if (outset > 0) {
- int rotation = displayFrames.mRotation;
- if (rotation == Surface.ROTATION_0) {
- osf.bottom += outset;
- } else if (rotation == Surface.ROTATION_90) {
- osf.right += outset;
- } else if (rotation == Surface.ROTATION_180) {
- osf.top -= outset;
- } else if (rotation == Surface.ROTATION_270) {
- osf.left -= outset;
- }
- if (DEBUG_LAYOUT) Slog.v(TAG, "applying bottom outset of " + outset
- + " with rotation " + rotation + ", result: " + osf);
+ cf.left = cf.top = vf.left = vf.top = -10000;
+ cf.right = cf.bottom = vf.right = vf.bottom = 10000;
}
}
@@ -2288,11 +2182,9 @@
+ " attach=" + attached + " type=" + type
+ String.format(" flags=0x%08x", fl)
+ " pf=" + pf.toShortString() + " df=" + df.toShortString()
- + " of=" + of.toShortString()
+ " cf=" + cf.toShortString() + " vf=" + vf.toShortString()
+ " dcf=" + dcf.toShortString()
- + " sf=" + sf.toShortString()
- + " osf=" + windowFrames.mOutsetFrame.toShortString() + " " + win);
+ + " sf=" + sf.toShortString());
if (!sTmpLastParentFrame.equals(pf)) {
windowFrames.setContentChanged(true);
@@ -2311,12 +2203,11 @@
}
}
- private void layoutWallpaper(DisplayFrames displayFrames, Rect pf, Rect df, Rect of, Rect cf) {
- // The wallpaper has Real Ultimate Power, but we want to tell it about the overscan area.
- df.set(displayFrames.mOverscan);
- pf.set(displayFrames.mOverscan);
+ private void layoutWallpaper(DisplayFrames displayFrames, Rect pf, Rect df, Rect cf) {
+ // The wallpaper has Real Ultimate Power
+ df.set(displayFrames.mUnrestricted);
+ pf.set(displayFrames.mUnrestricted);
cf.set(displayFrames.mUnrestricted);
- of.set(displayFrames.mUnrestricted);
}
private void offsetInputMethodWindowLw(WindowState win, DisplayFrames displayFrames) {
@@ -2722,7 +2613,6 @@
- getNavigationBarFrameHeight(portraitRotation, uiMode);
updateConfigurationAndScreenSizeDependentBehaviors();
- mWindowOutsetBottom = ScreenShapeHelper.getWindowOutsetBottomPx(mContext.getResources());
}
void updateConfigurationAndScreenSizeDependentBehaviors() {
diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java
index 67f1d1b..0c68084 100644
--- a/services/core/java/com/android/server/wm/DisplayRotation.java
+++ b/services/core/java/com/android/server/wm/DisplayRotation.java
@@ -45,15 +45,19 @@
import android.hardware.power.V1_0.PowerHint;
import android.net.Uri;
import android.os.Handler;
+import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Slog;
import android.util.SparseArray;
+import android.view.IDisplayWindowRotationCallback;
import android.view.Surface;
+import android.view.WindowContainerTransaction;
import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.function.pooled.PooledLambda;
import com.android.server.LocalServices;
import com.android.server.UiThread;
import com.android.server.policy.WindowManagerPolicy;
@@ -212,6 +216,31 @@
private boolean mDemoHdmiRotationLock;
private boolean mDemoRotationLock;
+ private static final int REMOTE_ROTATION_TIMEOUT_MS = 800;
+
+ private boolean mIsWaitingForRemoteRotation = false;
+
+ private final Runnable mDisplayRotationHandlerTimeout =
+ new Runnable() {
+ @Override
+ public void run() {
+ continueRotation(mRotation, null /* transaction */);
+ }
+ };
+
+ private final IDisplayWindowRotationCallback mRemoteRotationCallback =
+ new IDisplayWindowRotationCallback.Stub() {
+ @Override
+ public void continueRotateDisplay(int targetRotation,
+ WindowContainerTransaction t) {
+ synchronized (mService.getWindowManagerLock()) {
+ mService.mH.sendMessage(PooledLambda.obtainMessage(
+ DisplayRotation::continueRotation, DisplayRotation.this,
+ targetRotation, t));
+ }
+ }
+ };
+
DisplayRotation(WindowManagerService service, DisplayContent displayContent) {
this(service, displayContent, displayContent.getDisplayPolicy(),
service.mDisplayWindowSettings, service.mContext, service.getWindowManagerLock());
@@ -471,9 +500,52 @@
prepareNormalRotationAnimation();
}
+ // The display is frozen now, give a remote handler (system ui) some time to reposition
+ // things.
+ startRemoteRotation(oldRotation, mRotation);
+
return true;
}
+ /**
+ * A Remote rotation is when we are waiting for some registered (remote)
+ * {@link IDisplayWindowRotationController} to calculate and return some hierarchy operations
+ * to perform in sync with the rotation.
+ */
+ boolean isWaitingForRemoteRotation() {
+ return mIsWaitingForRemoteRotation;
+ }
+
+ private void startRemoteRotation(int fromRotation, int toRotation) {
+ if (mService.mDisplayRotationController == null) {
+ return;
+ }
+ mIsWaitingForRemoteRotation = true;
+ try {
+ mService.mDisplayRotationController.onRotateDisplay(mDisplayContent.getDisplayId(),
+ fromRotation, toRotation, mRemoteRotationCallback);
+ mService.mH.removeCallbacks(mDisplayRotationHandlerTimeout);
+ mService.mH.postDelayed(mDisplayRotationHandlerTimeout, REMOTE_ROTATION_TIMEOUT_MS);
+ } catch (RemoteException e) {
+ mIsWaitingForRemoteRotation = false;
+ return;
+ }
+ }
+
+ private void continueRotation(int targetRotation, WindowContainerTransaction t) {
+ synchronized (mService.mGlobalLock) {
+ if (targetRotation != mRotation || !mIsWaitingForRemoteRotation) {
+ // Drop it, this is either coming from an outdated remote rotation; or, we've
+ // already moved on.
+ return;
+ }
+ mService.mH.removeCallbacks(mDisplayRotationHandlerTimeout);
+ mIsWaitingForRemoteRotation = false;
+ mService.mAtmService.applyContainerTransaction(t);
+ mDisplayContent.sendNewConfiguration();
+ }
+ }
+
void prepareNormalRotationAnimation() {
final RotationAnimationPair anim = selectRotationAnimation();
mService.startFreezingDisplayLocked(anim.mExit, anim.mEnter, mDisplayContent);
diff --git a/services/core/java/com/android/server/wm/DisplayWindowListenerController.java b/services/core/java/com/android/server/wm/DisplayWindowListenerController.java
new file mode 100644
index 0000000..dbc452f
--- /dev/null
+++ b/services/core/java/com/android/server/wm/DisplayWindowListenerController.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm;
+
+import android.os.RemoteCallbackList;
+import android.os.RemoteException;
+import android.view.IDisplayWindowListener;
+
+/**
+ * Manages dispatch of relevant hierarchy changes to interested listeners. Listeners are assumed
+ * to be remote.
+ */
+class DisplayWindowListenerController {
+ RemoteCallbackList<IDisplayWindowListener> mDisplayListeners = new RemoteCallbackList<>();
+
+// private final ArrayList<DisplayContainerListener> mDisplayListeners = new ArrayList<>();
+ private final WindowManagerService mService;
+
+ DisplayWindowListenerController(WindowManagerService service) {
+ mService = service;
+ }
+
+ void registerListener(IDisplayWindowListener listener) {
+ synchronized (mService.mGlobalLock) {
+ mDisplayListeners.register(listener);
+ try {
+ for (int i = 0; i < mService.mAtmService.mRootActivityContainer.getChildCount();
+ ++i) {
+ ActivityDisplay d = mService.mAtmService.mRootActivityContainer.getChildAt(i);
+ listener.onDisplayAdded(d.mDisplayId);
+ }
+ } catch (RemoteException e) { }
+ }
+ }
+
+ void unregisterListener(IDisplayWindowListener listener) {
+ mDisplayListeners.unregister(listener);
+ }
+
+ void dispatchDisplayAdded(ActivityDisplay display) {
+ int count = mDisplayListeners.beginBroadcast();
+ for (int i = 0; i < count; ++i) {
+ try {
+ mDisplayListeners.getBroadcastItem(i).onDisplayAdded(display.mDisplayId);
+ } catch (RemoteException e) {
+ }
+ }
+ mDisplayListeners.finishBroadcast();
+ }
+
+ void dispatchDisplayRemoved(ActivityDisplay display) {
+ int count = mDisplayListeners.beginBroadcast();
+ for (int i = 0; i < count; ++i) {
+ try {
+ mDisplayListeners.getBroadcastItem(i).onDisplayRemoved(display.mDisplayId);
+ } catch (RemoteException e) {
+ }
+ }
+ mDisplayListeners.finishBroadcast();
+ }
+}
diff --git a/services/core/java/com/android/server/wm/DisplayWindowSettings.java b/services/core/java/com/android/server/wm/DisplayWindowSettings.java
index 8507918..dac8b14 100644
--- a/services/core/java/com/android/server/wm/DisplayWindowSettings.java
+++ b/services/core/java/com/android/server/wm/DisplayWindowSettings.java
@@ -100,10 +100,6 @@
private static class Entry {
private final String mName;
- private int mOverscanLeft;
- private int mOverscanTop;
- private int mOverscanRight;
- private int mOverscanBottom;
private int mWindowingMode = WindowConfiguration.WINDOWING_MODE_UNDEFINED;
private int mUserRotationMode = WindowManagerPolicy.USER_ROTATION_FREE;
private int mUserRotation = Surface.ROTATION_0;
@@ -124,10 +120,6 @@
private Entry(String name, Entry copyFrom) {
this(name);
- mOverscanLeft = copyFrom.mOverscanLeft;
- mOverscanTop = copyFrom.mOverscanTop;
- mOverscanRight = copyFrom.mOverscanRight;
- mOverscanBottom = copyFrom.mOverscanBottom;
mWindowingMode = copyFrom.mWindowingMode;
mUserRotationMode = copyFrom.mUserRotationMode;
mUserRotation = copyFrom.mUserRotation;
@@ -144,9 +136,7 @@
/** @return {@code true} if all values are default. */
private boolean isEmpty() {
- return mOverscanLeft == 0 && mOverscanTop == 0 && mOverscanRight == 0
- && mOverscanBottom == 0
- && mWindowingMode == WindowConfiguration.WINDOWING_MODE_UNDEFINED
+ return mWindowingMode == WindowConfiguration.WINDOWING_MODE_UNDEFINED
&& mUserRotationMode == WindowManagerPolicy.USER_ROTATION_FREE
&& mUserRotation == Surface.ROTATION_0
&& mForcedWidth == 0 && mForcedHeight == 0 && mForcedDensity == 0
@@ -202,15 +192,6 @@
return newEntry;
}
- void setOverscanLocked(DisplayInfo displayInfo, int left, int top, int right, int bottom) {
- final Entry entry = getOrCreateEntry(displayInfo);
- entry.mOverscanLeft = left;
- entry.mOverscanTop = top;
- entry.mOverscanRight = right;
- entry.mOverscanBottom = bottom;
- writeSettingsIfNeeded(entry, displayInfo);
- }
-
void setUserRotation(DisplayContent displayContent, int rotationMode, int rotation) {
final DisplayInfo displayInfo = displayContent.getDisplayInfo();
final Entry entry = getOrCreateEntry(displayInfo);
@@ -405,11 +386,6 @@
// Setting windowing mode first, because it may override overscan values later.
dc.setWindowingMode(getWindowingModeLocked(entry, dc.getDisplayId()));
- displayInfo.overscanLeft = entry.mOverscanLeft;
- displayInfo.overscanTop = entry.mOverscanTop;
- displayInfo.overscanRight = entry.mOverscanRight;
- displayInfo.overscanBottom = entry.mOverscanBottom;
-
dc.getDisplayRotation().restoreSettings(entry.mUserRotationMode,
entry.mUserRotation, entry.mFixedToUserRotation);
@@ -536,10 +512,6 @@
String name = parser.getAttributeValue(null, "name");
if (name != null) {
Entry entry = new Entry(name);
- entry.mOverscanLeft = getIntAttribute(parser, "overscanLeft");
- entry.mOverscanTop = getIntAttribute(parser, "overscanTop");
- entry.mOverscanRight = getIntAttribute(parser, "overscanRight");
- entry.mOverscanBottom = getIntAttribute(parser, "overscanBottom");
entry.mWindowingMode = getIntAttribute(parser, "windowingMode",
WindowConfiguration.WINDOWING_MODE_UNDEFINED);
entry.mUserRotationMode = getIntAttribute(parser, "userRotationMode",
@@ -602,18 +574,6 @@
for (Entry entry : mEntries.values()) {
out.startTag(null, "display");
out.attribute(null, "name", entry.mName);
- if (entry.mOverscanLeft != 0) {
- out.attribute(null, "overscanLeft", Integer.toString(entry.mOverscanLeft));
- }
- if (entry.mOverscanTop != 0) {
- out.attribute(null, "overscanTop", Integer.toString(entry.mOverscanTop));
- }
- if (entry.mOverscanRight != 0) {
- out.attribute(null, "overscanRight", Integer.toString(entry.mOverscanRight));
- }
- if (entry.mOverscanBottom != 0) {
- out.attribute(null, "overscanBottom", Integer.toString(entry.mOverscanBottom));
- }
if (entry.mWindowingMode != WindowConfiguration.WINDOWING_MODE_UNDEFINED) {
out.attribute(null, "windowingMode", Integer.toString(entry.mWindowingMode));
}
diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index b454922..07d5094 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -140,7 +140,7 @@
float mLastDividerProgress;
private final DividerSnapAlgorithm[] mSnapAlgorithmForRotation = new DividerSnapAlgorithm[4];
private boolean mImeHideRequested;
- private TaskStack mDimmedStack;
+ private ActivityStack mDimmedStack;
DockedStackDividerController(WindowManagerService service, DisplayContent displayContent) {
mService = service;
@@ -255,7 +255,7 @@
}
boolean isHomeStackResizable() {
- final TaskStack homeStack = mDisplayContent.getHomeStack();
+ final ActivityStack homeStack = mDisplayContent.getHomeStack();
if (homeStack == null) {
return false;
}
@@ -371,7 +371,7 @@
if (mWindow == null) {
return;
}
- TaskStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
+ ActivityStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
// If the stack is invisible, we policy force hide it in WindowAnimator.shouldForceHide
final boolean visible = stack != null;
@@ -415,7 +415,7 @@
}
void positionDockedStackedDivider(Rect frame) {
- TaskStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
+ ActivityStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
if (stack == null) {
// Unfortunately we might end up with still having a divider, even though the underlying
// stack was already removed. This is because we are on AM thread and the removal of the
@@ -523,7 +523,8 @@
// If a primary stack was just created, it will not have access to display content at
// this point so pass it from here to get a valid dock side.
- final TaskStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
+ final ActivityStack stack =
+ mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
mOriginalDockedSide = stack.getDockSideForDisplay(mDisplayContent);
return;
}
@@ -558,7 +559,7 @@
boolean isHomeStackResizable) {
long animDuration = 0;
if (animate) {
- final TaskStack stack =
+ final ActivityStack stack =
mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
final long transitionDuration = isAnimationMaximizing()
? mDisplayContent.mAppTransition.getLastClipRevealTransitionDuration()
@@ -629,10 +630,10 @@
*/
void setResizeDimLayer(boolean visible, int targetWindowingMode, float alpha) {
// TODO: Maybe only allow split-screen windowing modes?
- final TaskStack stack = targetWindowingMode != WINDOWING_MODE_UNDEFINED
+ final ActivityStack stack = targetWindowingMode != WINDOWING_MODE_UNDEFINED
? mDisplayContent.getTopStackInWindowingMode(targetWindowingMode)
: null;
- final TaskStack dockedStack = mDisplayContent.getSplitScreenPrimaryStack();
+ final ActivityStack dockedStack = mDisplayContent.getSplitScreenPrimaryStack();
boolean visibleAndValid = visible && stack != null && dockedStack != null;
// Ensure an old dim that was shown for the docked stack divider is removed so we don't end
@@ -703,7 +704,7 @@
if (mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility() == null) {
return;
}
- final TaskStack homeStack = mDisplayContent.getHomeStack();
+ final ActivityStack homeStack = mDisplayContent.getHomeStack();
if (homeStack == null) {
return;
}
@@ -717,7 +718,7 @@
if (mMinimizedDock && mService.mKeyguardOrAodShowingOnDefaultDisplay) {
return;
}
- final TaskStack topSecondaryStack = mDisplayContent.getTopStackInWindowingMode(
+ final ActivityStack topSecondaryStack = mDisplayContent.getTopStackInWindowingMode(
WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);
final RecentsAnimationController recentsAnim = mService.getRecentsAnimationController();
final boolean minimizedForRecentsAnimation = recentsAnim != null &&
@@ -872,7 +873,7 @@
}
private boolean setMinimizedDockedStack(boolean minimized) {
- final TaskStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
+ final ActivityStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
notifyDockedStackMinimizedChanged(minimized, false /* animate */, isHomeStackResizable());
return stack != null && stack.setAdjustedForMinimizedDock(minimized ? 1f : 0f);
}
@@ -922,7 +923,7 @@
}
private boolean animateForMinimizedDockedStack(long now) {
- final TaskStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
+ final ActivityStack stack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
if (!mAnimationStarted) {
mAnimationStarted = true;
mAnimationStartTime = now;
@@ -956,7 +957,7 @@
/**
* Gets the amount how much to minimize a stack depending on the interpolated fraction t.
*/
- private float getMinimizeAmount(TaskStack stack, float t) {
+ private float getMinimizeAmount(ActivityStack stack, float t) {
final float naturalAmount = getInterpolatedAnimationValue(t);
if (isAnimationMaximizing()) {
return adjustMaximizeAmount(stack, t, naturalAmount);
@@ -971,7 +972,7 @@
* transition so we don't create a visible "hole", but only if both the clip reveal and the
* docked stack divider start from about the same portion on the screen.
*/
- private float adjustMaximizeAmount(TaskStack stack, float t, float naturalAmount) {
+ private float adjustMaximizeAmount(ActivityStack stack, float t, float naturalAmount) {
if (mMaximizeMeetFraction == 1f) {
return naturalAmount;
}
@@ -987,7 +988,7 @@
* Retrieves the animation fraction at which the docked stack has to meet the clip reveal
* edge. See {@link #adjustMaximizeAmount}.
*/
- private float getClipRevealMeetFraction(TaskStack stack) {
+ private float getClipRevealMeetFraction(ActivityStack stack) {
if (!isAnimationMaximizing() || stack == null ||
!mDisplayContent.mAppTransition.hadClipRevealAnimation()) {
return 1f;
diff --git a/services/core/java/com/android/server/wm/DragResizeMode.java b/services/core/java/com/android/server/wm/DragResizeMode.java
index c0bf1e8..71beb50 100644
--- a/services/core/java/com/android/server/wm/DragResizeMode.java
+++ b/services/core/java/com/android/server/wm/DragResizeMode.java
@@ -35,7 +35,7 @@
*/
static final int DRAG_RESIZE_MODE_DOCKED_DIVIDER = 1;
- static boolean isModeAllowedForStack(TaskStack stack, int mode) {
+ static boolean isModeAllowedForStack(ActivityStack stack, int mode) {
switch (mode) {
case DRAG_RESIZE_MODE_FREEFORM:
return stack.getWindowingMode() == WINDOWING_MODE_FREEFORM;
diff --git a/services/core/java/com/android/server/wm/PinnedStackController.java b/services/core/java/com/android/server/wm/PinnedStackController.java
index 6cb1e76..a5b1fda 100644
--- a/services/core/java/com/android/server/wm/PinnedStackController.java
+++ b/services/core/java/com/android/server/wm/PinnedStackController.java
@@ -140,7 +140,7 @@
public void startAnimation(Rect destinationBounds, Rect sourceRectHint,
int animationDuration) {
synchronized (mService.mGlobalLock) {
- final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
+ final ActivityStack pinnedStack = mDisplayContent.getPinnedStack();
pinnedStack.animateResizePinnedStack(destinationBounds,
sourceRectHint, animationDuration, true /* fromFullscreen */);
}
@@ -468,7 +468,7 @@
}
try {
final Rect animatingBounds = new Rect();
- final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
+ final ActivityStack pinnedStack = mDisplayContent.getPinnedStack();
if (pinnedStack != null) {
pinnedStack.getAnimationOrCurrentBounds(animatingBounds);
}
diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java
index 7a3e43b..282144e 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimationController.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java
@@ -366,7 +366,7 @@
// Make leashes for each of the visible/target tasks and add it to the recents animation to
// be started
final ArrayList<Task> visibleTasks = mDisplayContent.getVisibleTasks();
- final TaskStack targetStack = mDisplayContent.getStack(WINDOWING_MODE_UNDEFINED,
+ final ActivityStack targetStack = mDisplayContent.getStack(WINDOWING_MODE_UNDEFINED,
targetActivityType);
if (targetStack != null) {
for (int i = targetStack.getChildCount() - 1; i >= 0; i--) {
@@ -410,7 +410,8 @@
}
// Save the minimized home height
- final TaskStack dockedStack = mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
+ final ActivityStack dockedStack =
+ mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility();
mDisplayContent.getDockedDividerController().getHomeStackBoundsInDockedMode(
mDisplayContent.getConfiguration(),
dockedStack == null ? DOCKED_INVALID : dockedStack.getDockSide(),
diff --git a/services/core/java/com/android/server/wm/RootActivityContainer.java b/services/core/java/com/android/server/wm/RootActivityContainer.java
index cb41372..06cce52 100644
--- a/services/core/java/com/android/server/wm/RootActivityContainer.java
+++ b/services/core/java/com/android/server/wm/RootActivityContainer.java
@@ -1156,6 +1156,9 @@
final ActivityStack focusedStack = display.getFocusedStack();
if (focusedStack != null) {
result |= focusedStack.resumeTopActivityUncheckedLocked(target, targetOptions);
+ } else if (targetStack == null && !display.hasChild()) {
+ result |= resumeHomeActivity(null /* prev */, "empty-display",
+ display.mDisplayId);
}
}
}
@@ -1247,6 +1250,7 @@
stack.getBounds(info.bounds);
info.displayId = displayId;
info.stackId = stack.mStackId;
+ info.stackToken = stack.mRemoteToken;
info.userId = stack.mCurrentUser;
info.visible = stack.shouldBeVisible(null);
// A stack might be not attached to a display.
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 149bcfb..565f95e 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -412,10 +412,10 @@
}
}
- TaskStack getStack(int windowingMode, int activityType) {
+ ActivityStack getStack(int windowingMode, int activityType) {
for (int i = mChildren.size() - 1; i >= 0; i--) {
final DisplayContent dc = mChildren.get(i);
- final TaskStack stack = dc.getStack(windowingMode, activityType);
+ final ActivityStack stack = dc.getStack(windowingMode, activityType);
if (stack != null) {
return stack;
}
@@ -818,10 +818,6 @@
if (mWmService.mStrictModeFlash != null) {
mWmService.mStrictModeFlash.positionSurface(defaultDw, defaultDh, mDisplayTransaction);
}
- if (mWmService.mCircularDisplayMask != null) {
- mWmService.mCircularDisplayMask.positionSurface(defaultDw, defaultDh,
- mWmService.getDefaultDisplayRotation(), mDisplayTransaction);
- }
if (mWmService.mEmulatorDisplayOverlay != null) {
mWmService.mEmulatorDisplayOverlay.positionSurface(defaultDw, defaultDh,
mWmService.getDefaultDisplayRotation(), mDisplayTransaction);
diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index 7135b21..c0432b6 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -155,11 +155,11 @@
@Override
public int addToDisplay(IWindow window, int seq, WindowManager.LayoutParams attrs,
int viewVisibility, int displayId, Rect outFrame, Rect outContentInsets,
- Rect outStableInsets, Rect outOutsets,
+ Rect outStableInsets,
DisplayCutout.ParcelableWrapper outDisplayCutout, InputChannel outInputChannel,
InsetsState outInsetsState) {
return mService.addWindow(this, window, seq, attrs, viewVisibility, displayId, outFrame,
- outContentInsets, outStableInsets, outOutsets, outDisplayCutout, outInputChannel,
+ outContentInsets, outStableInsets, outDisplayCutout, outInputChannel,
outInsetsState);
}
@@ -168,7 +168,7 @@
int viewVisibility, int displayId, Rect outContentInsets, Rect outStableInsets,
InsetsState outInsetsState) {
return mService.addWindow(this, window, seq, attrs, viewVisibility, displayId,
- new Rect() /* outFrame */, outContentInsets, outStableInsets, null /* outOutsets */,
+ new Rect() /* outFrame */, outContentInsets, outStableInsets,
new DisplayCutout.ParcelableWrapper() /* cutout */, null /* outInputChannel */,
outInsetsState);
}
@@ -186,8 +186,8 @@
@Override
public int relayout(IWindow window, int seq, WindowManager.LayoutParams attrs,
int requestedWidth, int requestedHeight, int viewFlags, int flags, long frameNumber,
- Rect outFrame, Rect outOverscanInsets, Rect outContentInsets, Rect outVisibleInsets,
- Rect outStableInsets, Rect outsets, Rect outBackdropFrame,
+ Rect outFrame, Rect outContentInsets, Rect outVisibleInsets,
+ Rect outStableInsets, Rect outBackdropFrame,
DisplayCutout.ParcelableWrapper cutout, MergedConfiguration mergedConfiguration,
SurfaceControl outSurfaceControl, InsetsState outInsetsState) {
if (false) Slog.d(TAG_WM, ">>>>>> ENTERED relayout from "
@@ -195,8 +195,8 @@
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, mRelayoutTag);
int res = mService.relayoutWindow(this, window, seq, attrs,
requestedWidth, requestedHeight, viewFlags, flags, frameNumber,
- outFrame, outOverscanInsets, outContentInsets, outVisibleInsets,
- outStableInsets, outsets, outBackdropFrame, cutout,
+ outFrame, outContentInsets, outVisibleInsets,
+ outStableInsets, outBackdropFrame, cutout,
mergedConfiguration, outSurfaceControl, outInsetsState);
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
if (false) Slog.d(TAG_WM, "<<<<<< EXITING relayout to "
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 4038548..b229a1d 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -678,13 +678,6 @@
boolean kept = true;
try {
final ActivityRecord r = topRunningActivityLocked();
- // give pinned stack a chance to save current bounds, this needs to be before the
- // actual reparent.
- if (inPinnedWindowingMode()
- && !(toStackWindowingMode == WINDOWING_MODE_UNDEFINED)
- && !r.isHidden()) {
- r.savePinnedStackBounds();
- }
final boolean wasFocused = r != null && root.isTopDisplayFocusedStack(sourceStack)
&& (topRunningActivityLocked() == r);
final boolean wasResumed = r != null && sourceStack.getResumedActivity() == r;
@@ -939,7 +932,6 @@
@Override
void onParentChanged(ConfigurationContainer newParent, ConfigurationContainer oldParent) {
- // TODO(stack-merge): Remove casts after object merge.
final ActivityStack oldStack = ((ActivityStack) oldParent);
final ActivityStack newStack = ((ActivityStack) newParent);
@@ -2242,8 +2234,8 @@
return getTaskStack() != null ? getTaskStack().getDisplayContent() : null;
}
- TaskStack getTaskStack() {
- return (TaskStack) getParent();
+ ActivityStack getTaskStack() {
+ return (ActivityStack) getParent();
}
int getAdjustedAddPosition(ActivityRecord r, int suggestedPosition) {
@@ -2309,13 +2301,12 @@
}
// TODO: Consolidate this with Task.reparent()
- void reparent(TaskStack stack, int position, boolean moveParents, String reason) {
+ void reparent(ActivityStack stack, int position, boolean moveParents, String reason) {
if (DEBUG_STACK) Slog.i(TAG, "reParentTask: removing taskId=" + mTaskId
+ " from stack=" + getTaskStack());
EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, "reParentTask");
- // TODO(stack-merge): Remove cast.
- final ActivityStack prevStack = (ActivityStack) getTaskStack();
+ final ActivityStack prevStack = getTaskStack();
final boolean wasTopFocusedStack =
mAtmService.mRootActivityContainer.isTopDisplayFocusedStack(prevStack);
final ActivityDisplay prevStackDisplay = prevStack.getDisplay();
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java
index 0d4ec65..35f61a8 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -16,6 +16,8 @@
package com.android.server.wm;
+import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
+
import static com.android.server.wm.TaskSnapshotPersister.DISABLE_FULL_SIZED_BITMAPS;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_SCREENSHOT;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
@@ -248,6 +250,12 @@
@Nullable
SurfaceControl.ScreenshotGraphicBuffer createTaskSnapshot(@NonNull Task task,
float scaleFraction) {
+ return createTaskSnapshot(task, scaleFraction, PixelFormat.RGBA_8888);
+ }
+
+ @Nullable
+ SurfaceControl.ScreenshotGraphicBuffer createTaskSnapshot(@NonNull Task task,
+ float scaleFraction, int pixelFormat) {
if (task.getSurfaceControl() == null) {
if (DEBUG_SCREENSHOT) {
Slog.w(TAG_WM, "Failed to take screenshot. No surface control for " + task);
@@ -258,7 +266,7 @@
mTmpRect.offsetTo(0, 0);
final SurfaceControl.ScreenshotGraphicBuffer screenshotBuffer =
SurfaceControl.captureLayers(
- task.getSurfaceControl(), mTmpRect, scaleFraction);
+ task.getSurfaceControl(), mTmpRect, scaleFraction, pixelFormat);
final GraphicBuffer buffer = screenshotBuffer != null ? screenshotBuffer.getGraphicBuffer()
: null;
if (buffer == null || buffer.getWidth() <= 1 || buffer.getHeight() <= 1) {
@@ -299,8 +307,14 @@
Slog.w(TAG_WM, "Failed to take screenshot. No main window for " + task);
return null;
}
+ final boolean isWindowTranslucent = mainWindow.getAttrs().format != PixelFormat.OPAQUE;
+ final boolean isShowWallpaper = (mainWindow.getAttrs().flags & FLAG_SHOW_WALLPAPER) != 0;
+ final int pixelFormat = mPersister.use16BitFormat() && activity.fillsParent()
+ && !(isWindowTranslucent && isShowWallpaper)
+ ? PixelFormat.RGB_565
+ : PixelFormat.RGBA_8888;
final SurfaceControl.ScreenshotGraphicBuffer screenshotBuffer =
- createTaskSnapshot(task, scaleFraction);
+ createTaskSnapshot(task, scaleFraction, pixelFormat);
if (screenshotBuffer == null) {
if (DEBUG_SCREENSHOT) {
@@ -308,7 +322,8 @@
}
return null;
}
- final boolean isWindowTranslucent = mainWindow.getAttrs().format != PixelFormat.OPAQUE;
+ final boolean isTranslucent = PixelFormat.formatHasAlpha(pixelFormat)
+ && (!activity.fillsParent() || isWindowTranslucent);
return new TaskSnapshot(
System.currentTimeMillis() /* id */,
activity.mActivityComponent, screenshotBuffer.getGraphicBuffer(),
@@ -316,7 +331,7 @@
activity.getTask().getConfiguration().orientation,
getInsets(mainWindow), isLowRamDevice /* reduced */, scaleFraction /* scale */,
true /* isRealSnapshot */, task.getWindowingMode(), getSystemUiVisibility(task),
- !activity.fillsParent() || isWindowTranslucent);
+ isTranslucent);
}
private boolean shouldDisableSnapshots() {
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotLoader.java b/services/core/java/com/android/server/wm/TaskSnapshotLoader.java
index 696e1c3..22c1ea5 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotLoader.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotLoader.java
@@ -75,25 +75,35 @@
final byte[] bytes = Files.readAllBytes(protoFile.toPath());
final TaskSnapshotProto proto = TaskSnapshotProto.parseFrom(bytes);
final Options options = new Options();
- options.inPreferredConfig = Config.HARDWARE;
+ options.inPreferredConfig = mPersister.use16BitFormat() && !proto.isTranslucent
+ ? Config.RGB_565
+ : Config.ARGB_8888;
final Bitmap bitmap = BitmapFactory.decodeFile(bitmapFile.getPath(), options);
if (bitmap == null) {
Slog.w(TAG, "Failed to load bitmap: " + bitmapFile.getPath());
return null;
}
- final GraphicBuffer buffer = bitmap.createGraphicBufferHandle();
+
+ final Bitmap hwBitmap = bitmap.copy(Config.HARDWARE, false);
+ bitmap.recycle();
+ if (hwBitmap == null) {
+ Slog.w(TAG, "Failed to create hardware bitmap: " + bitmapFile.getPath());
+ return null;
+ }
+ final GraphicBuffer buffer = hwBitmap.createGraphicBufferHandle();
if (buffer == null) {
Slog.w(TAG, "Failed to retrieve gralloc buffer for bitmap: "
+ bitmapFile.getPath());
return null;
}
+
final ComponentName topActivityComponent = ComponentName.unflattenFromString(
proto.topActivityComponent);
// For legacy snapshots, restore the scale based on the reduced resolution state
final float legacyScale = reducedResolution ? mPersister.getReducedScale() : 1f;
final float scale = Float.compare(proto.scale, 0f) != 0 ? proto.scale : legacyScale;
- return new TaskSnapshot(proto.id, topActivityComponent, buffer, bitmap.getColorSpace(),
- proto.orientation,
+ return new TaskSnapshot(proto.id, topActivityComponent, buffer,
+ hwBitmap.getColorSpace(), proto.orientation,
new Rect(proto.insetLeft, proto.insetTop, proto.insetRight, proto.insetBottom),
reducedResolution, scale, proto.isRealSnapshot, proto.windowingMode,
proto.systemUiVisibility, proto.isTranslucent);
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
index a156f5c..5915590 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
@@ -74,6 +74,7 @@
private final Object mLock = new Object();
private final DirectoryResolver mDirectoryResolver;
private final float mReducedScale;
+ private final boolean mUse16BitFormat;
/**
* The list of ids of the tasks that have been persisted since {@link #removeObsoleteFiles} was
@@ -92,6 +93,8 @@
mReducedScale = ActivityManager.isLowRamDeviceStatic()
? LOW_RAM_REDUCED_SCALE : REDUCED_SCALE;
}
+ mUse16BitFormat = service.mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_use16BitTaskSnapshotPixelFormat);
}
/**
@@ -164,6 +167,15 @@
return mReducedScale;
}
+ /**
+ * Return if task snapshots are stored in 16 bit pixel format.
+ *
+ * @return true if task snapshots are stored in 16 bit pixel format.
+ */
+ boolean use16BitFormat() {
+ return mUse16BitFormat;
+ }
+
@TestApi
void waitForQueueEmpty() {
while (true) {
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
index b1e5c8f..b3750e9 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
@@ -209,7 +209,7 @@
try {
final int res = session.addToDisplay(window, window.mSeq, layoutParams,
View.GONE, activity.getDisplayContent().getDisplayId(), tmpFrame, tmpRect, tmpRect,
- tmpRect, tmpCutout, null, mTmpInsetsState);
+ tmpCutout, null, mTmpInsetsState);
if (res < 0) {
Slog.w(TAG, "Failed to add snapshot starting window res=" + res);
return null;
@@ -224,7 +224,7 @@
window.setOuter(snapshotSurface);
try {
session.relayout(window, window.mSeq, layoutParams, -1, -1, View.VISIBLE, 0, -1,
- tmpFrame, tmpRect, tmpContentInsets, tmpRect, tmpStableInsets, tmpRect, tmpRect,
+ tmpFrame, tmpContentInsets, tmpRect, tmpStableInsets, tmpRect,
tmpCutout, tmpMergedConfiguration, surfaceControl, mTmpInsetsState);
} catch (RemoteException e) {
// Local call.
@@ -466,8 +466,8 @@
}
@Override
- public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets,
- Rect stableInsets, Rect outsets, boolean reportDraw,
+ public void resized(Rect frame, Rect contentInsets, Rect visibleInsets,
+ Rect stableInsets, boolean reportDraw,
MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout,
boolean alwaysConsumeSystemBars, int displayId,
DisplayCutout.ParcelableWrapper displayCutout) {
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
deleted file mode 100644
index ec627c8..0000000
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ /dev/null
@@ -1,1816 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.wm;
-
-import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT;
-import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
-import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
-import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
-import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
-import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
-import static android.app.WindowConfiguration.PINNED_WINDOWING_MODE_ELEVATION_IN_DIP;
-import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
-import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
-import static android.view.Display.DEFAULT_DISPLAY;
-import static android.view.WindowManager.DOCKED_BOTTOM;
-import static android.view.WindowManager.DOCKED_INVALID;
-import static android.view.WindowManager.DOCKED_LEFT;
-import static android.view.WindowManager.DOCKED_RIGHT;
-import static android.view.WindowManager.DOCKED_TOP;
-
-import static com.android.server.wm.BoundsAnimationController.FADE_IN;
-import static com.android.server.wm.BoundsAnimationController.NO_PIP_MODE_CHANGED_CALLBACKS;
-import static com.android.server.wm.BoundsAnimationController.SCHEDULE_PIP_MODE_CHANGED_ON_END;
-import static com.android.server.wm.BoundsAnimationController.SCHEDULE_PIP_MODE_CHANGED_ON_START;
-import static com.android.server.wm.BoundsAnimationController.SchedulePipModeChangedState;
-import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER;
-import static com.android.server.wm.StackProto.ADJUSTED_BOUNDS;
-import static com.android.server.wm.StackProto.ADJUSTED_FOR_IME;
-import static com.android.server.wm.StackProto.ADJUST_DIVIDER_AMOUNT;
-import static com.android.server.wm.StackProto.ADJUST_IME_AMOUNT;
-import static com.android.server.wm.StackProto.ANIMATING_BOUNDS;
-import static com.android.server.wm.StackProto.BOUNDS;
-import static com.android.server.wm.StackProto.DEFER_REMOVAL;
-import static com.android.server.wm.StackProto.FILLS_PARENT;
-import static com.android.server.wm.StackProto.ID;
-import static com.android.server.wm.StackProto.MINIMIZE_AMOUNT;
-import static com.android.server.wm.StackProto.TASKS;
-import static com.android.server.wm.StackProto.WINDOW_CONTAINER;
-import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
-import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
-import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK;
-import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_MOVEMENT;
-import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
-
-import android.app.RemoteAction;
-import android.content.res.Configuration;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.graphics.Region;
-import android.os.RemoteException;
-import android.util.DisplayMetrics;
-import android.util.EventLog;
-import android.util.Slog;
-import android.util.proto.ProtoOutputStream;
-import android.view.DisplayCutout;
-import android.view.DisplayInfo;
-import android.view.RemoteAnimationTarget;
-import android.view.SurfaceControl;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.policy.DividerSnapAlgorithm;
-import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget;
-import com.android.internal.policy.DockedDividerUtils;
-import com.android.server.EventLogTags;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TaskStack extends WindowContainer<Task> implements
- BoundsAnimationTarget, ConfigurationContainerListener {
- /** Minimum size of an adjusted stack bounds relative to original stack bounds. Used to
- * restrict IME adjustment so that a min portion of top stack remains visible.*/
- private static final float ADJUSTED_STACK_FRACTION_MIN = 0.3f;
-
- /** Dimming amount for non-focused stack when stacks are IME-adjusted. */
- private static final float IME_ADJUST_DIM_AMOUNT = 0.25f;
-
- /** Unique identifier */
- final int mStackId;
-
- /** For comparison with DisplayContent bounds. */
- private Rect mTmpRect = new Rect();
- private Rect mTmpRect2 = new Rect();
- private Rect mTmpRect3 = new Rect();
-
- /** For Pinned stack controlling. */
- private Rect mTmpToBounds = new Rect();
-
- /** Stack bounds adjusted to screen content area (taking into account IM windows, etc.) */
- private final Rect mAdjustedBounds = new Rect();
-
- /**
- * Fully adjusted IME bounds. These are different from {@link #mAdjustedBounds} because they
- * represent the state when the animation has ended.
- */
- private final Rect mFullyAdjustedImeBounds = new Rect();
-
- /** ActivityRecords that are exiting, but still on screen for animations. */
- final ArrayList<ActivityRecord> mExitingActivities = new ArrayList<>();
-
- /** Detach this stack from its display when animation completes. */
- // TODO: maybe tie this to WindowContainer#removeChild some how...
- private boolean mDeferRemoval;
-
- private final Rect mTmpAdjustedBounds = new Rect();
- private boolean mAdjustedForIme;
- private boolean mImeGoingAway;
- private WindowState mImeWin;
- private float mMinimizeAmount;
- private float mAdjustImeAmount;
- private float mAdjustDividerAmount;
- private final int mDockedStackMinimizeThickness;
-
- // If this is true, we are in the bounds animating mode. The task will be down or upscaled to
- // perfectly fit the region it would have been cropped to. We may also avoid certain logic we
- // would otherwise apply while resizing, while resizing in the bounds animating mode.
- private boolean mBoundsAnimating = false;
- // Set when an animation has been requested but has not yet started from the UI thread. This is
- // cleared when the animation actually starts.
- private boolean mBoundsAnimatingRequested = false;
- private boolean mBoundsAnimatingToFullscreen = false;
- private boolean mCancelCurrentBoundsAnimation = false;
- private Rect mBoundsAnimationTarget = new Rect();
- private Rect mBoundsAnimationSourceHintBounds = new Rect();
- private @BoundsAnimationController.AnimationType int mAnimationType;
-
- Rect mPreAnimationBounds = new Rect();
-
- private Dimmer mDimmer = new Dimmer(this);
-
- /**
- * For {@link #prepareSurfaces}.
- */
- private final Rect mTmpDimBoundsRect = new Rect();
- private final Point mLastSurfaceSize = new Point();
-
- private final AnimatingActivityRegistry mAnimatingActivityRegistry =
- new AnimatingActivityRegistry();
-
- TaskStack(WindowManagerService service, int stackId) {
- super(service);
- mStackId = stackId;
- mDockedStackMinimizeThickness = service.mContext.getResources().getDimensionPixelSize(
- com.android.internal.R.dimen.docked_stack_minimize_thickness);
- EventLog.writeEvent(EventLogTags.WM_STACK_CREATED, stackId);
- }
-
- Task findHomeTask() {
- if (!isActivityTypeHome() || mChildren.isEmpty()) {
- return null;
- }
- return mChildren.get(mChildren.size() - 1);
- }
-
- void prepareFreezingTaskBounds() {
- for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; --taskNdx) {
- final Task task = mChildren.get(taskNdx);
- task.prepareFreezingBounds();
- }
- }
-
- /**
- * Overrides the adjusted bounds, i.e. sets temporary layout bounds which are different from
- * the normal task bounds.
- *
- * @param bounds The adjusted bounds.
- */
- private void setAdjustedBounds(Rect bounds) {
- if (mAdjustedBounds.equals(bounds) && !isAnimatingForIme()) {
- return;
- }
-
- mAdjustedBounds.set(bounds);
- final boolean adjusted = !mAdjustedBounds.isEmpty();
- Rect insetBounds = null;
- if (adjusted && isAdjustedForMinimizedDockedStack()) {
- insetBounds = getRawBounds();
- } else if (adjusted && mAdjustedForIme) {
- if (mImeGoingAway) {
- insetBounds = getRawBounds();
- } else {
- insetBounds = mFullyAdjustedImeBounds;
- }
- }
- alignTasksToAdjustedBounds(adjusted ? mAdjustedBounds : getRawBounds(), insetBounds);
- mDisplayContent.setLayoutNeeded();
-
- updateSurfaceBounds();
- }
-
- private void alignTasksToAdjustedBounds(Rect adjustedBounds, Rect tempInsetBounds) {
- if (matchParentBounds()) {
- return;
- }
-
- final boolean alignBottom = mAdjustedForIme && getDockSide() == DOCKED_TOP;
-
- // Update bounds of containing tasks.
- for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; --taskNdx) {
- final Task task = mChildren.get(taskNdx);
- task.alignToAdjustedBounds(adjustedBounds, tempInsetBounds, alignBottom);
- }
- }
-
- @Override
- public int setBounds(Rect bounds) {
- return setBounds(getRequestedOverrideBounds(), bounds);
- }
-
- private int setBounds(Rect existing, Rect bounds) {
- if (equivalentBounds(existing, bounds)) {
- return BOUNDS_CHANGE_NONE;
- }
-
- final int result = super.setBounds(!inMultiWindowMode() ? null : bounds);
-
- updateAdjustedBounds();
-
- updateSurfaceBounds();
- return result;
- }
-
- /** Bounds of the stack without adjusting for other factors in the system like visibility
- * of docked stack.
- * Most callers should be using {@link ConfigurationContainer#getRequestedOverrideBounds} a
- * it takes into consideration other system factors. */
- void getRawBounds(Rect out) {
- out.set(getRawBounds());
- }
-
- private Rect getRawBounds() {
- return super.getBounds();
- }
-
- @Override
- public void getBounds(Rect bounds) {
- bounds.set(getBounds());
- }
-
- @Override
- public Rect getBounds() {
- // If we're currently adjusting for IME or minimized docked stack, we use the adjusted
- // bounds; otherwise, no need to adjust the output bounds if fullscreen or the docked
- // stack is visible since it is already what we want to represent to the rest of the
- // system.
- if (!mAdjustedBounds.isEmpty()) {
- return mAdjustedBounds;
- } else {
- return super.getBounds();
- }
- }
-
- /**
- * Sets the bounds animation target bounds ahead of an animation. This can't currently be done
- * in onAnimationStart() since that is started on the UiThread.
- */
- private void setAnimationFinalBounds(Rect sourceHintBounds, Rect destBounds,
- boolean toFullscreen) {
- if (mAnimationType == BoundsAnimationController.BOUNDS) {
- mBoundsAnimatingRequested = true;
- }
- mBoundsAnimatingToFullscreen = toFullscreen;
- if (destBounds != null) {
- mBoundsAnimationTarget.set(destBounds);
- } else {
- mBoundsAnimationTarget.setEmpty();
- }
- if (sourceHintBounds != null) {
- mBoundsAnimationSourceHintBounds.set(sourceHintBounds);
- } else if (!mBoundsAnimating) {
- // If the bounds are already animating, we don't want to reset the source hint. This is
- // because the source hint is sent when starting the animation from the client that
- // requested to enter pip. Other requests can adjust the pip bounds during an animation,
- // but could accidentally reset the source hint bounds.
- mBoundsAnimationSourceHintBounds.setEmpty();
- }
-
- mPreAnimationBounds.set(getRawBounds());
- }
-
- /**
- * @return the final bounds for the bounds animation.
- */
- void getFinalAnimationBounds(Rect outBounds) {
- outBounds.set(mBoundsAnimationTarget);
- }
-
- /**
- * @return the final source bounds for the bounds animation.
- */
- void getFinalAnimationSourceHintBounds(Rect outBounds) {
- outBounds.set(mBoundsAnimationSourceHintBounds);
- }
-
- /**
- * @return the final animation bounds if the task stack is currently being animated, or the
- * current stack bounds otherwise.
- */
- void getAnimationOrCurrentBounds(Rect outBounds) {
- if ((mBoundsAnimatingRequested || mBoundsAnimating) && !mBoundsAnimationTarget.isEmpty()) {
- getFinalAnimationBounds(outBounds);
- return;
- }
- getBounds(outBounds);
- }
-
- /** Bounds of the stack with other system factors taken into consideration. */
- void getDimBounds(Rect out) {
- getBounds(out);
- }
-
- /**
- * Updates the passed-in {@code inOutBounds} based on the current state of the
- * pinned controller. This gets run *after* the override configuration is updated, so it's
- * safe to rely on the controller's state in here (though eventually this dependence should
- * be removed).
- *
- * This does NOT modify this TaskStack's configuration. However, it does, for the time-being,
- * update pinned controller state.
- *
- * @param inOutBounds the bounds to update (both input and output).
- * @return true if bounds were updated to some non-empty value.
- */
- boolean calculatePinnedBoundsForConfigChange(Rect inOutBounds) {
- boolean animating = false;
- if ((mBoundsAnimatingRequested || mBoundsAnimating) && !mBoundsAnimationTarget.isEmpty()) {
- animating = true;
- getFinalAnimationBounds(mTmpRect2);
- } else {
- mTmpRect2.set(inOutBounds);
- }
- boolean updated = mDisplayContent.mPinnedStackControllerLocked.onTaskStackBoundsChanged(
- mTmpRect2, mTmpRect3);
- if (updated) {
- inOutBounds.set(mTmpRect3);
-
- // The final boundary is updated while there is an existing boundary animation. Let's
- // cancel this animation to prevent the obsolete animation overwritten updated bounds.
- if (animating && !inOutBounds.equals(mBoundsAnimationTarget)) {
- final DisplayContent displayContent = getDisplayContent();
- displayContent.mBoundsAnimationController.getHandler().post(() ->
- displayContent.mBoundsAnimationController.cancel(this));
- }
- // Once we've set the bounds based on the rotation of the old bounds in the new
- // orientation, clear the animation target bounds since they are obsolete, and
- // cancel any currently running animations
- mBoundsAnimationTarget.setEmpty();
- mBoundsAnimationSourceHintBounds.setEmpty();
- mCancelCurrentBoundsAnimation = true;
- }
- return updated;
- }
-
- /**
- * Updates the passed-in {@code inOutBounds} based on the current state of the
- * docked controller. This gets run *after* the override configuration is updated, so it's
- * safe to rely on the controller's state in here (though eventually this dependence should
- * be removed).
- *
- * This does NOT modify this TaskStack's configuration. However, it does, for the time-being,
- * update docked controller state.
- *
- * @param parentConfig the parent configuration for reference.
- * @param inOutBounds the bounds to update (both input and output).
- */
- void calculateDockedBoundsForConfigChange(Configuration parentConfig, Rect inOutBounds) {
- final boolean primary =
- getRequestedOverrideWindowingMode() == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
- repositionSplitScreenStackAfterRotation(parentConfig, primary, inOutBounds);
- final DisplayCutout cutout = mDisplayContent.getDisplayInfo().displayCutout;
- snapDockedStackAfterRotation(parentConfig, cutout, inOutBounds);
- if (primary) {
- final int newDockSide = getDockSide(parentConfig, inOutBounds);
- // Update the dock create mode and clear the dock create bounds, these
- // might change after a rotation and the original values will be invalid.
- mWmService.setDockedStackCreateStateLocked(
- (newDockSide == DOCKED_LEFT || newDockSide == DOCKED_TOP)
- ? SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT
- : SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT,
- null);
- mDisplayContent.getDockedDividerController().notifyDockSideChanged(newDockSide);
- }
- }
-
- /**
- * Some primary split screen sides are not allowed by the policy. This method queries the policy
- * and moves the primary stack around if needed.
- *
- * @param parentConfig the configuration of the stack's parent.
- * @param primary true if adjusting the primary docked stack, false for secondary.
- * @param inOutBounds the bounds of the stack to adjust.
- */
- void repositionSplitScreenStackAfterRotation(Configuration parentConfig, boolean primary,
- Rect inOutBounds) {
- final int dockSide = getDockSide(mDisplayContent, parentConfig, inOutBounds);
- final int otherDockSide = DockedDividerUtils.invertDockSide(dockSide);
- final int primaryDockSide = primary ? dockSide : otherDockSide;
- if (mDisplayContent.getDockedDividerController()
- .canPrimaryStackDockTo(primaryDockSide,
- parentConfig.windowConfiguration.getBounds(),
- parentConfig.windowConfiguration.getRotation())) {
- return;
- }
- final Rect parentBounds = parentConfig.windowConfiguration.getBounds();
- switch (otherDockSide) {
- case DOCKED_LEFT:
- int movement = inOutBounds.left;
- inOutBounds.left -= movement;
- inOutBounds.right -= movement;
- break;
- case DOCKED_RIGHT:
- movement = parentBounds.right - inOutBounds.right;
- inOutBounds.left += movement;
- inOutBounds.right += movement;
- break;
- case DOCKED_TOP:
- movement = inOutBounds.top;
- inOutBounds.top -= movement;
- inOutBounds.bottom -= movement;
- break;
- case DOCKED_BOTTOM:
- movement = parentBounds.bottom - inOutBounds.bottom;
- inOutBounds.top += movement;
- inOutBounds.bottom += movement;
- break;
- }
- }
-
- /**
- * Snaps the bounds after rotation to the closest snap target for the docked stack.
- */
- void snapDockedStackAfterRotation(Configuration parentConfig, DisplayCutout displayCutout,
- Rect outBounds) {
-
- // Calculate the current position.
- final int dividerSize = mDisplayContent.getDockedDividerController().getContentWidth();
- final int dockSide = getDockSide(parentConfig, outBounds);
- final int dividerPosition = DockedDividerUtils.calculatePositionForBounds(outBounds,
- dockSide, dividerSize);
- final int displayWidth = parentConfig.windowConfiguration.getBounds().width();
- final int displayHeight = parentConfig.windowConfiguration.getBounds().height();
-
- // Snap the position to a target.
- final int rotation = parentConfig.windowConfiguration.getRotation();
- final int orientation = parentConfig.orientation;
- mDisplayContent.getDisplayPolicy().getStableInsetsLw(rotation, displayWidth, displayHeight,
- displayCutout, outBounds);
- final DividerSnapAlgorithm algorithm = new DividerSnapAlgorithm(
- mWmService.mContext.getResources(), displayWidth, displayHeight,
- dividerSize, orientation == Configuration.ORIENTATION_PORTRAIT, outBounds,
- getDockSide(), isMinimizedDockAndHomeStackResizable());
- final SnapTarget target = algorithm.calculateNonDismissingSnapTarget(dividerPosition);
-
- // Recalculate the bounds based on the position of the target.
- DockedDividerUtils.calculateBoundsForPosition(target.position, dockSide,
- outBounds, displayWidth, displayHeight,
- dividerSize);
- }
-
- /**
- * Put a Task in this stack. Used for adding only.
- * When task is added to top of the stack, the entire branch of the hierarchy (including stack
- * and display) will be brought to top.
- * @param task The task to add.
- * @param position Target position to add the task to.
- * @param showForAllUsers Whether to show the task regardless of the current user.
- */
- void addChild(Task task, int position, boolean showForAllUsers, boolean moveParents) {
- // Add child task.
- addChild(task, null);
-
- // Move child to a proper position, as some restriction for position might apply.
- position = positionChildAt(
- position, task, moveParents /* includingParents */, showForAllUsers);
- // TODO: Feels like this should go in TaskRecord#onParentChanged
- final boolean toTop = position >= getChildCount();
- task.updateTaskMovement(toTop);
- }
-
- @Override
- void addChild(Task task, int position) {
- addChild(task, position, task.showForAllUsers(), false /* includingParents */);
- }
-
- void positionChildAt(Task child, int position) {
- if (DEBUG_STACK) {
- Slog.i(TAG_WM, "positionChildAt: positioning task=" + child + " at " + position);
- }
- if (child == null) {
- if (DEBUG_STACK) {
- Slog.i(TAG_WM, "positionChildAt: could not find task=" + this);
- }
- return;
- }
- positionChildAt(position, child, false /* includingParents */);
- child.updateTaskMovement(true);
- getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
- }
-
- void positionChildAtTop(Task child, boolean includingParents) {
- if (child == null) {
- // TODO: Fix the call-points that cause this to happen.
- return;
- }
-
- positionChildAt(POSITION_TOP, child, includingParents);
- child.updateTaskMovement(true);
-
- final DisplayContent displayContent = getDisplayContent();
- if (displayContent.mAppTransition.isTransitionSet()) {
- child.setSendingToBottom(false);
- }
- displayContent.layoutAndAssignWindowLayersIfNeeded();
- }
-
- void positionChildAtBottom(Task child, boolean includingParents) {
- if (child == null) {
- // TODO: Fix the call-points that cause this to happen.
- return;
- }
-
- positionChildAt(POSITION_BOTTOM, child, includingParents);
-
- if (getDisplayContent().mAppTransition.isTransitionSet()) {
- child.setSendingToBottom(true);
- }
- getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
- }
-
- @Override
- void positionChildAt(int position, Task child, boolean includingParents) {
- positionChildAt(position, child, includingParents, child.showForAllUsers());
- }
-
- /**
- * Overridden version of {@link TaskStack#positionChildAt(int, Task, boolean)}. Used in
- * {@link TaskStack#addChild(Task, int, boolean showForAllUsers, boolean)}, as it can receive
- * showForAllUsers param from {@link ActivityRecord} instead of {@link Task#showForAllUsers()}.
- */
- private int positionChildAt(int position, Task child, boolean includingParents,
- boolean showForAllUsers) {
- final int targetPosition = findPositionForTask(child, position, showForAllUsers);
- super.positionChildAt(targetPosition, child, includingParents);
-
- // Log positioning.
- if (DEBUG_TASK_MOVEMENT)
- Slog.d(TAG_WM, "positionTask: task=" + this + " position=" + position);
-
- final int toTop = targetPosition == mChildren.size() - 1 ? 1 : 0;
- EventLog.writeEvent(EventLogTags.WM_TASK_MOVED, child.mTaskId, toTop, targetPosition);
-
- return targetPosition;
- }
-
- @Override
- void onChildPositionChanged(WindowContainer child) {
- if (mChildren.contains(child)) {
- ((Task) child).updateTaskMovement(getTopChild() == child);
- }
- }
-
- void reparent(DisplayContent newParent, boolean onTop) {
- // Real parent of stack is within display object, so we have to delegate re-parenting there.
- newParent.moveStackToDisplay(this, onTop);
- }
-
- // TODO: We should really have users as a window container in the hierarchy so that we don't
- // have to do complicated things like we are doing in this method.
- int findPositionForTask(Task task, int targetPosition, boolean showForAllUsers) {
- final boolean canShowTask =
- showForAllUsers || mWmService.isCurrentProfileLocked(task.mUserId);
-
- final int stackSize = mChildren.size();
- int minPosition = 0;
- int maxPosition = stackSize - 1;
-
- if (canShowTask) {
- minPosition = computeMinPosition(minPosition, stackSize);
- } else {
- maxPosition = computeMaxPosition(maxPosition);
- }
-
- // preserve POSITION_BOTTOM/POSITION_TOP positions if they are still valid.
- if (targetPosition == POSITION_BOTTOM && minPosition == 0) {
- return POSITION_BOTTOM;
- } else if (targetPosition == POSITION_TOP && maxPosition == (stackSize - 1)) {
- return POSITION_TOP;
- }
- // Reset position based on minimum/maximum possible positions.
- return Math.min(Math.max(targetPosition, minPosition), maxPosition);
- }
-
- /** Calculate the minimum possible position for a task that can be shown to the user.
- * The minimum position will be above all other tasks that can't be shown.
- * @param minPosition The minimum position the caller is suggesting.
- * We will start adjusting up from here.
- * @param size The size of the current task list.
- */
- private int computeMinPosition(int minPosition, int size) {
- while (minPosition < size) {
- final Task tmpTask = mChildren.get(minPosition);
- final boolean canShowTmpTask =
- tmpTask.showForAllUsers()
- || mWmService.isCurrentProfileLocked(tmpTask.mUserId);
- if (canShowTmpTask) {
- break;
- }
- minPosition++;
- }
- return minPosition;
- }
-
- /** Calculate the maximum possible position for a task that can't be shown to the user.
- * The maximum position will be below all other tasks that can be shown.
- * @param maxPosition The maximum position the caller is suggesting.
- * We will start adjusting down from here.
- */
- private int computeMaxPosition(int maxPosition) {
- while (maxPosition > 0) {
- final Task tmpTask = mChildren.get(maxPosition);
- final boolean canShowTmpTask =
- tmpTask.showForAllUsers()
- || mWmService.isCurrentProfileLocked(tmpTask.mUserId);
- if (!canShowTmpTask) {
- break;
- }
- maxPosition--;
- }
- return maxPosition;
- }
-
- @Override
- public void onConfigurationChanged(Configuration newParentConfig) {
- final int prevWindowingMode = getWindowingMode();
- super.onConfigurationChanged(newParentConfig);
-
- // Only need to update surface size here since the super method will handle updating
- // surface position.
- updateSurfaceSize(getPendingTransaction());
- final int windowingMode = getWindowingMode();
-
- if (mDisplayContent == null) {
- return;
- }
-
- if (prevWindowingMode != windowingMode) {
- mDisplayContent.onStackWindowingModeChanged(this);
-
- if (inSplitScreenSecondaryWindowingMode()) {
- // When the stack is resized due to entering split screen secondary, offset the
- // windows to compensate for the new stack position.
- forAllWindows(w -> {
- w.mWinAnimator.setOffsetPositionForStackResize(true);
- }, true);
- }
- }
- }
-
- private void updateSurfaceBounds() {
- updateSurfaceSize(getPendingTransaction());
- updateSurfacePosition();
- scheduleAnimation();
- }
-
- /**
- * Calculate an amount by which to expand the stack bounds in each direction.
- * Used to make room for shadows in the pinned windowing mode.
- */
- int getStackOutset() {
- DisplayContent displayContent = getDisplayContent();
- if (inPinnedWindowingMode() && displayContent != null) {
- final DisplayMetrics displayMetrics = displayContent.getDisplayMetrics();
-
- // We multiply by two to match the client logic for converting view elevation
- // to insets, as in {@link WindowManager.LayoutParams#setSurfaceInsets}
- return (int)Math.ceil(mWmService.dipToPixel(PINNED_WINDOWING_MODE_ELEVATION_IN_DIP,
- displayMetrics) * 2);
- }
- return 0;
- }
-
- @Override
- void getRelativeDisplayedPosition(Point outPos) {
- super.getRelativeDisplayedPosition(outPos);
- final int outset = getStackOutset();
- outPos.x -= outset;
- outPos.y -= outset;
- }
-
- private void updateSurfaceSize(SurfaceControl.Transaction transaction) {
- if (mSurfaceControl == null) {
- return;
- }
-
- final Rect stackBounds = getDisplayedBounds();
- int width = stackBounds.width();
- int height = stackBounds.height();
-
- final int outset = getStackOutset();
- width += 2*outset;
- height += 2*outset;
-
- if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) {
- return;
- }
- transaction.setWindowCrop(mSurfaceControl, width, height);
- mLastSurfaceSize.set(width, height);
- }
-
- @VisibleForTesting
- Point getLastSurfaceSize() {
- return mLastSurfaceSize;
- }
-
- @Override
- void onDisplayChanged(DisplayContent dc) {
- super.onDisplayChanged(dc);
- updateSurfaceBounds();
- }
-
- /**
- * Determines the stack and task bounds of the other stack when in docked mode. The current task
- * bounds is passed in but depending on the stack, the task and stack must match. Only in
- * minimized mode with resizable launcher, the other stack ignores calculating the stack bounds
- * and uses the task bounds passed in as the stack and task bounds, otherwise the stack bounds
- * is calculated and is also used for its task bounds.
- * If any of the out bounds are empty, it represents default bounds
- *
- * @param currentTempTaskBounds the current task bounds of the other stack
- * @param outStackBounds the calculated stack bounds of the other stack
- * @param outTempTaskBounds the calculated task bounds of the other stack
- */
- void getStackDockedModeBounds(Rect dockedBounds,
- Rect currentTempTaskBounds, Rect outStackBounds, Rect outTempTaskBounds) {
- final Configuration parentConfig = getParent().getConfiguration();
- outTempTaskBounds.setEmpty();
-
- if (dockedBounds == null || dockedBounds.isEmpty()) {
- // Calculate the primary docked bounds.
- final boolean dockedOnTopOrLeft = mWmService.mDockedStackCreateMode
- == SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
- getStackDockedModeBounds(parentConfig,
- true /* primary */, outStackBounds, dockedBounds,
- mDisplayContent.mDividerControllerLocked.getContentWidth(), dockedOnTopOrLeft);
- return;
- }
- final int dockedSide = getDockSide(parentConfig, dockedBounds);
-
- // When the home stack is resizable, should always have the same stack and task bounds
- if (isActivityTypeHome()) {
- final Task homeTask = findHomeTask();
- if (homeTask == null || homeTask.isResizeable()) {
- // Calculate the home stack bounds when in docked mode and the home stack is
- // resizeable.
- getDisplayContent().mDividerControllerLocked
- .getHomeStackBoundsInDockedMode(parentConfig,
- dockedSide, outStackBounds);
- } else {
- // Home stack isn't resizeable, so don't specify stack bounds.
- outStackBounds.setEmpty();
- }
-
- outTempTaskBounds.set(outStackBounds);
- return;
- }
-
- // When minimized state, the stack bounds for all non-home and docked stack bounds should
- // match the passed task bounds
- if (isMinimizedDockAndHomeStackResizable() && currentTempTaskBounds != null) {
- outStackBounds.set(currentTempTaskBounds);
- return;
- }
-
- if (dockedSide == DOCKED_INVALID) {
- // Not sure how you got here...Only thing we can do is return current bounds.
- Slog.e(TAG_WM, "Failed to get valid docked side for docked stack");
- outStackBounds.set(getRawBounds());
- return;
- }
-
- final boolean dockedOnTopOrLeft = dockedSide == DOCKED_TOP || dockedSide == DOCKED_LEFT;
- getStackDockedModeBounds(parentConfig,
- false /* primary */, outStackBounds, dockedBounds,
- mDisplayContent.mDividerControllerLocked.getContentWidth(), dockedOnTopOrLeft);
- }
-
- /**
- * Outputs the bounds a stack should be given the presence of a docked stack on the display.
- * @param parentConfig The parent configuration.
- * @param primary {@code true} if getting the primary stack bounds.
- * @param outBounds Output bounds that should be used for the stack.
- * @param dockedBounds Bounds of the docked stack.
- * @param dockDividerWidth We need to know the width of the divider make to the output bounds
- * close to the side of the dock.
- * @param dockOnTopOrLeft If the docked stack is on the top or left side of the screen.
- */
- private void getStackDockedModeBounds(Configuration parentConfig, boolean primary,
- Rect outBounds, Rect dockedBounds, int dockDividerWidth,
- boolean dockOnTopOrLeft) {
- final Rect displayRect = parentConfig.windowConfiguration.getBounds();
- final boolean splitHorizontally = displayRect.width() > displayRect.height();
-
- outBounds.set(displayRect);
- if (primary) {
- if (mWmService.mDockedStackCreateBounds != null) {
- outBounds.set(mWmService.mDockedStackCreateBounds);
- return;
- }
-
- // The initial bounds of the docked stack when it is created about half the screen space
- // and its bounds can be adjusted after that. The bounds of all other stacks are
- // adjusted to occupy whatever screen space the docked stack isn't occupying.
- final DisplayCutout displayCutout = mDisplayContent.getDisplayInfo().displayCutout;
- mDisplayContent.getDisplayPolicy().getStableInsetsLw(
- parentConfig.windowConfiguration.getRotation(),
- displayRect.width(), displayRect.height(), displayCutout, mTmpRect2);
- final int position = new DividerSnapAlgorithm(mWmService.mContext.getResources(),
- displayRect.width(),
- displayRect.height(),
- dockDividerWidth,
- parentConfig.orientation == ORIENTATION_PORTRAIT,
- mTmpRect2).getMiddleTarget().position;
-
- if (dockOnTopOrLeft) {
- if (splitHorizontally) {
- outBounds.right = position;
- } else {
- outBounds.bottom = position;
- }
- } else {
- if (splitHorizontally) {
- outBounds.left = position + dockDividerWidth;
- } else {
- outBounds.top = position + dockDividerWidth;
- }
- }
- return;
- }
-
- // Other stacks occupy whatever space is left by the docked stack.
- if (!dockOnTopOrLeft) {
- if (splitHorizontally) {
- outBounds.right = dockedBounds.left - dockDividerWidth;
- } else {
- outBounds.bottom = dockedBounds.top - dockDividerWidth;
- }
- } else {
- if (splitHorizontally) {
- outBounds.left = dockedBounds.right + dockDividerWidth;
- } else {
- outBounds.top = dockedBounds.bottom + dockDividerWidth;
- }
- }
- DockedDividerUtils.sanitizeStackBounds(outBounds, !dockOnTopOrLeft);
- }
-
- void resetDockedStackToMiddle() {
- if (!inSplitScreenPrimaryWindowingMode()) {
- throw new IllegalStateException("Not a docked stack=" + this);
- }
-
- mWmService.mDockedStackCreateBounds = null;
-
- final Rect bounds = new Rect();
- final Rect tempBounds = new Rect();
- getStackDockedModeBounds(null /* dockedBounds */, null /* currentTempTaskBounds */,
- bounds, tempBounds);
- // TODO(stack-merge): remove cast.
- ((ActivityStack) this).mStackSupervisor.resizeDockedStackLocked(bounds,
- null /* tempTaskBounds */,
- null /* tempTaskInsetBounds */, null /* tempOtherTaskBounds */,
- null /* tempOtherTaskInsetBounds */, false /* preserveWindows */,
- false /* deferResume */);
- }
-
- @Override
- void removeIfPossible() {
- if (isAnimating(TRANSITION | CHILDREN)) {
- mDeferRemoval = true;
- return;
- }
- removeImmediately();
- }
-
- @Override
- // TODO(stack-merge): This is mostly taking care of the case where the stask is removing from
- // the display, so we should probably consolidate it there instead.
- void onParentChanged(ConfigurationContainer newParent, ConfigurationContainer oldParent) {
- super.onParentChanged(newParent, oldParent);
-
- if (getParent() != null || mDisplayContent == null) {
- return;
- }
-
- EventLog.writeEvent(EventLogTags.WM_STACK_REMOVED, mStackId);
-
- mDisplayContent = null;
- mWmService.mWindowPlacerLocked.requestTraversal();
- }
-
- /**
- * Adjusts the stack bounds if the IME is visible.
- *
- * @param imeWin The IME window.
- * @param keepLastAmount Use {@code true} to keep the last adjusted amount from
- * {@link DockedStackDividerController} for adjusting the stack bounds,
- * Use {@code false} to reset adjusted amount as 0.
- * @see #updateAdjustForIme(float, float, boolean)
- */
- void setAdjustedForIme(WindowState imeWin, boolean keepLastAmount) {
- mImeWin = imeWin;
- mImeGoingAway = false;
- if (!mAdjustedForIme || keepLastAmount) {
- mAdjustedForIme = true;
- DockedStackDividerController controller = getDisplayContent().mDividerControllerLocked;
- final float adjustImeAmount = keepLastAmount ? controller.mLastAnimationProgress : 0f;
- final float adjustDividerAmount = keepLastAmount ? controller.mLastDividerProgress : 0f;
- updateAdjustForIme(adjustImeAmount, adjustDividerAmount, true /* force */);
- }
- }
-
- boolean isAdjustedForIme() {
- return mAdjustedForIme;
- }
-
- boolean isAnimatingForIme() {
- return mImeWin != null && mImeWin.isAnimatingLw();
- }
-
- /**
- * Update the stack's bounds (crop or position) according to the IME window's
- * current position. When IME window is animated, the bottom stack is animated
- * together to track the IME window's current position, and the top stack is
- * cropped as necessary.
- *
- * @return true if a traversal should be performed after the adjustment.
- */
- boolean updateAdjustForIme(float adjustAmount, float adjustDividerAmount, boolean force) {
- if (adjustAmount != mAdjustImeAmount
- || adjustDividerAmount != mAdjustDividerAmount || force) {
- mAdjustImeAmount = adjustAmount;
- mAdjustDividerAmount = adjustDividerAmount;
- updateAdjustedBounds();
- return isVisible();
- } else {
- return false;
- }
- }
-
- /**
- * Resets the adjustment after it got adjusted for the IME.
- * @param adjustBoundsNow if true, reset and update the bounds immediately and forget about
- * animations; otherwise, set flag and animates the window away together
- * with IME window.
- */
- void resetAdjustedForIme(boolean adjustBoundsNow) {
- if (adjustBoundsNow) {
- mImeWin = null;
- mImeGoingAway = false;
- mAdjustImeAmount = 0f;
- mAdjustDividerAmount = 0f;
- if (!mAdjustedForIme) {
- return;
- }
- mAdjustedForIme = false;
- updateAdjustedBounds();
- mWmService.setResizeDimLayer(false, getWindowingMode(), 1.0f);
- } else {
- mImeGoingAway |= mAdjustedForIme;
- }
- }
-
- /**
- * Sets the amount how much we currently minimize our stack.
- *
- * @param minimizeAmount The amount, between 0 and 1.
- * @return Whether the amount has changed and a layout is needed.
- */
- boolean setAdjustedForMinimizedDock(float minimizeAmount) {
- if (minimizeAmount != mMinimizeAmount) {
- mMinimizeAmount = minimizeAmount;
- updateAdjustedBounds();
- return isVisible();
- } else {
- return false;
- }
- }
-
- boolean shouldIgnoreInput() {
- return isAdjustedForMinimizedDockedStack() ||
- (inSplitScreenPrimaryWindowingMode() && isMinimizedDockAndHomeStackResizable());
- }
-
- /**
- * Puts all visible tasks that are adjusted for IME into resizing mode and adds the windows
- * to the list of to be drawn windows the service is waiting for.
- */
- void beginImeAdjustAnimation() {
- for (int j = mChildren.size() - 1; j >= 0; j--) {
- final Task task = mChildren.get(j);
- if (task.hasContentToDisplay()) {
- task.setDragResizing(true, DRAG_RESIZE_MODE_DOCKED_DIVIDER);
- task.setWaitingForDrawnIfResizingChanged();
- }
- }
- }
-
- /**
- * Resets the resizing state of all windows.
- */
- void endImeAdjustAnimation() {
- for (int j = mChildren.size() - 1; j >= 0; j--) {
- mChildren.get(j).setDragResizing(false, DRAG_RESIZE_MODE_DOCKED_DIVIDER);
- }
- }
-
- int getMinTopStackBottom(final Rect displayContentRect, int originalStackBottom) {
- return displayContentRect.top + (int)
- ((originalStackBottom - displayContentRect.top) * ADJUSTED_STACK_FRACTION_MIN);
- }
-
- private boolean adjustForIME(final WindowState imeWin) {
- // To prevent task stack resize animation may flicking when playing app transition
- // animation & IME window enter animation in parallel, we need to make sure app
- // transition is done and then adjust task size for IME, skip the new adjusted frame when
- // app transition is still running.
- if (getDisplayContent().mAppTransition.isRunning()) {
- return false;
- }
-
- final int dockedSide = getDockSide();
- final boolean dockedTopOrBottom = dockedSide == DOCKED_TOP || dockedSide == DOCKED_BOTTOM;
- if (imeWin == null || !dockedTopOrBottom) {
- return false;
- }
-
- final Rect displayStableRect = mTmpRect;
- final Rect contentBounds = mTmpRect2;
-
- // Calculate the content bounds excluding the area occupied by IME
- getDisplayContent().getStableRect(displayStableRect);
- contentBounds.set(displayStableRect);
- int imeTop = Math.max(imeWin.getFrameLw().top, contentBounds.top);
-
- imeTop += imeWin.getGivenContentInsetsLw().top;
- if (contentBounds.bottom > imeTop) {
- contentBounds.bottom = imeTop;
- }
-
- final int yOffset = displayStableRect.bottom - contentBounds.bottom;
-
- final int dividerWidth =
- getDisplayContent().mDividerControllerLocked.getContentWidth();
- final int dividerWidthInactive =
- getDisplayContent().mDividerControllerLocked.getContentWidthInactive();
-
- if (dockedSide == DOCKED_TOP) {
- // If this stack is docked on top, we make it smaller so the bottom stack is not
- // occluded by IME. We shift its bottom up by the height of the IME, but
- // leaves at least 30% of the top stack visible.
- final int minTopStackBottom =
- getMinTopStackBottom(displayStableRect, getRawBounds().bottom);
- final int bottom = Math.max(
- getRawBounds().bottom - yOffset + dividerWidth - dividerWidthInactive,
- minTopStackBottom);
- mTmpAdjustedBounds.set(getRawBounds());
- mTmpAdjustedBounds.bottom = (int) (mAdjustImeAmount * bottom + (1 - mAdjustImeAmount)
- * getRawBounds().bottom);
- mFullyAdjustedImeBounds.set(getRawBounds());
- } else {
- // When the stack is on bottom and has no focus, it's only adjusted for divider width.
- final int dividerWidthDelta = dividerWidthInactive - dividerWidth;
-
- // When the stack is on bottom and has focus, it needs to be moved up so as to
- // not occluded by IME, and at the same time adjusted for divider width.
- // We try to move it up by the height of the IME window, but only to the extent
- // that leaves at least 30% of the top stack visible.
- // 'top' is where the top of bottom stack will move to in this case.
- final int topBeforeImeAdjust =
- getRawBounds().top - dividerWidth + dividerWidthInactive;
- final int minTopStackBottom =
- getMinTopStackBottom(displayStableRect,
- getRawBounds().top - dividerWidth);
- final int top = Math.max(
- getRawBounds().top - yOffset, minTopStackBottom + dividerWidthInactive);
-
- mTmpAdjustedBounds.set(getRawBounds());
- // Account for the adjustment for IME and divider width separately.
- // (top - topBeforeImeAdjust) is the amount of movement due to IME only,
- // and dividerWidthDelta is due to divider width change only.
- mTmpAdjustedBounds.top = getRawBounds().top +
- (int) (mAdjustImeAmount * (top - topBeforeImeAdjust) +
- mAdjustDividerAmount * dividerWidthDelta);
- mFullyAdjustedImeBounds.set(getRawBounds());
- mFullyAdjustedImeBounds.top = top;
- mFullyAdjustedImeBounds.bottom = top + getRawBounds().height();
- }
- return true;
- }
-
- private boolean adjustForMinimizedDockedStack(float minimizeAmount) {
- final int dockSide = getDockSide();
- if (dockSide == DOCKED_INVALID && !mTmpAdjustedBounds.isEmpty()) {
- return false;
- }
-
- if (dockSide == DOCKED_TOP) {
- mWmService.getStableInsetsLocked(DEFAULT_DISPLAY, mTmpRect);
- int topInset = mTmpRect.top;
- mTmpAdjustedBounds.set(getRawBounds());
- mTmpAdjustedBounds.bottom = (int) (minimizeAmount * topInset + (1 - minimizeAmount)
- * getRawBounds().bottom);
- } else if (dockSide == DOCKED_LEFT) {
- mTmpAdjustedBounds.set(getRawBounds());
- final int width = getRawBounds().width();
- mTmpAdjustedBounds.right =
- (int) (minimizeAmount * mDockedStackMinimizeThickness
- + (1 - minimizeAmount) * getRawBounds().right);
- mTmpAdjustedBounds.left = mTmpAdjustedBounds.right - width;
- } else if (dockSide == DOCKED_RIGHT) {
- mTmpAdjustedBounds.set(getRawBounds());
- mTmpAdjustedBounds.left = (int) (minimizeAmount *
- (getRawBounds().right - mDockedStackMinimizeThickness)
- + (1 - minimizeAmount) * getRawBounds().left);
- }
- return true;
- }
-
- private boolean isMinimizedDockAndHomeStackResizable() {
- return mDisplayContent.mDividerControllerLocked.isMinimizedDock()
- && mDisplayContent.mDividerControllerLocked.isHomeStackResizable();
- }
-
- /**
- * @return the distance in pixels how much the stack gets minimized from it's original size
- */
- int getMinimizeDistance() {
- final int dockSide = getDockSide();
- if (dockSide == DOCKED_INVALID) {
- return 0;
- }
-
- if (dockSide == DOCKED_TOP) {
- mWmService.getStableInsetsLocked(DEFAULT_DISPLAY, mTmpRect);
- int topInset = mTmpRect.top;
- return getRawBounds().bottom - topInset;
- } else if (dockSide == DOCKED_LEFT || dockSide == DOCKED_RIGHT) {
- return getRawBounds().width() - mDockedStackMinimizeThickness;
- } else {
- return 0;
- }
- }
-
- /**
- * Updates the adjustment depending on it's current state.
- */
- private void updateAdjustedBounds() {
- boolean adjust = false;
- if (mMinimizeAmount != 0f) {
- adjust = adjustForMinimizedDockedStack(mMinimizeAmount);
- } else if (mAdjustedForIme) {
- adjust = adjustForIME(mImeWin);
- }
- if (!adjust) {
- mTmpAdjustedBounds.setEmpty();
- }
- setAdjustedBounds(mTmpAdjustedBounds);
-
- final boolean isImeTarget = (mWmService.getImeFocusStackLocked() == this);
- if (mAdjustedForIme && adjust && !isImeTarget) {
- final float alpha = Math.max(mAdjustImeAmount, mAdjustDividerAmount)
- * IME_ADJUST_DIM_AMOUNT;
- mWmService.setResizeDimLayer(true, getWindowingMode(), alpha);
- }
- }
-
- void applyAdjustForImeIfNeeded(Task task) {
- if (mMinimizeAmount != 0f || !mAdjustedForIme || mAdjustedBounds.isEmpty()) {
- return;
- }
-
- final Rect insetBounds = mImeGoingAway ? getRawBounds() : mFullyAdjustedImeBounds;
- task.alignToAdjustedBounds(mAdjustedBounds, insetBounds, getDockSide() == DOCKED_TOP);
- mDisplayContent.setLayoutNeeded();
- }
-
-
- boolean isAdjustedForMinimizedDockedStack() {
- return mMinimizeAmount != 0f;
- }
-
- /**
- * @return {@code true} if we have a {@link Task} that is animating (currently only used for the
- * recents animation); {@code false} otherwise.
- */
- boolean isTaskAnimating() {
- for (int j = mChildren.size() - 1; j >= 0; j--) {
- final Task task = mChildren.get(j);
- if (task.isTaskAnimating()) {
- return true;
- }
- }
- return false;
- }
-
- // TODO(proto-merge): Remove once protos for ActivityStack and TaskStack are merged.
- void writeToProtoInnerStackOnly(ProtoOutputStream proto, long fieldId,
- @WindowTraceLogLevel int logLevel) {
- if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
- return;
- }
-
- final long token = proto.start(fieldId);
- super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
- proto.write(ID, mStackId);
- for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) {
- mChildren.get(taskNdx).writeToProtoInnerTaskOnly(proto, TASKS, logLevel);
- }
- proto.write(FILLS_PARENT, matchParentBounds());
- getRawBounds().writeToProto(proto, BOUNDS);
- proto.write(DEFER_REMOVAL, mDeferRemoval);
- proto.write(MINIMIZE_AMOUNT, mMinimizeAmount);
- proto.write(ADJUSTED_FOR_IME, mAdjustedForIme);
- proto.write(ADJUST_IME_AMOUNT, mAdjustImeAmount);
- proto.write(ADJUST_DIVIDER_AMOUNT, mAdjustDividerAmount);
- mAdjustedBounds.writeToProto(proto, ADJUSTED_BOUNDS);
- proto.write(ANIMATING_BOUNDS, mBoundsAnimating);
- proto.end(token);
- }
-
- @Override
- void dump(PrintWriter pw, String prefix, boolean dumpAll) {
- pw.println(prefix + "mStackId=" + mStackId);
- pw.println(prefix + "mDeferRemoval=" + mDeferRemoval);
- pw.println(prefix + "mBounds=" + getRawBounds().toShortString());
- if (mMinimizeAmount != 0f) {
- pw.println(prefix + "mMinimizeAmount=" + mMinimizeAmount);
- }
- if (mAdjustedForIme) {
- pw.println(prefix + "mAdjustedForIme=true");
- pw.println(prefix + "mAdjustImeAmount=" + mAdjustImeAmount);
- pw.println(prefix + "mAdjustDividerAmount=" + mAdjustDividerAmount);
- }
- if (!mAdjustedBounds.isEmpty()) {
- pw.println(prefix + "mAdjustedBounds=" + mAdjustedBounds.toShortString());
- }
- for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) {
- mChildren.get(taskNdx).dump(pw, prefix + " ", dumpAll);
- }
- if (!mExitingActivities.isEmpty()) {
- pw.println();
- pw.println(" Exiting application tokens:");
- for (int i = mExitingActivities.size() - 1; i >= 0; i--) {
- WindowToken token = mExitingActivities.get(i);
- pw.print(" Exiting App #"); pw.print(i);
- pw.print(' '); pw.print(token);
- pw.println(':');
- token.dump(pw, " ", dumpAll);
- }
- }
- mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix);
- }
-
- @Override
- boolean fillsParent() {
- return matchParentBounds();
- }
-
- String getName() {
- return toShortString();
- }
-
- public String toShortString() {
- return "Stack=" + mStackId;
- }
-
- /**
- * For docked workspace (or workspace that's side-by-side to the docked), provides
- * information which side of the screen was the dock anchored.
- */
- int getDockSide() {
- return getDockSide(mDisplayContent.getConfiguration(), getRawBounds());
- }
-
- int getDockSideForDisplay(DisplayContent dc) {
- return getDockSide(dc, dc.getConfiguration(), getRawBounds());
- }
-
- int getDockSide(Configuration parentConfig, Rect bounds) {
- if (mDisplayContent == null) {
- return DOCKED_INVALID;
- }
- return getDockSide(mDisplayContent, parentConfig, bounds);
- }
-
- private int getDockSide(DisplayContent dc, Configuration parentConfig, Rect bounds) {
- return dc.getDockedDividerController().getDockSide(bounds,
- parentConfig.windowConfiguration.getBounds(),
- parentConfig.orientation, parentConfig.windowConfiguration.getRotation());
- }
-
- boolean hasTaskForUser(int userId) {
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final Task task = mChildren.get(i);
- if (task.mUserId == userId) {
- return true;
- }
- }
- return false;
- }
-
- void findTaskForResizePoint(int x, int y, int delta,
- DisplayContent.TaskForResizePointSearchResult results) {
- if (!getWindowConfiguration().canResizeTask()) {
- results.searchDone = true;
- return;
- }
-
- for (int i = mChildren.size() - 1; i >= 0; --i) {
- final Task task = mChildren.get(i);
- if (task.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {
- results.searchDone = true;
- return;
- }
-
- // We need to use the task's dim bounds (which is derived from the visible bounds of
- // its apps windows) for any touch-related tests. Can't use the task's original
- // bounds because it might be adjusted to fit the content frame. One example is when
- // the task is put to top-left quadrant, the actual visible area would not start at
- // (0,0) after it's adjusted for the status bar.
- task.getDimBounds(mTmpRect);
- mTmpRect.inset(-delta, -delta);
- if (mTmpRect.contains(x, y)) {
- mTmpRect.inset(delta, delta);
-
- results.searchDone = true;
-
- if (!mTmpRect.contains(x, y)) {
- results.taskForResize = task;
- return;
- }
- // User touched inside the task. No need to look further,
- // focus transfer will be handled in ACTION_UP.
- return;
- }
- }
- }
-
- void setTouchExcludeRegion(Task focusedTask, int delta, Region touchExcludeRegion,
- Rect contentRect, Rect postExclude) {
- for (int i = mChildren.size() - 1; i >= 0; --i) {
- final Task task = mChildren.get(i);
- ActivityRecord topVisibleActivity = task.getTopVisibleActivity();
- if (topVisibleActivity == null || !topVisibleActivity.hasContentToDisplay()) {
- continue;
- }
-
- /**
- * Exclusion region is the region that TapDetector doesn't care about.
- * Here we want to remove all non-focused tasks from the exclusion region.
- * We also remove the outside touch area for resizing for all freeform
- * tasks (including the focused).
- *
- * We save the focused task region once we find it, and add it back at the end.
- *
- * If the task is home stack and it is resizable in the minimized state, we want to
- * exclude the docked stack from touch so we need the entire screen area and not just a
- * small portion which the home stack currently is resized to.
- */
-
- if (task.isActivityTypeHome() && isMinimizedDockAndHomeStackResizable()) {
- mDisplayContent.getBounds(mTmpRect);
- } else {
- task.getDimBounds(mTmpRect);
- }
-
- if (task == focusedTask) {
- // Add the focused task rect back into the exclude region once we are done
- // processing stacks.
- postExclude.set(mTmpRect);
- }
-
- final boolean isFreeformed = task.inFreeformWindowingMode();
- if (task != focusedTask || isFreeformed) {
- if (isFreeformed) {
- // If the task is freeformed, enlarge the area to account for outside
- // touch area for resize.
- mTmpRect.inset(-delta, -delta);
- // Intersect with display content rect. If we have system decor (status bar/
- // navigation bar), we want to exclude that from the tap detection.
- // Otherwise, if the app is partially placed under some system button (eg.
- // Recents, Home), pressing that button would cause a full series of
- // unwanted transfer focus/resume/pause, before we could go home.
- mTmpRect.intersect(contentRect);
- }
- touchExcludeRegion.op(mTmpRect, Region.Op.DIFFERENCE);
- }
- }
- }
-
- public boolean setPinnedStackSize(Rect stackBounds, Rect tempTaskBounds) {
- // Hold the lock since this is called from the BoundsAnimator running on the UiThread
- synchronized (mWmService.mGlobalLock) {
- if (mCancelCurrentBoundsAnimation) {
- return false;
- }
- }
-
- try {
- mWmService.mActivityTaskManager.resizePinnedStack(stackBounds, tempTaskBounds);
- } catch (RemoteException e) {
- // I don't believe you.
- }
- return true;
- }
-
- void onAllWindowsDrawn() {
- if (!mBoundsAnimating && !mBoundsAnimatingRequested) {
- return;
- }
-
- getDisplayContent().mBoundsAnimationController.onAllWindowsDrawn();
- }
-
- @Override // AnimatesBounds
- public boolean onAnimationStart(boolean schedulePipModeChangedCallback, boolean forceUpdate,
- @BoundsAnimationController.AnimationType int animationType) {
- // Hold the lock since this is called from the BoundsAnimator running on the UiThread
- synchronized (mWmService.mGlobalLock) {
- if (!isAttached()) {
- // Don't run the animation if the stack is already detached
- return false;
- }
-
- if (animationType == BoundsAnimationController.BOUNDS) {
- mBoundsAnimatingRequested = false;
- mBoundsAnimating = true;
- }
- mAnimationType = animationType;
-
- // If we are changing UI mode, as in the PiP to fullscreen
- // transition, then we need to wait for the window to draw.
- if (schedulePipModeChangedCallback) {
- forAllWindows((w) -> { w.mWinAnimator.resetDrawState(); },
- false /* traverseTopToBottom */);
- }
- }
-
- if (inPinnedWindowingMode()) {
- try {
- mWmService.mActivityTaskManager.notifyPinnedStackAnimationStarted();
- } catch (RemoteException e) {
- // I don't believe you...
- }
-
- if ((schedulePipModeChangedCallback || animationType == FADE_IN)) {
- // We need to schedule the PiP mode change before the animation up. It is possible
- // in this case for the animation down to not have been completed, so always
- // force-schedule and update to the client to ensure that it is notified that it
- // is no longer in picture-in-picture mode
- // TODO(stack-merge): Remove cast.
- ((ActivityStack) this).updatePictureInPictureModeForPinnedStackAnimation(null,
- forceUpdate);
- }
- }
- return true;
- }
-
- @Override // AnimatesBounds
- public void onAnimationEnd(boolean schedulePipModeChangedCallback, Rect finalStackSize,
- boolean moveToFullscreen) {
- synchronized (mWmService.mGlobalLock) {
- if (inPinnedWindowingMode()) {
- // Update to the final bounds if requested. This is done here instead of in the
- // bounds animator to allow us to coordinate this after we notify the PiP mode changed
-
- if (schedulePipModeChangedCallback) {
- // We need to schedule the PiP mode change after the animation down, so use the
- // final bounds
- // TODO(stack-merge): Remove cast.
- ((ActivityStack) this).updatePictureInPictureModeForPinnedStackAnimation(
- mBoundsAnimationTarget, false /* forceUpdate */);
- }
-
- if (mAnimationType == BoundsAnimationController.FADE_IN) {
- setPinnedStackAlpha(1f);
- mWmService.mAtmService.notifyPinnedStackAnimationEnded();
- return;
- }
-
- if (finalStackSize != null && !mCancelCurrentBoundsAnimation) {
- setPinnedStackSize(finalStackSize, null);
- } else {
- // We have been canceled, so the final stack size is null, still run the
- // animation-end logic
- onPipAnimationEndResize();
- }
-
- mWmService.mAtmService.notifyPinnedStackAnimationEnded();
- if (moveToFullscreen) {
- ((ActivityStack) this).dismissPip();
- }
- } else {
- // No PiP animation, just run the normal animation-end logic
- onPipAnimationEndResize();
- }
- }
- }
-
- /**
- * Animates the pinned stack.
- */
- void animateResizePinnedStack(Rect toBounds, Rect sourceHintBounds,
- int animationDuration, boolean fromFullscreen) {
- if (!inPinnedWindowingMode()) {
- return;
- }
- // Get the from-bounds
- final Rect fromBounds = new Rect();
- getBounds(fromBounds);
-
- // Get non-null fullscreen to-bounds for animating if the bounds are null
- @SchedulePipModeChangedState int schedulePipModeChangedState =
- NO_PIP_MODE_CHANGED_CALLBACKS;
- final boolean toFullscreen = toBounds == null;
- if (toFullscreen) {
- if (fromFullscreen) {
- throw new IllegalArgumentException("Should not defer scheduling PiP mode"
- + " change on animation to fullscreen.");
- }
- schedulePipModeChangedState = SCHEDULE_PIP_MODE_CHANGED_ON_START;
-
- mWmService.getStackBounds(
- WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mTmpToBounds);
- if (!mTmpToBounds.isEmpty()) {
- // If there is a fullscreen bounds, use that
- toBounds = new Rect(mTmpToBounds);
- } else {
- // Otherwise, use the display bounds
- toBounds = new Rect();
- getDisplayContent().getBounds(toBounds);
- }
- } else if (fromFullscreen) {
- schedulePipModeChangedState = SCHEDULE_PIP_MODE_CHANGED_ON_END;
- }
-
- setAnimationFinalBounds(sourceHintBounds, toBounds, toFullscreen);
-
- final Rect finalToBounds = toBounds;
- final @SchedulePipModeChangedState int finalSchedulePipModeChangedState =
- schedulePipModeChangedState;
- final DisplayContent displayContent = getDisplayContent();
- @BoundsAnimationController.AnimationType int intendedAnimationType =
- displayContent.mBoundsAnimationController.getAnimationType();
- if (intendedAnimationType == FADE_IN) {
- if (fromFullscreen) {
- setPinnedStackAlpha(0f);
- }
- if (toBounds.width() == fromBounds.width()
- && toBounds.height() == fromBounds.height()) {
- intendedAnimationType = BoundsAnimationController.BOUNDS;
- } else if (!fromFullscreen && !toBounds.equals(fromBounds)) {
- // intendedAnimationType may have been reset at the end of RecentsAnimation,
- // force it to BOUNDS type if we know for certain we're animating to
- // a different bounds, especially for expand and collapse of PiP window.
- intendedAnimationType = BoundsAnimationController.BOUNDS;
- }
- }
-
- final @BoundsAnimationController.AnimationType int animationType = intendedAnimationType;
- mCancelCurrentBoundsAnimation = false;
- displayContent.mBoundsAnimationController.getHandler().post(() -> {
- displayContent.mBoundsAnimationController.animateBounds(this, fromBounds,
- finalToBounds, animationDuration, finalSchedulePipModeChangedState,
- fromFullscreen, toFullscreen, animationType);
- });
- }
-
- /**
- * Sets the current picture-in-picture aspect ratio.
- */
- void setPictureInPictureAspectRatio(float aspectRatio) {
- if (!mWmService.mAtmService.mSupportsPictureInPicture) {
- return;
- }
-
- final DisplayContent displayContent = getDisplayContent();
- if (displayContent == null) {
- return;
- }
-
- if (!inPinnedWindowingMode()) {
- return;
- }
-
- final PinnedStackController pinnedStackController =
- getDisplayContent().getPinnedStackController();
-
- if (Float.compare(aspectRatio, pinnedStackController.getAspectRatio()) == 0) {
- return;
- }
-
- // Notify the pinned stack controller about aspect ratio change.
- // This would result a callback delivered from SystemUI to WM to start animation,
- // if the bounds are ought to be altered due to aspect ratio change.
- pinnedStackController.setAspectRatio(
- pinnedStackController.isValidPictureInPictureAspectRatio(aspectRatio)
- ? aspectRatio : -1f);
- }
-
- /**
- * Sets the current picture-in-picture actions.
- */
- void setPictureInPictureActions(List<RemoteAction> actions) {
- if (!mWmService.mAtmService.mSupportsPictureInPicture) {
- return;
- }
-
- if (!inPinnedWindowingMode()) {
- return;
- }
-
- getDisplayContent().getPinnedStackController().setActions(actions);
- }
-
- /** Called immediately prior to resizing the tasks at the end of the pinned stack animation. */
- void onPipAnimationEndResize() {
- mBoundsAnimating = false;
- for (int i = 0; i < mChildren.size(); i++) {
- final Task t = mChildren.get(i);
- t.clearPreserveNonFloatingState();
- }
- mWmService.requestTraversal();
- }
-
- @Override
- public boolean shouldDeferStartOnMoveToFullscreen() {
- synchronized (mWmService.mGlobalLock) {
- if (!isAttached()) {
- // Unnecessary to pause the animation because the stack is detached.
- return false;
- }
-
- // Workaround for the recents animation -- normally we need to wait for the new activity
- // to show before starting the PiP animation, but because we start and show the home
- // activity early for the recents animation prior to the PiP animation starting, there
- // is no subsequent all-drawn signal. In this case, we can skip the pause when the home
- // stack is already visible and drawn.
- final TaskStack homeStack = mDisplayContent.getHomeStack();
- if (homeStack == null) {
- return true;
- }
- final Task homeTask = homeStack.getTopChild();
- if (homeTask == null) {
- return true;
- }
- final ActivityRecord homeApp = homeTask.getTopVisibleActivity();
- if (!homeTask.isVisible() || homeApp == null) {
- return true;
- }
- return !homeApp.allDrawn;
- }
- }
-
- /**
- * @return True if we are currently animating the pinned stack from fullscreen to non-fullscreen
- * bounds and we have a deferred PiP mode changed callback set with the animation.
- */
- public boolean deferScheduleMultiWindowModeChanged() {
- if (inPinnedWindowingMode()) {
- // For the pinned stack, the deferring of the multi-window mode changed is tied to the
- // transition animation into picture-in-picture, and is called once the animation
- // completes, or is interrupted in a way that would leave the stack in a non-fullscreen
- // state.
- // @see BoundsAnimationController
- // @see BoundsAnimationControllerTests
- return (mBoundsAnimatingRequested || mBoundsAnimating);
- }
- return false;
- }
-
- public boolean isForceScaled() {
- return mBoundsAnimating;
- }
-
- public boolean isAnimatingBounds() {
- return mBoundsAnimating;
- }
-
- public boolean lastAnimatingBoundsWasToFullscreen() {
- return mBoundsAnimatingToFullscreen;
- }
-
- public boolean isAnimatingBoundsToFullscreen() {
- return isAnimatingBounds() && lastAnimatingBoundsWasToFullscreen();
- }
-
- public boolean pinnedStackResizeDisallowed() {
- if (mBoundsAnimating && mCancelCurrentBoundsAnimation) {
- return true;
- }
- return false;
- }
-
- /** Returns true if a removal action is still being deferred. */
- boolean checkCompleteDeferredRemoval() {
- if (isAnimating(TRANSITION | CHILDREN)) {
- return true;
- }
- if (mDeferRemoval) {
- removeImmediately();
- }
-
- return super.checkCompleteDeferredRemoval();
- }
-
- @Override
- int getOrientation() {
- return (canSpecifyOrientation()) ? super.getOrientation() : SCREEN_ORIENTATION_UNSET;
- }
-
- private boolean canSpecifyOrientation() {
- final int windowingMode = getWindowingMode();
- final int activityType = getActivityType();
- return windowingMode == WINDOWING_MODE_FULLSCREEN
- || activityType == ACTIVITY_TYPE_HOME
- || activityType == ACTIVITY_TYPE_RECENTS
- || activityType == ACTIVITY_TYPE_ASSISTANT;
- }
-
- @Override
- Dimmer getDimmer() {
- return mDimmer;
- }
-
- @Override
- void prepareSurfaces() {
- mDimmer.resetDimStates();
- super.prepareSurfaces();
- getDimBounds(mTmpDimBoundsRect);
-
- // Bounds need to be relative, as the dim layer is a child.
- mTmpDimBoundsRect.offsetTo(0, 0);
- if (mDimmer.updateDims(getPendingTransaction(), mTmpDimBoundsRect)) {
- scheduleAnimation();
- }
- }
-
- @Override
- public boolean setPinnedStackAlpha(float alpha) {
- // Hold the lock since this is called from the BoundsAnimator running on the UiThread
- synchronized (mWmService.mGlobalLock) {
- final SurfaceControl sc = getSurfaceControl();
- if (sc == null || !sc.isValid()) {
- // If the stack is already removed, don't bother updating any stack animation
- return false;
- }
- getPendingTransaction().setAlpha(sc, mCancelCurrentBoundsAnimation ? 1 : alpha);
- scheduleAnimation();
- return !mCancelCurrentBoundsAnimation;
- }
- }
-
- public DisplayInfo getDisplayInfo() {
- return mDisplayContent.getDisplayInfo();
- }
-
- void dim(float alpha) {
- mDimmer.dimAbove(getPendingTransaction(), alpha);
- scheduleAnimation();
- }
-
- void stopDimming() {
- mDimmer.stopDim(getPendingTransaction());
- scheduleAnimation();
- }
-
- AnimatingActivityRegistry getAnimatingActivityRegistry() {
- return mAnimatingActivityRegistry;
- }
-
- @Override
- void getAnimationFrames(Rect outFrame, Rect outInsets, Rect outStableInsets,
- Rect outSurfaceInsets) {
- final Task task = getTopChild();
- if (task != null) {
- task.getAnimationFrames(outFrame, outInsets, outStableInsets, outSurfaceInsets);
- } else {
- super.getAnimationFrames(outFrame, outInsets, outStableInsets, outSurfaceInsets);
- }
- }
-
- @Override
- RemoteAnimationTarget createRemoteAnimationTarget(
- RemoteAnimationController.RemoteAnimationRecord record) {
- final Task task = getTopChild();
- return task != null ? task.createRemoteAnimationTarget(record) : null;
- }
-}
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index cf3e2bb..3e78d5e 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -92,16 +92,16 @@
private static final String TAG = TAG_WITH_CLASS_NAME ? "WindowContainer" : TAG_WM;
- /** Animation layer that happens above all animating {@link TaskStack}s. */
+ /** Animation layer that happens above all animating {@link ActivityStack}s. */
static final int ANIMATION_LAYER_STANDARD = 0;
- /** Animation layer that happens above all {@link TaskStack}s. */
+ /** Animation layer that happens above all {@link ActivityStack}s. */
static final int ANIMATION_LAYER_BOOSTED = 1;
/**
* Animation layer that is reserved for {@link WindowConfiguration#ACTIVITY_TYPE_HOME}
* activities and all activities that are being controlled by the recents animation. This
- * layer is generally below all {@link TaskStack}s.
+ * layer is generally below all {@link ActivityStack}s.
*/
static final int ANIMATION_LAYER_HOME = 2;
@@ -490,6 +490,7 @@
}
mSurfaceControl = null;
+ mLastSurfacePosition.set(0, 0);
scheduleAnimation();
}
diff --git a/services/core/java/com/android/server/wm/WindowFrames.java b/services/core/java/com/android/server/wm/WindowFrames.java
index 9fe4760..84fcfbd 100644
--- a/services/core/java/com/android/server/wm/WindowFrames.java
+++ b/services/core/java/com/android/server/wm/WindowFrames.java
@@ -23,10 +23,6 @@
import static com.android.server.wm.WindowFramesProto.DECOR_FRAME;
import static com.android.server.wm.WindowFramesProto.DISPLAY_FRAME;
import static com.android.server.wm.WindowFramesProto.FRAME;
-import static com.android.server.wm.WindowFramesProto.OUTSETS;
-import static com.android.server.wm.WindowFramesProto.OUTSET_FRAME;
-import static com.android.server.wm.WindowFramesProto.OVERSCAN_FRAME;
-import static com.android.server.wm.WindowFramesProto.OVERSCAN_INSETS;
import static com.android.server.wm.WindowFramesProto.PARENT_FRAME;
import static com.android.server.wm.WindowFramesProto.STABLE_INSETS;
import static com.android.server.wm.WindowFramesProto.VISIBLE_FRAME;
@@ -61,7 +57,7 @@
public final Rect mParentFrame = new Rect();
/**
- * The entire screen area of the {@link TaskStack} this window is in. Usually equal to the
+ * The entire screen area of the {@link ActivityStack} this window is in. Usually equal to the
* screen area of the device.
*
* TODO(b/111611553): The name is unclear and most likely should be swapped with
@@ -70,14 +66,6 @@
public final Rect mDisplayFrame = new Rect();
/**
- * The region of the display frame that the display type supports displaying content on. This
- * is mostly a special case for TV where some displays don’t have the entire display usable.
- * {@link android.view.WindowManager.LayoutParams#FLAG_LAYOUT_IN_OVERSCAN} flag can be used to
- * allow window display contents to extend into the overscan region.
- */
- public final Rect mOverscanFrame = new Rect();
-
- /**
* Legacy stuff. Generally equal to the content frame expect when the IME for older apps
* displays hint text.
*/
@@ -102,12 +90,6 @@
public final Rect mStableFrame = new Rect();
/**
- * Frame that includes dead area outside of the surface but where we want to pretend that it's
- * possible to draw.
- */
- final public Rect mOutsetFrame = new Rect();
-
- /**
* Similar to {@link #mDisplayFrame}
*
* TODO: Why is this different than mDisplayFrame
@@ -148,14 +130,6 @@
private boolean mDisplayCutoutChanged;
/**
- * Insets that determine the area covered by the display overscan region. These are in the
- * application's coordinate space (without compatibility scale applied).
- */
- final Rect mOverscanInsets = new Rect();
- final Rect mLastOverscanInsets = new Rect();
- private boolean mOverscanInsetsChanged;
-
- /**
* Insets that determine the area covered by the stable system windows. These are in the
* application's coordinate space (without compatibility scale applied).
*/
@@ -164,14 +138,6 @@
private boolean mStableInsetsChanged;
/**
- * Outsets determine the area outside of the surface where we want to pretend that it's possible
- * to draw anyway.
- */
- final Rect mOutsets = new Rect();
- final Rect mLastOutsets = new Rect();
- private boolean mOutsetsChanged = false;
-
- /**
* Insets that determine the actually visible area. These are in the application's
* coordinate space (without compatibility scale applied).
*/
@@ -190,30 +156,25 @@
private final Rect mTmpRect = new Rect();
- private boolean mHasOutsets;
-
private boolean mContentChanged;
public WindowFrames() {
}
- public WindowFrames(Rect parentFrame, Rect displayFrame, Rect overscanFrame, Rect contentFrame,
- Rect visibleFrame, Rect decorFrame, Rect stableFrame, Rect outsetFrame) {
- setFrames(parentFrame, displayFrame, overscanFrame, contentFrame, visibleFrame, decorFrame,
- stableFrame, outsetFrame);
+ public WindowFrames(Rect parentFrame, Rect displayFrame, Rect contentFrame,
+ Rect visibleFrame, Rect decorFrame, Rect stableFrame) {
+ setFrames(parentFrame, displayFrame, contentFrame, visibleFrame, decorFrame,
+ stableFrame);
}
- public void setFrames(Rect parentFrame, Rect displayFrame, Rect overscanFrame,
- Rect contentFrame, Rect visibleFrame, Rect decorFrame, Rect stableFrame,
- Rect outsetFrame) {
+ public void setFrames(Rect parentFrame, Rect displayFrame,
+ Rect contentFrame, Rect visibleFrame, Rect decorFrame, Rect stableFrame) {
mParentFrame.set(parentFrame);
mDisplayFrame.set(displayFrame);
- mOverscanFrame.set(overscanFrame);
mContentFrame.set(contentFrame);
mVisibleFrame.set(visibleFrame);
mDecorFrame.set(decorFrame);
mStableFrame.set(stableFrame);
- mOutsetFrame.set(outsetFrame);
}
public void setParentFrameWasClippedByDisplayCutout(
@@ -237,17 +198,6 @@
}
/**
- * Calculates the outsets for this windowFrame. The outsets are calculated by the area between
- * the {@link #mOutsetFrame} and the {@link #mContentFrame}. If there are no outsets, then
- * {@link #mOutsets} is set to empty.
- */
- void calculateOutsets() {
- if (mHasOutsets) {
- InsetUtils.insetsBetweenFrames(mOutsetFrame, mContentFrame, mOutsets);
- }
- }
-
- /**
* Calculate the insets for the type
* {@link android.view.WindowManager.LayoutParams#TYPE_DOCK_DIVIDER}
*
@@ -301,11 +251,9 @@
* @param scale The amount to scale the insets by.
*/
void scaleInsets(float scale) {
- mOverscanInsets.scale(scale);
mContentInsets.scale(scale);
mVisibleInsets.scale(scale);
mStableInsets.scale(scale);
- mOutsets.scale(scale);
}
void offsetFrames(int layoutXDiff, int layoutYDiff) {
@@ -321,15 +269,13 @@
* @return true if info about size has changed since last reported.
*/
boolean setReportResizeHints() {
- mOverscanInsetsChanged |= !mLastOverscanInsets.equals(mOverscanInsets);
mContentInsetsChanged |= !mLastContentInsets.equals(mContentInsets);
mVisibleInsetsChanged |= !mLastVisibleInsets.equals(mVisibleInsets);
mStableInsetsChanged |= !mLastStableInsets.equals(mStableInsets);
- mOutsetsChanged |= !mLastOutsets.equals(mOutsets);
mFrameSizeChanged |= didFrameSizeChange();
mDisplayCutoutChanged |= !mLastDisplayCutout.equals(mDisplayCutout);
- return mOverscanInsetsChanged || mContentInsetsChanged || mVisibleInsetsChanged
- || mStableInsetsChanged || mOutsetsChanged || mFrameSizeChanged
+ return mContentInsetsChanged || mVisibleInsetsChanged
+ || mStableInsetsChanged || mFrameSizeChanged
|| mDisplayCutoutChanged;
}
@@ -338,11 +284,9 @@
* after the insets are reported to client.
*/
void resetInsetsChanged() {
- mOverscanInsetsChanged = false;
mContentInsetsChanged = false;
mVisibleInsetsChanged = false;
mStableInsetsChanged = false;
- mOutsetsChanged = false;
mFrameSizeChanged = false;
mDisplayCutoutChanged = false;
}
@@ -351,11 +295,9 @@
* Copy over inset values as the last insets that were sent to the client.
*/
void updateLastInsetValues() {
- mLastOverscanInsets.set(mOverscanInsets);
mLastContentInsets.set(mContentInsets);
mLastVisibleInsets.set(mVisibleInsets);
mLastStableInsets.set(mStableInsets);
- mLastOutsets.set(mOutsets);
mLastDisplayCutout = mDisplayCutout;
}
@@ -368,19 +310,6 @@
}
/**
- * Sets whether the frame has outsets.
- */
- public void setHasOutsets(boolean hasOutsets) {
- if (mHasOutsets == hasOutsets) {
- return;
- }
- mHasOutsets = hasOutsets;
- if (!hasOutsets) {
- mOutsets.setEmpty();
- }
- }
-
- /**
* Sets whether the content has changed. This means that either the size or parent frame has
* changed.
*/
@@ -400,18 +329,14 @@
mParentFrame.writeToProto(proto, PARENT_FRAME);
mContentFrame.writeToProto(proto, CONTENT_FRAME);
mDisplayFrame.writeToProto(proto, DISPLAY_FRAME);
- mOverscanFrame.writeToProto(proto, OVERSCAN_FRAME);
mVisibleFrame.writeToProto(proto, VISIBLE_FRAME);
mDecorFrame.writeToProto(proto, DECOR_FRAME);
- mOutsetFrame.writeToProto(proto, OUTSET_FRAME);
mContainingFrame.writeToProto(proto, CONTAINING_FRAME);
mFrame.writeToProto(proto, FRAME);
mDisplayCutout.getDisplayCutout().writeToProto(proto, CUTOUT);
mContentInsets.writeToProto(proto, CONTENT_INSETS);
- mOverscanInsets.writeToProto(proto, OVERSCAN_INSETS);
mVisibleInsets.writeToProto(proto, VISIBLE_INSETS);
mStableInsets.writeToProto(proto, STABLE_INSETS);
- mOutsets.writeToProto(proto, OUTSETS);
proto.end(token);
}
@@ -420,33 +345,26 @@
pw.println(prefix + "Frames: containing="
+ mContainingFrame.toShortString(sTmpSB)
+ " parent=" + mParentFrame.toShortString(sTmpSB));
- pw.println(prefix + " display=" + mDisplayFrame.toShortString(sTmpSB)
- + " overscan=" + mOverscanFrame.toShortString(sTmpSB));
+ pw.println(prefix + " display=" + mDisplayFrame.toShortString(sTmpSB));
pw.println(prefix + " content=" + mContentFrame.toShortString(sTmpSB)
+ " visible=" + mVisibleFrame.toShortString(sTmpSB));
pw.println(prefix + " decor=" + mDecorFrame.toShortString(sTmpSB));
- pw.println(prefix + " outset=" + mOutsetFrame.toShortString(sTmpSB));
pw.println(prefix + "mFrame=" + mFrame.toShortString(sTmpSB)
+ " last=" + mLastFrame.toShortString(sTmpSB));
pw.println(prefix + " cutout=" + mDisplayCutout.getDisplayCutout()
+ " last=" + mLastDisplayCutout.getDisplayCutout());
- pw.print(prefix + "Cur insets: overscan=" + mOverscanInsets.toShortString(sTmpSB)
- + " content=" + mContentInsets.toShortString(sTmpSB)
+ pw.print(prefix + "Cur insets: content=" + mContentInsets.toShortString(sTmpSB)
+ " visible=" + mVisibleInsets.toShortString(sTmpSB)
- + " stable=" + mStableInsets.toShortString(sTmpSB)
- + " outsets=" + mOutsets.toShortString(sTmpSB));
- pw.println(prefix + "Lst insets: overscan=" + mLastOverscanInsets.toShortString(sTmpSB)
- + " content=" + mLastContentInsets.toShortString(sTmpSB)
+ + " stable=" + mStableInsets.toShortString(sTmpSB));
+ pw.println(prefix + "Lst insets: content=" + mLastContentInsets.toShortString(sTmpSB)
+ " visible=" + mLastVisibleInsets.toShortString(sTmpSB)
- + " stable=" + mLastStableInsets.toShortString(sTmpSB)
- + " outset=" + mLastOutsets.toShortString(sTmpSB));
+ + " stable=" + mLastStableInsets.toShortString(sTmpSB));
}
String getInsetsInfo() {
return "ci=" + mContentInsets.toShortString()
+ " vi=" + mVisibleInsets.toShortString()
- + " si=" + mStableInsets.toShortString()
- + " of=" + mOutsets.toShortString();
+ + " si=" + mStableInsets.toShortString();
}
String getInsetsChangedInfo() {
@@ -456,8 +374,6 @@
+ " " + mVisibleInsets.toShortString()
+ " stableInsetsChanged=" + mStableInsetsChanged
+ " " + mStableInsets.toShortString()
- + " outsetsChanged=" + mOutsetsChanged
- + " " + mOutsets.toShortString()
+ " displayCutoutChanged=" + mDisplayCutoutChanged;
}
}
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index fc8705b..519cc21 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -19,6 +19,7 @@
import static android.Manifest.permission.ACCESS_SURFACE_FLINGER;
import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS;
import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW;
+import static android.Manifest.permission.MANAGE_ACTIVITY_STACKS;
import static android.Manifest.permission.MANAGE_APP_TOKENS;
import static android.Manifest.permission.READ_FRAME_BUFFER;
import static android.Manifest.permission.REGISTER_WINDOW_MANAGER_LISTENERS;
@@ -211,6 +212,8 @@
import android.view.Gravity;
import android.view.IAppTransitionAnimationSpecsFuture;
import android.view.IDisplayFoldListener;
+import android.view.IDisplayWindowListener;
+import android.view.IDisplayWindowRotationController;
import android.view.IDockedStackListener;
import android.view.IInputFilter;
import android.view.IOnKeyguardExitResult;
@@ -260,6 +263,7 @@
import com.android.internal.util.FastPrintWriter;
import com.android.internal.util.LatencyTracker;
import com.android.internal.util.Preconditions;
+import com.android.internal.util.function.pooled.PooledConsumer;
import com.android.internal.util.function.pooled.PooledLambda;
import com.android.internal.view.WindowManagerPolicyThread;
import com.android.server.AnimationThread;
@@ -433,8 +437,10 @@
public void onVrStateChanged(boolean enabled) {
synchronized (mGlobalLock) {
mVrModeEnabled = enabled;
- mRoot.forAllDisplayPolicies(PooledLambda.obtainConsumer(
- DisplayPolicy::onVrStateChangedLw, PooledLambda.__(), enabled));
+ final PooledConsumer c = PooledLambda.obtainConsumer(
+ DisplayPolicy::onVrStateChangedLw, PooledLambda.__(), enabled);
+ mRoot.forAllDisplayPolicies(c);
+ c.recycle();
}
}
};
@@ -591,7 +597,6 @@
Watermark mWatermark;
StrictModeFlash mStrictModeFlash;
- CircularDisplayMask mCircularDisplayMask;
EmulatorDisplayOverlay mEmulatorDisplayOverlay;
final float[] mTmpFloats = new float[9];
@@ -658,6 +663,12 @@
final WallpaperVisibilityListeners mWallpaperVisibilityListeners =
new WallpaperVisibilityListeners();
+ IDisplayWindowRotationController mDisplayRotationController = null;
+ private final DeathRecipient mDisplayRotationControllerDeath =
+ () -> mDisplayRotationController = null;
+
+ final DisplayWindowListenerController mDisplayNotificationController;
+
boolean mDisplayFrozen = false;
long mDisplayFreezeTime = 0;
int mLastDisplayFreezeDuration = 0;
@@ -760,11 +771,6 @@
return;
}
- if (mDisplayInversionEnabledUri.equals(uri)) {
- updateCircularDisplayMaskIfNeeded();
- return;
- }
-
if (mPointerLocationUri.equals(uri)) {
updatePointerLocation();
return;
@@ -827,9 +833,11 @@
}
mPointerLocationEnabled = enablePointerLocation;
synchronized (mGlobalLock) {
- mRoot.forAllDisplayPolicies(PooledLambda.obtainConsumer(
+ final PooledConsumer c = PooledLambda.obtainConsumer(
DisplayPolicy::setPointerLocationEnabled, PooledLambda.__(),
- mPointerLocationEnabled));
+ mPointerLocationEnabled);
+ mRoot.forAllDisplayPolicies(c);
+ c.recycle();
}
}
@@ -1181,6 +1189,8 @@
PowerManager.PARTIAL_WAKE_LOCK, "SCREEN_FROZEN");
mScreenFrozenLock.setReferenceCounted(false);
+ mDisplayNotificationController = new DisplayWindowListenerController(this);
+
mActivityManager = ActivityManager.getService();
mActivityTaskManager = ActivityTaskManager.getService();
mAmInternal = LocalServices.getService(ActivityManagerInternal.class);
@@ -1332,7 +1342,7 @@
public int addWindow(Session session, IWindow client, int seq,
LayoutParams attrs, int viewVisibility, int displayId, Rect outFrame,
- Rect outContentInsets, Rect outStableInsets, Rect outOutsets,
+ Rect outContentInsets, Rect outStableInsets,
DisplayCutout.ParcelableWrapper outDisplayCutout, InputChannel outInputChannel,
InsetsState outInsetsState) {
int[] appOp = new int[1];
@@ -1684,7 +1694,7 @@
floatingStack = false;
}
if (displayPolicy.getLayoutHintLw(win.mAttrs, taskBounds, displayFrames, floatingStack,
- outFrame, outContentInsets, outStableInsets, outOutsets, outDisplayCutout)) {
+ outFrame, outContentInsets, outStableInsets, outDisplayCutout)) {
res |= WindowManagerGlobal.ADD_FLAG_ALWAYS_CONSUME_SYSTEM_BARS;
}
outInsetsState.set(displayContent.getInsetsPolicy().getInsetsForDispatch(win));
@@ -1924,7 +1934,7 @@
// re-factor.
activity.firstWindowDrawn = false;
activity.clearAllDrawn();
- final TaskStack stack = activity.getStack();
+ final ActivityStack stack = activity.getStack();
if (stack != null) {
stack.mExitingActivities.remove(activity);
}
@@ -2087,8 +2097,8 @@
public int relayoutWindow(Session session, IWindow client, int seq, LayoutParams attrs,
int requestedWidth, int requestedHeight, int viewVisibility, int flags,
- long frameNumber, Rect outFrame, Rect outOverscanInsets, Rect outContentInsets,
- Rect outVisibleInsets, Rect outStableInsets, Rect outOutsets, Rect outBackdropFrame,
+ long frameNumber, Rect outFrame, Rect outContentInsets,
+ Rect outVisibleInsets, Rect outStableInsets, Rect outBackdropFrame,
DisplayCutout.ParcelableWrapper outCutout, MergedConfiguration mergedConfiguration,
SurfaceControl outSurfaceControl, InsetsState outInsetsState) {
int result = 0;
@@ -2380,8 +2390,8 @@
win.updateLastInsetValues();
win.getCompatFrame(outFrame);
- win.getInsetsForRelayout(outOverscanInsets, outContentInsets, outVisibleInsets,
- outStableInsets, outOutsets);
+ win.getInsetsForRelayout(outContentInsets, outVisibleInsets,
+ outStableInsets);
outCutout.set(win.getWmDisplayCutout().getDisplayCutout());
outBackdropFrame.set(win.getBackdropFrame(win.getFrameLw()));
outInsetsState.set(displayContent.getInsetsPolicy().getInsetsForDispatch(win));
@@ -2753,7 +2763,7 @@
@Override
public void getStackBounds(int windowingMode, int activityType, Rect bounds) {
synchronized (mGlobalLock) {
- final TaskStack stack = mRoot.getStack(windowingMode, activityType);
+ final ActivityStack stack = mRoot.getStack(windowingMode, activityType);
if (stack != null) {
stack.getBounds(bounds);
return;
@@ -2797,8 +2807,10 @@
@Override
public void onPowerKeyDown(boolean isScreenOn) {
- mRoot.forAllDisplayPolicies(PooledLambda.obtainConsumer(
- DisplayPolicy::onPowerKeyDown, PooledLambda.__(), isScreenOn));
+ final PooledConsumer c = PooledLambda.obtainConsumer(
+ DisplayPolicy::onPowerKeyDown, PooledLambda.__(), isScreenOn);
+ mRoot.forAllDisplayPolicies(c);
+ c.recycle();
}
@Override
@@ -3205,7 +3217,7 @@
// Notify whether the docked stack exists for the current user
final DisplayContent displayContent = getDefaultDisplayContentLocked();
- final TaskStack stack =
+ final ActivityStack stack =
displayContent.getSplitScreenPrimaryStackIgnoringVisibility();
displayContent.mDividerControllerLocked.notifyDockedStackExistsChanged(
stack != null && stack.hasTaskForUser(newUserId));
@@ -3428,26 +3440,6 @@
}
}
- private void updateCircularDisplayMaskIfNeeded() {
- if (mContext.getResources().getConfiguration().isScreenRound()
- && mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_windowShowCircularMask)) {
- final int currentUserId;
- synchronized (mGlobalLock) {
- currentUserId = mCurrentUserId;
- }
- // Device configuration calls for a circular display mask, but we only enable the mask
- // if the accessibility color inversion feature is disabled, as the inverted mask
- // causes artifacts.
- int inversionState = Settings.Secure.getIntForUser(mContext.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0, currentUserId);
- int showMask = (inversionState == 1) ? 0 : 1;
- Message m = mH.obtainMessage(H.SHOW_CIRCULAR_DISPLAY_MASK);
- m.arg1 = showMask;
- mH.sendMessage(m);
- }
- }
-
public void showEmulatorDisplayOverlayIfNeeded() {
if (mContext.getResources().getBoolean(
com.android.internal.R.bool.config_windowEnableCircularEmulatorDisplayOverlay)
@@ -3457,35 +3449,6 @@
}
}
- public void showCircularMask(boolean visible) {
- synchronized (mGlobalLock) {
- if (visible) {
- // TODO(multi-display): support multiple displays
- if (mCircularDisplayMask == null) {
- int screenOffset = mContext.getResources().getInteger(
- com.android.internal.R.integer.config_windowOutsetBottom);
- int maskThickness = mContext.getResources().getDimensionPixelSize(
- com.android.internal.R.dimen.circular_display_mask_thickness);
-
-
- if (SHOW_LIGHT_TRANSACTIONS) {
- Slog.i(TAG_WM,
- ">>> showCircularMask(visible=" + visible + ")");
- }
- mCircularDisplayMask = new CircularDisplayMask(mSurfaceFactory,
- getDefaultDisplayContentLocked(), mPolicy.getWindowLayerFromTypeLw(
- WindowManager.LayoutParams.TYPE_POINTER) * TYPE_LAYER_MULTIPLIER
- + 10, screenOffset, maskThickness, mTransaction);
- }
- mCircularDisplayMask.setVisibility(true, mTransaction);
- } else if (mCircularDisplayMask != null) {
- mCircularDisplayMask.setVisibility(false, mTransaction);
- mCircularDisplayMask = null;
- }
- mTransaction.apply();
- }
- }
-
public void showEmulatorDisplayOverlay() {
synchronized (mGlobalLock) {
@@ -3781,6 +3744,27 @@
}
@Override
+ public void setDisplayWindowRotationController(IDisplayWindowRotationController controller) {
+ if (mContext.checkCallingOrSelfPermission(MANAGE_ACTIVITY_STACKS)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Must hold permission " + MANAGE_ACTIVITY_STACKS);
+ }
+ try {
+ synchronized (mGlobalLock) {
+ if (mDisplayRotationController != null) {
+ mDisplayRotationController.asBinder().unlinkToDeath(
+ mDisplayRotationControllerDeath, 0);
+ mDisplayRotationController = null;
+ }
+ controller.asBinder().linkToDeath(mDisplayRotationControllerDeath, 0);
+ mDisplayRotationController = controller;
+ }
+ } catch (RemoteException e) {
+ throw new RuntimeException("Unable to set rotation controller");
+ }
+ }
+
+ @Override
public int watchRotation(IRotationWatcher watcher, int displayId) {
final DisplayContent displayContent;
synchronized (mGlobalLock) {
@@ -3944,6 +3928,31 @@
}
}
+ /** Registers a hierarchy listener that gets callbacks when the hierarchy changes. */
+ @Override
+ public void registerDisplayWindowListener(IDisplayWindowListener listener) {
+ if (mContext.checkCallingOrSelfPermission(MANAGE_ACTIVITY_STACKS)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Must hold permission " + MANAGE_ACTIVITY_STACKS);
+ }
+ long ident = Binder.clearCallingIdentity();
+ try {
+ mDisplayNotificationController.registerListener(listener);
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
+ }
+
+ /** Unregister a hierarchy listener so that it stops receiving callbacks. */
+ @Override
+ public void unregisterDisplayWindowListener(IDisplayWindowListener listener) {
+ if (mContext.checkCallingOrSelfPermission(MANAGE_ACTIVITY_STACKS)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Must hold permission " + MANAGE_ACTIVITY_STACKS);
+ }
+ mDisplayNotificationController.unregisterListener(listener);
+ }
+
@Override
public int getPreferredOptionsPanelGravity(int displayId) {
synchronized (mGlobalLock) {
@@ -4359,7 +4368,7 @@
return mRoot.getTopFocusedDisplayContent().mCurrentFocus;
}
- TaskStack getImeFocusStackLocked() {
+ ActivityStack getImeFocusStackLocked() {
// Don't use mCurrentFocus.getStack() because it returns home stack for system windows.
// Also don't use mInputMethodTarget's stack, because some window with FLAG_NOT_FOCUSABLE
// and FLAG_ALT_FOCUSABLE_IM flags both set might be set to IME target so they're moved
@@ -4436,8 +4445,6 @@
mActivityTaskManager.updateConfiguration(null);
} catch (RemoteException e) {
}
-
- updateCircularDisplayMaskIfNeeded();
}
public void systemReady() {
@@ -4520,7 +4527,6 @@
public static final int NEW_ANIMATOR_SCALE = 34;
- public static final int SHOW_CIRCULAR_DISPLAY_MASK = 35;
public static final int SHOW_EMULATOR_DISPLAY_OVERLAY = 36;
public static final int CHECK_IF_BOOT_ANIMATION_FINISHED = 37;
@@ -4754,11 +4760,6 @@
break;
}
- case SHOW_CIRCULAR_DISPLAY_MASK: {
- showCircularMask(msg.arg1 == 1);
- break;
- }
-
case SHOW_EMULATOR_DISPLAY_OVERLAY: {
showEmulatorDisplayOverlay();
break;
@@ -5168,38 +5169,6 @@
}
@Override
- public void setOverscan(int displayId, int left, int top, int right, int bottom) {
- if (mContext.checkCallingOrSelfPermission(WRITE_SECURE_SETTINGS)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Must hold permission " + WRITE_SECURE_SETTINGS);
- }
- final long ident = Binder.clearCallingIdentity();
- try {
- synchronized (mGlobalLock) {
- DisplayContent displayContent = mRoot.getDisplayContent(displayId);
- if (displayContent != null) {
- setOverscanLocked(displayContent, left, top, right, bottom);
- }
- }
- } finally {
- Binder.restoreCallingIdentity(ident);
- }
- }
-
- private void setOverscanLocked(DisplayContent displayContent,
- int left, int top, int right, int bottom) {
- final DisplayInfo displayInfo = displayContent.getDisplayInfo();
- displayInfo.overscanLeft = left;
- displayInfo.overscanTop = top;
- displayInfo.overscanRight = right;
- displayInfo.overscanBottom = bottom;
-
- mDisplayWindowSettings.setOverscanLocked(displayInfo, left, top, right, bottom);
-
- displayContent.reconfigureDisplayLocked();
- }
-
- @Override
public void startWindowTrace(){
mWindowTracing.startTrace(null /* printwriter */);
}
@@ -5623,8 +5592,10 @@
+ android.Manifest.permission.STATUS_BAR);
}
synchronized (mGlobalLock) {
- mRoot.forAllDisplayPolicies(PooledLambda.obtainConsumer(
- DisplayPolicy::setForceShowSystemBars, PooledLambda.__(), show));
+ final PooledConsumer c = PooledLambda.obtainConsumer(
+ DisplayPolicy::setForceShowSystemBars, PooledLambda.__(), show);
+ mRoot.forAllDisplayPolicies(c);
+ c.recycle();
}
}
@@ -6417,7 +6388,7 @@
@Override
public int getDockedStackSide() {
synchronized (mGlobalLock) {
- final TaskStack dockedStack = getDefaultDisplayContentLocked()
+ final ActivityStack dockedStack = getDefaultDisplayContentLocked()
.getSplitScreenPrimaryStackIgnoringVisibility();
return dockedStack == null ? DOCKED_INVALID : dockedStack.getDockSide();
}
@@ -7564,8 +7535,10 @@
void onLockTaskStateChanged(int lockTaskState) {
// TODO: pass in displayId to determine which display the lock task state changed
synchronized (mGlobalLock) {
- mRoot.forAllDisplayPolicies(PooledLambda.obtainConsumer(
- DisplayPolicy::onLockTaskStateChangedLw, PooledLambda.__(), lockTaskState));
+ final PooledConsumer c = PooledLambda.obtainConsumer(
+ DisplayPolicy::onLockTaskStateChangedLw, PooledLambda.__(), lockTaskState);
+ mRoot.forAllDisplayPolicies(c);
+ c.recycle();
}
}
@@ -7669,7 +7642,7 @@
return;
}
- final TaskStack stack = task.getTaskStack();
+ final ActivityStack stack = task.getTaskStack();
// We ignore home stack since we don't want home stack to move to front when touched.
// Specifically, in freeform we don't want tapping on home to cause the freeform apps to go
// behind home. See b/117376413
diff --git a/services/core/java/com/android/server/wm/WindowManagerShellCommand.java b/services/core/java/com/android/server/wm/WindowManagerShellCommand.java
index e01cbf2..2218366 100644
--- a/services/core/java/com/android/server/wm/WindowManagerShellCommand.java
+++ b/services/core/java/com/android/server/wm/WindowManagerShellCommand.java
@@ -20,19 +20,27 @@
import android.graphics.Point;
import android.graphics.Rect;
+import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ShellCommand;
import android.os.UserHandle;
import android.util.DisplayMetrics;
+import android.util.Pair;
import android.view.Display;
import android.view.IWindowManager;
import android.view.Surface;
+import android.view.ViewDebug;
+import com.android.internal.os.ByteTransferPipe;
import com.android.server.protolog.ProtoLogImpl;
+import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
/**
* ShellCommands for WindowManagerService.
@@ -66,8 +74,6 @@
return runDisplayDensity(pw);
case "folded-area":
return runDisplayFoldedArea(pw);
- case "overscan":
- return runDisplayOverscan(pw);
case "scaling":
return runDisplayScaling(pw);
case "dismiss-keyguard":
@@ -83,6 +89,8 @@
return runSetDisplayUserRotation(pw);
case "set-fix-to-user-rotation":
return runSetFixToUserRotation(pw);
+ case "dump-visible-window-views":
+ return runDumpVisibleWindowViews(pw);
default:
return handleDefaultCommands(cmd);
}
@@ -247,30 +255,6 @@
return 0;
}
- private int runDisplayOverscan(PrintWriter pw) throws RemoteException {
- String overscanStr = getNextArgRequired();
- Rect rect = new Rect();
- final int displayId = getDisplayId(overscanStr);
- if ("reset".equals(overscanStr)) {
- rect.set(0, 0, 0, 0);
- } else {
- final Pattern FLATTENED_PATTERN = Pattern.compile(
- "(-?\\d+),(-?\\d+),(-?\\d+),(-?\\d+)");
- Matcher matcher = FLATTENED_PATTERN.matcher(overscanStr);
- if (!matcher.matches()) {
- getErrPrintWriter().println("Error: bad rectangle arg: " + overscanStr);
- return -1;
- }
- rect.left = Integer.parseInt(matcher.group(1));
- rect.top = Integer.parseInt(matcher.group(2));
- rect.right = Integer.parseInt(matcher.group(3));
- rect.bottom = Integer.parseInt(matcher.group(4));
- }
-
- mInterface.setOverscan(displayId, rect.left, rect.top, rect.right, rect.bottom);
- return 0;
- }
-
private int runDisplayScaling(PrintWriter pw) throws RemoteException {
String scalingStr = getNextArgRequired();
if ("auto".equals(scalingStr)) {
@@ -367,6 +351,50 @@
return 0;
}
+ private int runDumpVisibleWindowViews(PrintWriter pw) {
+ ParcelFileDescriptor outFile = openFileForSystem(getNextArgRequired(), "w");
+ try (ZipOutputStream out = new ZipOutputStream(
+ new ParcelFileDescriptor.AutoCloseOutputStream(outFile))) {
+ ArrayList<Pair<String, ByteTransferPipe>> requestList = new ArrayList<>();
+ synchronized (mInternal.mGlobalLock) {
+ // Request dump from all windows parallelly before writing to disk.
+ mInternal.mRoot.forAllWindows(w -> {
+ if (w.isVisible()) {
+ ByteTransferPipe pipe = null;
+ try {
+ pipe = new ByteTransferPipe();
+ w.mClient.executeCommand(ViewDebug.REMOTE_COMMAND_DUMP_ENCODED, null,
+ pipe.getWriteFd());
+ requestList.add(Pair.create(w.getName(), pipe));
+ } catch (IOException | RemoteException e) {
+ // Skip this window
+ pw.println("Error for window " + w.getName() + " : " + e.getMessage());
+ if (pipe != null) {
+ pipe.kill();
+ }
+ }
+ }
+ }, false /* traverseTopToBottom */);
+ }
+ for (Pair<String, ByteTransferPipe> entry : requestList) {
+ byte[] data;
+ try {
+ data = entry.second.get();
+ } catch (IOException e) {
+ // Ignore this window
+ pw.println(
+ "Error for window " + entry.first + " : " + e.getMessage());
+ continue;
+ }
+ out.putNextEntry(new ZipEntry(entry.first));
+ out.write(data);
+ }
+ } catch (IOException e) {
+ pw.println("Error fetching dump " + e.getMessage());
+ }
+ return 0;
+ }
+
@Override
public void onHelp() {
PrintWriter pw = getOutPrintWriter();
@@ -380,14 +408,14 @@
pw.println(" Return or override display density.");
pw.println(" folded-area [reset|LEFT,TOP,RIGHT,BOTTOM]");
pw.println(" Return or override folded area.");
- pw.println(" overscan [reset|LEFT,TOP,RIGHT,BOTTOM] [-d DISPLAY ID]");
- pw.println(" Set overscan area for display.");
pw.println(" scaling [off|auto] [-d DISPLAY_ID]");
pw.println(" Set display scaling mode.");
pw.println(" dismiss-keyguard");
pw.println(" Dismiss the keyguard, prompting user for auth if necessary.");
pw.println(" set-user-rotation [free|lock] [-d DISPLAY_ID] [rotation]");
pw.println(" Set user rotation mode and user rotation.");
+ pw.println(" dump-visible-window-views out-file");
+ pw.println(" Dumps the encoded view hierarchies of visible windows");
pw.println(" set-fix-to-user-rotation [-d DISPLAY_ID] [enabled|disabled]");
pw.println(" Enable or disable rotating display for app requested orientation.");
if (!IS_USER) {
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index d590572..f98e307 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -1006,7 +1006,7 @@
}
}
- final TaskStack stack = getStack();
+ final ActivityStack stack = getStack();
if (inPinnedWindowingMode() && stack != null
&& stack.lastAnimatingBoundsWasToFullscreen()) {
// PIP edge case: When going from pinned to fullscreen, we apply a
@@ -1047,9 +1047,6 @@
applyGravityAndUpdateFrame(layoutContainingFrame, layoutDisplayFrame);
- // Calculate the outsets before the content frame gets shrinked to the window frame.
- mWindowFrames.calculateOutsets();
-
// Make sure the content and visible frames are inside of the
// final window frame.
if (windowsAreFloating && !mWindowFrames.mFrame.isEmpty()) {
@@ -1094,13 +1091,6 @@
Math.min(mWindowFrames.mStableFrame.bottom, mWindowFrames.mFrame.bottom));
}
- if (isFullscreenAndFillsDisplay && !windowsAreFloating) {
- // Windows that are not fullscreen can be positioned outside of the display frame,
- // but that is not a reason to provide them with overscan insets.
- InsetUtils.insetsBetweenFrames(layoutContainingFrame, mWindowFrames.mOverscanFrame,
- mWindowFrames.mOverscanInsets);
- }
-
if (mAttrs.type == TYPE_DOCK_DIVIDER) {
final WmDisplayCutout c = mWindowFrames.mDisplayCutout.calculateRelativeTo(
mWindowFrames.mDisplayFrame);
@@ -1170,11 +1160,6 @@
}
@Override
- public Rect getOverscanFrameLw() {
- return mWindowFrames.mOverscanFrame;
- }
-
- @Override
public Rect getContentFrameLw() {
return mWindowFrames.mContentFrame;
}
@@ -1419,7 +1404,7 @@
return mActivityRecord != null ? mActivityRecord.getTask() : null;
}
- TaskStack getStack() {
+ ActivityStack getStack() {
Task task = getTask();
if (task != null) {
if (task.getTaskStack() != null) {
@@ -1442,7 +1427,7 @@
bounds.setEmpty();
mTmpRect.setEmpty();
if (intersectWithStackBounds) {
- final TaskStack stack = task.getTaskStack();
+ final ActivityStack stack = task.getTaskStack();
if (stack != null) {
stack.getDimBounds(mTmpRect);
} else {
@@ -2150,7 +2135,7 @@
return false;
}
- final TaskStack stack = getStack();
+ final ActivityStack stack = getStack();
if (stack != null && stack.shouldIgnoreInput()) {
// Ignore when the stack shouldn't receive input event.
// (i.e. the minimized stack in split screen mode.)
@@ -2554,7 +2539,7 @@
// just in case they have the divider at an unstable position. Better
// also reset drag resizing state, because the owner can't do it
// anymore.
- final TaskStack stack =
+ final ActivityStack stack =
dc.getSplitScreenPrimaryStackIgnoringVisibility();
if (stack != null) {
stack.resetDockedStackToMiddle();
@@ -3151,7 +3136,7 @@
return;
}
- final TaskStack stack = task.getTaskStack();
+ final ActivityStack stack = task.getTaskStack();
if (stack == null) {
return;
}
@@ -3165,7 +3150,7 @@
return;
}
- final TaskStack stack = task.getTaskStack();
+ final ActivityStack stack = task.getTaskStack();
if (stack == null) {
return;
}
@@ -3265,11 +3250,9 @@
}
final Rect frame = mWindowFrames.mCompatFrame;
- final Rect overscanInsets = mWindowFrames.mLastOverscanInsets;
final Rect contentInsets = mWindowFrames.mLastContentInsets;
final Rect visibleInsets = mWindowFrames.mLastVisibleInsets;
final Rect stableInsets = mWindowFrames.mLastStableInsets;
- final Rect outsets = mWindowFrames.mLastOutsets;
final boolean reportDraw = mWinAnimator.mDrawState == DRAW_PENDING;
final boolean reportOrientation = mReportOrientationChanged;
final int displayId = getDisplayId();
@@ -3281,8 +3264,8 @@
@Override
public void run() {
try {
- dispatchResized(frame, overscanInsets, contentInsets, visibleInsets,
- stableInsets, outsets, reportDraw, mergedConfiguration,
+ dispatchResized(frame, contentInsets, visibleInsets,
+ stableInsets, reportDraw, mergedConfiguration,
reportOrientation, displayId, displayCutout);
} catch (RemoteException e) {
// Not a remote call, RemoteException won't be raised.
@@ -3290,8 +3273,8 @@
}
});
} else {
- dispatchResized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets,
- outsets, reportDraw, mergedConfiguration, reportOrientation, displayId,
+ dispatchResized(frame, contentInsets, visibleInsets, stableInsets,
+ reportDraw, mergedConfiguration, reportOrientation, displayId,
displayCutout);
}
if (mWmService.mAccessibilityController != null) {
@@ -3416,21 +3399,21 @@
}
private int getStackId() {
- final TaskStack stack = getStack();
+ final ActivityStack stack = getStack();
if (stack == null) {
return INVALID_STACK_ID;
}
return stack.mStackId;
}
- private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets,
- Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,
+ private void dispatchResized(Rect frame, Rect contentInsets,
+ Rect visibleInsets, Rect stableInsets, boolean reportDraw,
MergedConfiguration mergedConfiguration, boolean reportOrientation, int displayId,
DisplayCutout displayCutout)
throws RemoteException {
final boolean forceRelayout = isDragResizeChanged() || reportOrientation;
- mClient.resized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, outsets,
+ mClient.resized(frame, contentInsets, visibleInsets, stableInsets,
reportDraw, mergedConfiguration, getBackdropFrame(frame), forceRelayout,
getDisplayContent().getDisplayPolicy().areSystemBarsForcedShownLw(this), displayId,
new DisplayCutout.ParcelableWrapper(displayCutout));
@@ -3647,7 +3630,7 @@
@Override
void dump(PrintWriter pw, String prefix, boolean dumpAll) {
- final TaskStack stack = getStack();
+ final ActivityStack stack = getStack();
pw.print(prefix + "mDisplayId=" + getDisplayId());
if (stack != null) {
pw.print(" stackId=" + stack.mStackId);
@@ -5097,7 +5080,7 @@
outPoint.offset(-parentBounds.left, -parentBounds.top);
}
- TaskStack stack = getStack();
+ ActivityStack stack = getStack();
// If we have stack outsets, that means the top-left
// will be outset, and we need to inset ourselves
@@ -5282,13 +5265,11 @@
/**
* Copy the inset values over so they can be sent back to the client when a relayout occurs.
*/
- void getInsetsForRelayout(Rect outOverscanInsets, Rect outContentInsets, Rect outVisibleInsets,
- Rect outStableInsets, Rect outOutsets) {
- outOverscanInsets.set(mWindowFrames.mOverscanInsets);
+ void getInsetsForRelayout(Rect outContentInsets, Rect outVisibleInsets,
+ Rect outStableInsets) {
outContentInsets.set(mWindowFrames.mContentInsets);
outVisibleInsets.set(mWindowFrames.mVisibleInsets);
outStableInsets.set(mWindowFrames.mStableInsets);
- outOutsets.set(mWindowFrames.mOutsets);
mLastRelayoutContentInsets.set(mWindowFrames.mContentInsets);
}
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index a853828..94aff7b 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1016,7 +1016,7 @@
mSurfaceController.deferTransactionUntil(mSurfaceController.mSurfaceControl,
mWin.getFrameNumber());
} else {
- final TaskStack stack = mWin.getStack();
+ final ActivityStack stack = mWin.getStack();
mTmpPos.x = 0;
mTmpPos.y = 0;
if (stack != null) {
diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp
index 91c05a8..bffa44e 100644
--- a/services/devicepolicy/Android.bp
+++ b/services/devicepolicy/Android.bp
@@ -4,6 +4,7 @@
libs: [
"services.core",
+ "app-compat-annotations",
],
plugins: [
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index a39cc20..99f484e 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1945,7 +1945,7 @@
}
TelephonyManager getTelephonyManager() {
- return TelephonyManager.from(mContext);
+ return mContext.getSystemService(TelephonyManager.class);
}
TrustManager getTrustManager() {
@@ -4928,21 +4928,25 @@
@Override
@PasswordComplexity
- public int getPasswordComplexity() {
+ public int getPasswordComplexity(boolean parent) {
DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.GET_USER_PASSWORD_COMPLEXITY_LEVEL)
.setStrings(mInjector.getPackageManager()
.getPackagesForUid(mInjector.binderGetCallingUid()))
.write();
final int callingUserId = mInjector.userHandleGetCallingUserId();
+
+ if (parent) {
+ enforceProfileOwnerOrSystemUser();
+ }
enforceUserUnlocked(callingUserId);
mContext.enforceCallingOrSelfPermission(
REQUEST_PASSWORD_COMPLEXITY,
"Must have " + REQUEST_PASSWORD_COMPLEXITY + " permission.");
synchronized (getLockObject()) {
- int targetUserId = getCredentialOwner(callingUserId, /* parent= */ false);
- PasswordMetrics metrics = mLockSettingsInternal.getUserPasswordMetrics(targetUserId);
+ final int credentialOwner = getCredentialOwner(callingUserId, parent);
+ PasswordMetrics metrics = mLockSettingsInternal.getUserPasswordMetrics(credentialOwner);
return metrics == null ? PASSWORD_COMPLEXITY_NONE : metrics.determineComplexity();
}
}
@@ -9720,13 +9724,9 @@
}
}
- int userInfoFlags = 0;
- if (ephemeral) {
- userInfoFlags |= UserInfo.FLAG_EPHEMERAL;
- }
- if (demo) {
- userInfoFlags |= UserInfo.FLAG_DEMO;
- }
+ int userInfoFlags = ephemeral ? UserInfo.FLAG_EPHEMERAL : 0;
+ String userType = demo ? UserManager.USER_TYPE_FULL_DEMO
+ : UserManager.USER_TYPE_FULL_SECONDARY;
String[] disallowedPackages = null;
if (!leaveAllSystemAppsEnabled) {
disallowedPackages = mOverlayPackagesProvider.getNonRequiredApps(admin,
@@ -9734,7 +9734,7 @@
new String[0]);
}
UserInfo userInfo = mUserManagerInternal.createUserEvenWhenDisallowed(name,
- userInfoFlags, disallowedPackages);
+ userType, userInfoFlags, disallowedPackages);
if (userInfo != null) {
user = userInfo.getUserHandle();
}
diff --git a/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java
index 71f7d2c..f2e118d 100644
--- a/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java
@@ -56,6 +56,7 @@
import com.android.server.DeviceIdleInternal;
import com.android.server.LocalServices;
import com.android.server.job.controllers.JobStatus;
+import com.android.server.usage.AppStandbyInternal;
import org.junit.After;
import org.junit.Before;
@@ -100,6 +101,8 @@
when(mContext.getMainLooper()).thenReturn(Looper.getMainLooper());
doReturn(mActivityMangerInternal)
.when(() -> LocalServices.getService(ActivityManagerInternal.class));
+ doReturn(mock(AppStandbyInternal.class))
+ .when(() -> LocalServices.getService(AppStandbyInternal.class));
doReturn(mock(UsageStatsManagerInternal.class))
.when(() -> LocalServices.getService(UsageStatsManagerInternal.class));
// Called in BackgroundJobsController constructor.
diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java
index 5bd08c0..bc0b184 100644
--- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java
@@ -78,6 +78,7 @@
import com.android.server.job.JobStore;
import com.android.server.job.controllers.QuotaController.ExecutionStats;
import com.android.server.job.controllers.QuotaController.TimingSession;
+import com.android.server.usage.AppStandbyInternal;
import org.junit.After;
import org.junit.Before;
@@ -150,6 +151,8 @@
when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);
doReturn(mActivityMangerInternal)
.when(() -> LocalServices.getService(ActivityManagerInternal.class));
+ doReturn(mock(AppStandbyInternal.class))
+ .when(() -> LocalServices.getService(AppStandbyInternal.class));
doReturn(mock(BatteryManagerInternal.class))
.when(() -> LocalServices.getService(BatteryManagerInternal.class));
doReturn(mUsageStatsManager)
diff --git a/services/tests/servicestests/src/com/android/server/DynamicSystemServiceTest.java b/services/tests/servicestests/src/com/android/server/DynamicSystemServiceTest.java
index 0605d9e..50437b4 100644
--- a/services/tests/servicestests/src/com/android/server/DynamicSystemServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/DynamicSystemServiceTest.java
@@ -36,7 +36,7 @@
public void test1() {
assertTrue("dynamic_system service available", mService != null);
try {
- mService.startInstallation("userdata", 8L << 30, false);
+ mService.startInstallation();
fail("DynamicSystemService did not throw SecurityException as expected");
} catch (SecurityException e) {
// expected
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java
index 597d337..99dd9a1 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java
@@ -44,6 +44,7 @@
import android.testing.DexmakerShareClassLoaderRule;
import android.view.Display;
+import com.android.server.wm.ActivityTaskManagerInternal;
import com.android.server.wm.WindowManagerInternal;
import org.junit.After;
@@ -80,6 +81,7 @@
@Mock ResolveInfo mMockResolveInfo;
@Mock AccessibilitySecurityPolicy mMockSecurityPolicy;
@Mock AccessibilityWindowManager mMockA11yWindowManager;
+ @Mock ActivityTaskManagerInternal mMockActivityTaskManagerInternal;
@Mock AbstractAccessibilityServiceConnection.SystemSupport mMockSystemSupport;
@Mock WindowManagerInternal mMockWindowManagerInternal;
@Mock SystemActionPerformer mMockSystemActionPerformer;
@@ -111,7 +113,8 @@
mConnection = new AccessibilityServiceConnection(mMockUserState, mMockContext,
COMPONENT_NAME, mMockServiceInfo, SERVICE_ID, mHandler, new Object(),
mMockSecurityPolicy, mMockSystemSupport, mMockWindowManagerInternal,
- mMockSystemActionPerformer, mMockA11yWindowManager);
+ mMockSystemActionPerformer, mMockA11yWindowManager,
+ mMockActivityTaskManagerInternal);
when(mMockSecurityPolicy.canPerformGestures(mConnection)).thenReturn(true);
}
diff --git a/services/tests/servicestests/src/com/android/server/content/SyncStorageEngineTest.java b/services/tests/servicestests/src/com/android/server/content/SyncStorageEngineTest.java
new file mode 100644
index 0000000..2e2270b
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/content/SyncStorageEngineTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2019 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.content;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+
+import android.content.Context;
+import android.content.SyncStatusInfo;
+import android.util.Pair;
+import android.util.SparseArray;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Random;
+
+/**
+ * Tests for {@link SyncStorageEngine}.
+ */
+@RunWith(AndroidJUnit4.class)
+public class SyncStorageEngineTest {
+
+ private Context mContext;
+ private SyncStorageEngine mSyncStorageEngine;
+
+ private static final int NUM_SYNC_STATUS = 100;
+ private static final int NUM_PERIODIC_SYNC_TIMES = 20;
+ private static final int NUM_EVENTS = 10;
+ private static final int NUM_SOURCES = 6;
+
+ @Before
+ public void setUp() {
+ mContext = InstrumentationRegistry.getTargetContext();
+ mSyncStorageEngine = SyncStorageEngine.newTestInstance(mContext);
+ }
+
+ @Test
+ public void testStatisticsReadWrite() {
+ populateDayStats(mSyncStorageEngine.mDayStats);
+ mSyncStorageEngine.writeStatisticsLocked();
+
+ final SyncStorageEngine other = SyncStorageEngine.newTestInstance(mContext);
+ verifyDayStats(mSyncStorageEngine.mDayStats, other.getDayStatistics());
+ }
+
+ @Test
+ public void testStatusReadWrite() {
+ populateStatus(mSyncStorageEngine.mSyncStatus);
+ mSyncStorageEngine.writeStatusLocked();
+
+ final SyncStorageEngine other = SyncStorageEngine.newTestInstance(mContext);
+ for (int i = 0; i < NUM_SYNC_STATUS; i++) {
+ other.mAuthorities.put(i, null);
+ }
+ other.readStatusLocked();
+ verifyStatus(mSyncStorageEngine.mSyncStatus, other.mSyncStatus);
+ }
+
+ private void populateDayStats(SyncStorageEngine.DayStats[] dayStats) {
+ final Random r = new Random(1);
+ for (int i = 0; i < dayStats.length; i++) {
+ final SyncStorageEngine.DayStats ds = new SyncStorageEngine.DayStats(i);
+ ds.successCount = r.nextInt();
+ ds.successTime = r.nextLong();
+ ds.failureCount = r.nextInt();
+ ds.failureTime = r.nextLong();
+ dayStats[i] = ds;
+ }
+ }
+
+ private void verifyDayStats(SyncStorageEngine.DayStats[] dayStats,
+ SyncStorageEngine.DayStats[] dayStatsOther) {
+ assertEquals(dayStatsOther.length, dayStats.length);
+ for (int i = 0; i < dayStatsOther.length; i++) {
+ final SyncStorageEngine.DayStats ds = dayStats[i];
+ final SyncStorageEngine.DayStats dsOther = dayStatsOther[i];
+ assertEquals(dsOther.day, ds.day);
+ assertEquals(dsOther.successCount, ds.successCount);
+ assertEquals(dsOther.successTime, ds.successTime);
+ assertEquals(dsOther.failureCount, ds.failureCount);
+ assertEquals(dsOther.failureTime, ds.failureTime);
+ }
+ }
+
+ private void populateStatus(SparseArray<SyncStatusInfo> syncStatus) {
+ final Random r = new Random(1);
+ for (int i = 0; i < NUM_SYNC_STATUS; i++) {
+ final SyncStatusInfo ss = new SyncStatusInfo(i);
+ ss.lastSuccessTime = r.nextLong();
+ ss.lastSuccessSource = r.nextInt();
+ ss.lastFailureTime = r.nextLong();
+ ss.lastFailureSource = r.nextInt();
+ ss.lastFailureMesg = "fail_msg_" + r.nextInt();
+ ss.initialFailureTime = r.nextLong();
+ ss.initialize = r.nextBoolean();
+ for (int j = 0; j < NUM_PERIODIC_SYNC_TIMES; j++) {
+ ss.addPeriodicSyncTime(r.nextLong());
+ }
+ final ArrayList<Pair<Long, String>> lastEventInfos = new ArrayList<>();
+ for (int j = 0; j < NUM_EVENTS; j++) {
+ lastEventInfos.add(new Pair<>(r.nextLong(), "event_" + r.nextInt()));
+ }
+ ss.populateLastEventsInformation(lastEventInfos);
+ ss.lastTodayResetTime = r.nextLong();
+ populateStats(ss.totalStats, r);
+ populateStats(ss.todayStats, r);
+ populateStats(ss.yesterdayStats, r);
+ for (int j = 0; j < NUM_SOURCES; j++) {
+ ss.perSourceLastSuccessTimes[j] = r.nextLong();
+ }
+ for (int j = 0; j < NUM_SOURCES; j++) {
+ ss.perSourceLastFailureTimes[j] = r.nextLong();
+ }
+ syncStatus.put(i, ss);
+ }
+ }
+
+ private void populateStats(SyncStatusInfo.Stats stats, Random r) {
+ stats.totalElapsedTime = r.nextLong();
+ stats.numSyncs = r.nextInt();
+ stats.numFailures = r.nextInt();
+ stats.numCancels = r.nextInt();
+ stats.numSourceOther = r.nextInt();
+ stats.numSourceLocal = r.nextInt();
+ stats.numSourcePoll = r.nextInt();
+ stats.numSourceUser = r.nextInt();
+ stats.numSourcePeriodic = r.nextInt();
+ stats.numSourceFeed = r.nextInt();
+ }
+
+ private void verifyStatus(SparseArray<SyncStatusInfo> syncStatus,
+ SparseArray<SyncStatusInfo> syncStatusOther) {
+ assertEquals(syncStatusOther.size(), syncStatus.size());
+ for (int i = 0; i < NUM_SYNC_STATUS; i++) {
+ final SyncStatusInfo ss = syncStatus.valueAt(i);
+ final SyncStatusInfo ssOther = syncStatusOther.valueAt(i);
+ assertEquals(ssOther.authorityId, ss.authorityId);
+ assertEquals(ssOther.lastSuccessTime, ss.lastSuccessTime);
+ assertEquals(ssOther.lastSuccessSource, ss.lastSuccessSource);
+ assertEquals(ssOther.lastFailureTime, ss.lastFailureTime);
+ assertEquals(ssOther.lastFailureSource, ss.lastFailureSource);
+ assertEquals(ssOther.lastFailureMesg, ss.lastFailureMesg);
+ assertFalse(ssOther.pending); // pending is always set to false when read
+ assertEquals(ssOther.initialize, ss.initialize);
+ assertEquals(ssOther.getPeriodicSyncTimesSize(), NUM_PERIODIC_SYNC_TIMES);
+ for (int j = 0; j < NUM_PERIODIC_SYNC_TIMES; j++) {
+ assertEquals(ssOther.getPeriodicSyncTime(j), ss.getPeriodicSyncTime(j));
+ }
+ assertEquals(ssOther.getEventCount(), NUM_EVENTS);
+ for (int j = 0; j < NUM_EVENTS; j++) {
+ assertEquals(ssOther.getEventTime(j), ss.getEventTime(j));
+ assertEquals(ssOther.getEvent(j), ss.getEvent(j));
+ }
+ assertEquals(ssOther.lastTodayResetTime, ss.lastTodayResetTime);
+ verifyStats(ss.totalStats, ssOther.totalStats);
+ verifyStats(ss.todayStats, ssOther.todayStats);
+ verifyStats(ss.yesterdayStats, ssOther.yesterdayStats);
+ assertEquals(ssOther.perSourceLastSuccessTimes.length, NUM_SOURCES);
+ for (int j = 0; j < NUM_SOURCES; j++) {
+ assertEquals(ssOther.perSourceLastSuccessTimes[j], ss.perSourceLastSuccessTimes[j]);
+ }
+ assertEquals(ssOther.perSourceLastFailureTimes.length, NUM_SOURCES);
+ for (int j = 0; j < NUM_SOURCES; j++) {
+ assertEquals(ssOther.perSourceLastFailureTimes[j], ss.perSourceLastFailureTimes[j]);
+ }
+ }
+ }
+
+ private void verifyStats(SyncStatusInfo.Stats stats, SyncStatusInfo.Stats statsOther) {
+ assertEquals(statsOther.totalElapsedTime, stats.totalElapsedTime);
+ assertEquals(statsOther.numSyncs, stats.numSyncs);
+ assertEquals(statsOther.numFailures, stats.numFailures);
+ assertEquals(statsOther.numCancels, stats.numCancels);
+ assertEquals(statsOther.numSourceOther, stats.numSourceOther);
+ assertEquals(statsOther.numSourceLocal, stats.numSourceLocal);
+ assertEquals(statsOther.numSourcePoll, stats.numSourcePoll);
+ assertEquals(statsOther.numSourceUser, stats.numSourceUser);
+ assertEquals(statsOther.numSourcePeriodic, stats.numSourcePeriodic);
+ assertEquals(statsOther.numSourceFeed, stats.numSourceFeed);
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
index f571411..f270724 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
@@ -5295,13 +5295,17 @@
});
}
- public void testGetPasswordComplexity_securityExceptionIfParentInstance() {
- assertThrows(SecurityException.class,
- () -> new DevicePolicyManagerTestable(
- mServiceContext,
- dpms,
- /* parentInstance= */ true)
- .getPasswordComplexity());
+ public void testGetPasswordComplexity_securityExceptionNotThrownForParentInstance() {
+ mServiceContext.permissions.add(permission.REQUEST_PASSWORD_COMPLEXITY);
+ setAsProfileOwner(admin1);
+
+ new DevicePolicyManagerTestable(
+ mServiceContext,
+ dpms,
+ /* parentInstance= */ true)
+ .getPasswordComplexity();
+
+ assertEquals(PASSWORD_COMPLEXITY_NONE, dpm.getPasswordComplexity());
}
public void testGetPasswordComplexity_illegalStateExceptionIfLocked() {
diff --git a/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java b/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java
index 86e544d..975689d 100644
--- a/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java
+++ b/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java
@@ -18,9 +18,10 @@
import static com.android.server.testutils.TestUtils.assertExpectException;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+import com.android.server.integrity.model.AtomicFormula;
+import com.android.server.integrity.model.OpenFormula;
import com.android.server.integrity.model.Rule;
import org.junit.Test;
@@ -29,86 +30,416 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
@RunWith(JUnit4.class)
public class RuleXmlParserTest {
- private static final String VALID_RULE_XML = "<RuleList>"
- + "<Rule>"
- + "<OpenFormula>"
- + "<Connector>NOT</Connector>"
- + "<AtomicFormula>"
- + "<Key>PACKAGE_NAME</Key>"
- + "<Operator>EQ</Operator>"
- + "<Value>com.app.test</Value>"
- + "</AtomicFormula>"
- + "</OpenFormula>"
- + "<Effect>DENY</Effect>"
- + "</Rule>"
- + "</RuleList>";
-
@Test
- public void testXmlString_validRule() {
+ public void testXmlStream_validOpenFormula() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
RuleParser xmlParser = new RuleXmlParser();
-
- List<Rule> rules = xmlParser.parse(VALID_RULE_XML);
-
- assertNotNull(rules);
- assertTrue(rules.isEmpty());
- }
-
- @Test
- public void testXmlStream_validRule() {
- RuleParser xmlParser = new RuleXmlParser();
- InputStream inputStream = new ByteArrayInputStream(VALID_RULE_XML.getBytes());
+ InputStream inputStream = new ByteArrayInputStream(ruleXmlOpenFormula.getBytes());
+ Rule expectedRule = new Rule(new OpenFormula(OpenFormula.NOT, Collections.singletonList(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"))),
+ Rule.DENY);
List<Rule> rules = xmlParser.parse(inputStream);
- assertNotNull(rules);
- assertTrue(rules.isEmpty());
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_validOpenFormula_notConnector() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(new OpenFormula(OpenFormula.NOT, Collections.singletonList(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"))),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_validOpenFormula_andConnector() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.AND + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.APP_CERTIFICATE + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>test_cert</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(new OpenFormula(OpenFormula.AND, Arrays.asList(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"),
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE, "test_cert"))),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_validOpenFormula_orConnector() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.OR + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.APP_CERTIFICATE + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>test_cert</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(new OpenFormula(OpenFormula.OR, Arrays.asList(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"),
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE, "test_cert"))),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_validOpenFormula_differentTagOrder() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(new OpenFormula(OpenFormula.NOT, Collections.singletonList(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"))),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_invalidOpenFormula_invalidNumberOfFormulas() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.VERSION_CODE + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>1</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+
+ assertExpectException(
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "Connector NOT must have 1 formula only",
+ () -> xmlParser.parse(ruleXmlOpenFormula));
+ }
+
+ @Test
+ public void testXmlString_invalidOpenFormula_invalidOperator() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>INVALID_OPERATOR</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+
+ assertExpectException(
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "For input string: \"INVALID_OPERATOR\"",
+ () -> xmlParser.parse(ruleXmlOpenFormula));
+ }
+
+ @Test
+ public void testXmlString_invalidOpenFormula_invalidEffect() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>INVALID_EFFECT</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+
+ assertExpectException(
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "For input string: \"INVALID_EFFECT\"",
+ () -> xmlParser.parse(ruleXmlOpenFormula));
+ }
+
+ @Test
+ public void testXmlString_invalidOpenFormula_invalidTags() throws Exception {
+ String ruleXmlOpenFormula = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<InvalidConnector>" + OpenFormula.NOT + "</InvalidConnector>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+
+ assertExpectException(
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "Found unexpected tag: InvalidConnector",
+ () -> xmlParser.parse(ruleXmlOpenFormula));
+ }
+
+ @Test
+ public void testXmlString_validAtomicFormula_stringValue() throws Exception {
+ String ruleXmlAtomicFormula = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_validAtomicFormula_integerValue() throws Exception {
+ String ruleXmlAtomicFormula = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.VERSION_CODE + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>1</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(
+ new AtomicFormula.IntAtomicFormula(AtomicFormula.VERSION_CODE, AtomicFormula.EQ, 1),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_validAtomicFormula_booleanValue() throws Exception {
+ String ruleXmlAtomicFormula = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PRE_INSTALLED + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>true</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(
+ new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_validAtomicFormula_differentTagOrder() throws Exception {
+ String ruleXmlAtomicFormula = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+ Rule expectedRule = new Rule(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"),
+ Rule.DENY);
+
+ List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula);
+
+ assertThat(rules).isEqualTo(Collections.singletonList(expectedRule));
+ }
+
+ @Test
+ public void testXmlString_invalidAtomicFormula_invalidTags() throws Exception {
+ String ruleXmlAtomicFormula = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<BadKey>" + AtomicFormula.PACKAGE_NAME + "</BadKey>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+
+ assertExpectException(
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "Found unexpected tag: BadKey",
+ () -> xmlParser.parse(ruleXmlAtomicFormula));
+ }
+
+ @Test
+ public void testXmlString_invalidAtomicFormula() throws Exception {
+ String ruleXmlAtomicFormula = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.VERSION_CODE + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+ RuleParser xmlParser = new RuleXmlParser();
+
+ assertExpectException(
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "For input string: \"com.app.test\"",
+ () -> xmlParser.parse(ruleXmlAtomicFormula));
}
@Test
public void testXmlString_withNoRuleList() {
- String ruleXmlWithNoRuleList = "<Rule>"
- + "<OpenFormula>"
- + "<Connector>NOT</Connector>"
- + "<AtomicFormula>"
- + "<Key>PACKAGE_NAME</Key>"
- + "<Operator>EQ</Operator>"
- + "<Value>com.app.test</Value>"
- + "</AtomicFormula>"
- + "</OpenFormula>"
- + "<Effect>DENY</Effect>"
- + "</Rule>";
+ String ruleXmlWithNoRuleList = "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>";
RuleParser xmlParser = new RuleXmlParser();
assertExpectException(
- RuntimeException.class,
- /* expectedExceptionMessageRegex */ "Rules must start with <RuleList> tag.",
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "Rules must start with RuleList <RL> tag",
() -> xmlParser.parse(ruleXmlWithNoRuleList));
}
@Test
public void testXmlStream_withNoRuleList() {
- String ruleXmlWithNoRuleList = "<Rule>"
- + "<OpenFormula>"
- + "<Connector>NOT</Connector>"
- + "<AtomicFormula>"
- + "<Key>PACKAGE_NAME</Key>"
- + "<Operator>EQ</Operator>"
- + "<Value>com.app.test</Value>"
- + "</AtomicFormula>"
- + "</OpenFormula>"
- + "<Effect>DENY</Effect>"
- + "</Rule>";
+ String ruleXmlWithNoRuleList = "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>";
InputStream inputStream = new ByteArrayInputStream(ruleXmlWithNoRuleList.getBytes());
RuleParser xmlParser = new RuleXmlParser();
assertExpectException(
- RuntimeException.class,
- /* expectedExceptionMessageRegex */ "Rules must start with <RuleList> tag.",
+ RuleParseException.class,
+ /* expectedExceptionMessageRegex */ "Rules must start with RuleList <RL> tag",
() -> xmlParser.parse(inputStream));
}
}
diff --git a/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleXmlSerializerTest.java b/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleXmlSerializerTest.java
new file mode 100644
index 0000000..082fda8
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleXmlSerializerTest.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2019 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.integrity.serializer;
+
+import static com.android.server.testutils.TestUtils.assertExpectException;
+
+import static org.junit.Assert.assertEquals;
+
+import androidx.annotation.NonNull;
+
+import com.android.server.integrity.model.AppInstallMetadata;
+import com.android.server.integrity.model.AtomicFormula;
+import com.android.server.integrity.model.Formula;
+import com.android.server.integrity.model.OpenFormula;
+import com.android.server.integrity.model.Rule;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Collections;
+
+@RunWith(JUnit4.class)
+public class RuleXmlSerializerTest {
+
+ @Test
+ public void testXmlString_serializeEmptyRule() throws Exception {
+ Rule rule = null;
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL />";
+
+ String actualRules = xmlSerializer.serialize(Collections.singletonList(rule));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeMultipleRules_oneEmpty() throws Exception {
+ Rule rule1 = null;
+ Rule rule2 = new Rule(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"),
+ Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ String actualRules = xmlSerializer.serialize(Arrays.asList(rule1, rule2));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlStream_serializeValidOpenFormula() throws Exception {
+ Rule rule = new Rule(new OpenFormula(OpenFormula.NOT,
+ Collections.singletonList(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME,
+ "com.app.test"))), Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ OutputStream outputStream = new ByteArrayOutputStream();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ xmlSerializer.serialize(Collections.singletonList(rule), outputStream);
+
+ String actualRules = outputStream.toString();
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeValidOpenFormula_notConnector() throws Exception {
+ Rule rule = new Rule(new OpenFormula(OpenFormula.NOT,
+ Collections.singletonList(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME,
+ "com.app.test"))), Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.NOT + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ String actualRules = xmlSerializer.serialize(Collections.singletonList(rule));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeValidOpenFormula_andConnector() throws Exception {
+ Rule rule = new Rule(new OpenFormula(OpenFormula.AND,
+ Arrays.asList(new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME,
+ "com.app.test"),
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE,
+ "test_cert"))), Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.AND + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.APP_CERTIFICATE + "</K>"
+ + "<V>test_cert</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ String actualRules = xmlSerializer.serialize(Collections.singletonList(rule));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeValidOpenFormula_orConnector() throws Exception {
+ Rule rule = new Rule(new OpenFormula(OpenFormula.OR,
+ Arrays.asList(new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME,
+ "com.app.test"),
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE,
+ "test_cert"))), Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<OF>"
+ + "<C>" + OpenFormula.OR + "</C>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.APP_CERTIFICATE + "</K>"
+ + "<V>test_cert</V>"
+ + "</AF>"
+ + "</OF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ String actualRules = xmlSerializer.serialize(Collections.singletonList(rule));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeValidAtomicFormula_stringValue() throws Exception {
+ Rule rule = new Rule(
+ new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test"),
+ Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PACKAGE_NAME + "</K>"
+ + "<V>com.app.test</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ String actualRules = xmlSerializer.serialize(Collections.singletonList(rule));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeValidAtomicFormula_integerValue() throws Exception {
+ Rule rule = new Rule(
+ new AtomicFormula.IntAtomicFormula(AtomicFormula.VERSION_CODE, AtomicFormula.EQ, 1),
+ Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.VERSION_CODE + "</K>"
+ + "<O>" + AtomicFormula.EQ + "</O>"
+ + "<V>1</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ String actualRules = xmlSerializer.serialize(Collections.singletonList(rule));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeValidAtomicFormula_booleanValue() throws Exception {
+ Rule rule = new Rule(
+ new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true),
+ Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+ String expectedRules = "<RL>"
+ + "<R>"
+ + "<AF>"
+ + "<K>" + AtomicFormula.PRE_INSTALLED + "</K>"
+ + "<V>true</V>"
+ + "</AF>"
+ + "<E>" + Rule.DENY + "</E>"
+ + "</R>"
+ + "</RL>";
+
+ String actualRules = xmlSerializer.serialize(Collections.singletonList(rule));
+
+ assertEquals(expectedRules, actualRules);
+ }
+
+ @Test
+ public void testXmlString_serializeInvalidFormulaType() throws Exception {
+ Formula invalidFormula = getInvalidFormula();
+ Rule rule = new Rule(invalidFormula, Rule.DENY);
+ RuleSerializer xmlSerializer = new RuleXmlSerializer();
+
+ assertExpectException(
+ RuleSerializeException.class,
+ /* expectedExceptionMessageRegex */ "Invalid formula type",
+ () -> xmlSerializer.serialize(Collections.singletonList(rule)));
+ }
+
+ private Formula getInvalidFormula() {
+ return new Formula() {
+ @Override
+ public boolean isSatisfied(AppInstallMetadata appInstallMetadata) {
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+ }
+
+ @NonNull
+ @Override
+ protected Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
+ @Override
+ public String toString() {
+ return super.toString();
+ }
+
+ @Override
+ protected void finalize() throws Throwable {
+ super.finalize();
+ }
+ };
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java b/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java
index 819091c..f6fb6e2 100644
--- a/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java
@@ -20,20 +20,17 @@
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.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.annotation.Nullable;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
import android.content.pm.PackageParser;
import android.os.Build;
import android.os.Process;
-import android.permission.IPermissionManager;
import android.util.ArrayMap;
import org.junit.Before;
@@ -43,20 +40,16 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import java.util.Map;
-
@RunWith(JUnit4.class)
public class AppsFilterTest {
private static final int DUMMY_CALLING_UID = 10345;
-
- @Mock
- IPermissionManager mPermissionManagerMock;
+ private static final int DUMMY_TARGET_UID = 10556;
@Mock
AppsFilter.FeatureConfig mFeatureConfigMock;
- private Map<String, PackageParser.Package> mExisting = new ArrayMap<>();
+ private ArrayMap<String, PackageSetting> mExisting = new ArrayMap<>();
private static PackageBuilder pkg(String packageName) {
return new PackageBuilder(packageName)
@@ -72,9 +65,10 @@
}
private static PackageBuilder pkg(String packageName, IntentFilter... filters) {
+ final ActivityInfo activityInfo = new ActivityInfo();
final PackageBuilder packageBuilder = pkg(packageName).addActivity(
pkg -> new PackageParser.ParseComponentArgs(pkg, new String[1], 0, 0, 0, 0, 0, 0,
- new String[]{packageName}, 0, 0, 0), new ActivityInfo());
+ new String[]{packageName}, 0, 0, 0), activityInfo);
for (IntentFilter filter : filters) {
packageBuilder.addActivityIntentInfo(0 /* index */, activity -> {
final PackageParser.ActivityIntentInfo info =
@@ -83,7 +77,7 @@
filter.actionsIterator().forEachRemaining(info::addAction);
}
if (filter.countCategories() > 0) {
- filter.actionsIterator().forEachRemaining(info::addAction);
+ filter.actionsIterator().forEachRemaining(info::addCategory);
}
if (filter.countDataAuthorities() > 0) {
filter.authoritiesIterator().forEachRemaining(info::addDataAuthority);
@@ -91,6 +85,7 @@
if (filter.countDataSchemes() > 0) {
filter.schemesIterator().forEachRemaining(info::addDataScheme);
}
+ activityInfo.exported = true;
return info;
});
}
@@ -102,9 +97,6 @@
mExisting = new ArrayMap<>();
MockitoAnnotations.initMocks(this);
- when(mPermissionManagerMock
- .checkPermission(anyString(), anyString(), anyInt()))
- .thenReturn(PackageManager.PERMISSION_DENIED);
when(mFeatureConfigMock.isGloballyEnabled()).thenReturn(true);
when(mFeatureConfigMock.packageIsEnabled(any(PackageParser.Package.class)))
.thenReturn(true);
@@ -113,7 +105,7 @@
@Test
public void testSystemReadyPropogates() throws Exception {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock, new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
appsFilter.onSystemReady();
verify(mFeatureConfigMock).onSystemReady();
}
@@ -121,12 +113,12 @@
@Test
public void testQueriesAction_FilterMatches() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock, new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
PackageSetting target = simulateAddPackage(appsFilter,
- pkg("com.some.package", new IntentFilter("TEST_ACTION"))).build();
+ pkg("com.some.package", new IntentFilter("TEST_ACTION")), DUMMY_TARGET_UID);
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package", new Intent("TEST_ACTION"))).build();
+ pkg("com.some.other.package", new Intent("TEST_ACTION")), DUMMY_CALLING_UID);
assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -134,12 +126,12 @@
@Test
public void testQueriesAction_NoMatchingAction_Filters() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock, new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
PackageSetting target = simulateAddPackage(appsFilter,
- pkg("com.some.package")).build();
+ pkg("com.some.package"), DUMMY_TARGET_UID);
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package", new Intent("TEST_ACTION"))).build();
+ pkg("com.some.other.package", new Intent("TEST_ACTION")), DUMMY_CALLING_UID);
assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -147,13 +139,17 @@
@Test
public void testQueriesAction_NoMatchingActionFilterLowSdk_DoesntFilter() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package")).build();
- PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package",
- new Intent("TEST_ACTION")).setApplicationInfoTargetSdkVersion(
- Build.VERSION_CODES.P)).build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID);
+ PackageSetting calling = simulateAddPackage(appsFilter,
+ pkg("com.some.other.package",
+ new Intent("TEST_ACTION"))
+ .setApplicationInfoTargetSdkVersion(Build.VERSION_CODES.P),
+ DUMMY_CALLING_UID);
+
+ when(mFeatureConfigMock.packageIsEnabled(calling.pkg)).thenReturn(false);
assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -161,12 +157,12 @@
@Test
public void testNoQueries_Filters() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package")).build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID);
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package")).build();
+ pkg("com.some.other.package"), DUMMY_CALLING_UID);
assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -174,14 +170,12 @@
@Test
public void testForceQueryable_DoesntFilter() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
- PackageSetting target =
- simulateAddPackage(appsFilter, pkg("com.some.package").setForceQueryable(true))
- .build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package").setForceQueryable(true), DUMMY_TARGET_UID);
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package")).build();
+ pkg("com.some.other.package"), DUMMY_CALLING_UID);
assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -189,14 +183,13 @@
@Test
public void testForceQueryableByDevice_SystemCaller_DoesntFilter() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{"com.some.package"}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{"com.some.package"}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"))
- .setPkgFlags(ApplicationInfo.FLAG_SYSTEM)
- .build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID,
+ setting -> setting.setPkgFlags(ApplicationInfo.FLAG_SYSTEM));
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package")).build();
+ pkg("com.some.other.package"), DUMMY_CALLING_UID);
assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -204,12 +197,12 @@
@Test
public void testForceQueryableByDevice_NonSystemCaller_Filters() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{"com.some.package"}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{"com.some.package"}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package")).build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID);
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package")).build();
+ pkg("com.some.other.package"), DUMMY_CALLING_UID);
assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -218,14 +211,14 @@
@Test
public void testSystemQueryable_DoesntFilter() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, true /* system force queryable */);
+ new AppsFilter(mFeatureConfigMock, new String[]{},
+ true /* system force queryable */);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"))
- .setPkgFlags(ApplicationInfo.FLAG_SYSTEM)
- .build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID,
+ setting -> setting.setPkgFlags(ApplicationInfo.FLAG_SYSTEM));
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package")).build();
+ pkg("com.some.other.package"), DUMMY_CALLING_UID);
assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -233,12 +226,12 @@
@Test
public void testQueriesPackage_DoesntFilter() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package")).build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID);
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package", "com.some.package")).build();
+ pkg("com.some.other.package", "com.some.package"), DUMMY_CALLING_UID);
assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -248,12 +241,12 @@
when(mFeatureConfigMock.packageIsEnabled(any(PackageParser.Package.class)))
.thenReturn(false);
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package")).build();
- PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package")).build();
+ PackageSetting target = simulateAddPackage(
+ appsFilter, pkg("com.some.package"), DUMMY_TARGET_UID);
+ PackageSetting calling = simulateAddPackage(
+ appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_UID);
assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
@@ -261,10 +254,10 @@
@Test
public void testSystemUid_DoesntFilter() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package")).build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID);
assertFalse(appsFilter.shouldFilterApplication(0, null, target, 0));
assertFalse(appsFilter.shouldFilterApplication(
@@ -274,10 +267,10 @@
@Test
public void testNonSystemUid_NoCallingSetting_Filters() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
- PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package")).build();
+ PackageSetting target = simulateAddPackage(appsFilter,
+ pkg("com.some.package"), DUMMY_TARGET_UID);
assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, null, target, 0));
}
@@ -285,8 +278,7 @@
@Test
public void testNoTargetPackage_filters() {
final AppsFilter appsFilter =
- new AppsFilter(mFeatureConfigMock, mPermissionManagerMock,
- new String[]{}, false);
+ new AppsFilter(mFeatureConfigMock, new String[]{}, false);
PackageSetting target = new PackageSettingBuilder()
.setName("com.some.package")
@@ -295,22 +287,36 @@
.setPVersionCode(1L)
.build();
PackageSetting calling = simulateAddPackage(appsFilter,
- pkg("com.some.other.package", new Intent("TEST_ACTION"))).build();
+ pkg("com.some.other.package", new Intent("TEST_ACTION")), DUMMY_CALLING_UID);
assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0));
}
- private PackageSettingBuilder simulateAddPackage(AppsFilter filter,
- PackageBuilder newPkgBuilder) {
+ private interface WithSettingBuilder {
+ PackageSettingBuilder withBuilder(PackageSettingBuilder builder);
+ }
+
+ private PackageSetting simulateAddPackage(AppsFilter filter,
+ PackageBuilder newPkgBuilder, int appId) {
+ return simulateAddPackage(filter, newPkgBuilder, appId, null);
+ }
+
+ private PackageSetting simulateAddPackage(AppsFilter filter,
+ PackageBuilder newPkgBuilder, int appId, @Nullable WithSettingBuilder action) {
PackageParser.Package newPkg = newPkgBuilder.build();
- filter.addPackage(newPkg, mExisting);
- mExisting.put(newPkg.packageName, newPkg);
- return new PackageSettingBuilder()
+
+ final PackageSettingBuilder settingBuilder = new PackageSettingBuilder()
.setPackage(newPkg)
+ .setAppId(appId)
.setName(newPkg.packageName)
.setCodePath("/")
.setResourcePath("/")
.setPVersionCode(1L);
+ final PackageSetting setting =
+ (action == null ? settingBuilder : action.withBuilder(settingBuilder)).build();
+ filter.addPackage(setting, mExisting);
+ mExisting.put(newPkg.packageName, setting);
+ return setting;
}
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java
index 3c10447..b751308 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java
@@ -156,6 +156,8 @@
if (isMultiPackage) {
params.isMultiPackage = true;
}
+ InstallSource installSource = InstallSource.create("testInstaller", null, "testInstaller",
+ false);
return new PackageInstallerSession(
/* callback */ null,
/* context */null,
@@ -166,7 +168,7 @@
/* sessionId */ sessionId,
/* userId */ 456,
/* installerUid */ -1,
- /* installSource */ InstallSource.create("testInstaller", "testInstaller"),
+ /* installSource */ installSource,
/* sessionParams */ params,
/* createdMillis */ 0L,
/* stageDir */ mTmpDir,
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java b/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java
index 06c6314..8d476f6 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java
@@ -43,6 +43,7 @@
private String mVolumeUuid;
private SparseArray<PackageUserState> mUserStates = new SparseArray<>();
private PackageParser.Package mPkg;
+ private int mAppId;
public PackageSettingBuilder setPackage(PackageParser.Package pkg) {
this.mPkg = pkg;
@@ -54,6 +55,11 @@
return this;
}
+ public PackageSettingBuilder setAppId(int appId) {
+ this.mAppId = appId;
+ return this;
+ }
+
public PackageSettingBuilder setRealName(String realName) {
this.mRealName = realName;
return this;
@@ -152,6 +158,7 @@
mChildPackageNames, mSharedUserId, mUsesStaticLibraries,
mUsesStaticLibrariesVersions);
packageSetting.pkg = mPkg;
+ packageSetting.appId = mAppId;
packageSetting.volumeUuid = this.mVolumeUuid;
for (int i = 0; i < mUserStates.size(); i++) {
packageSetting.setUserState(mUserStates.keyAt(i), mUserStates.valueAt(i));
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserLifecycleStressTest.java b/services/tests/servicestests/src/com/android/server/pm/UserLifecycleStressTest.java
index d6f7e37..7916bd3 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserLifecycleStressTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserLifecycleStressTest.java
@@ -71,7 +71,7 @@
throws IOException, RemoteException, InterruptedException {
for (int i = 0; i < NUM_ITERATIONS_STOP_USER; i++) {
final UserInfo userInfo = mUserManager.createProfileForUser("TestUser",
- UserInfo.FLAG_MANAGED_PROFILE, mActivityManager.getCurrentUser());
+ UserManager.USER_TYPE_PROFILE_MANAGED, 0, mActivityManager.getCurrentUser());
assertNotNull(userInfo);
try {
assertTrue(
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceCreateProfileTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceCreateProfileTest.java
index 8dd8967..e375aef 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceCreateProfileTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceCreateProfileTest.java
@@ -16,15 +16,15 @@
package com.android.server.pm;
+import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import android.app.ApplicationPackageManager;
import android.content.pm.UserInfo;
import android.os.Looper;
import android.os.UserHandle;
import android.os.UserManagerInternal;
-import android.util.IconDrawableFactory;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.MediumTest;
@@ -71,6 +71,7 @@
removeUsers();
}
+ /** Tests UMS.getProfileIds() when no specific userType is specified. */
@Test
public void testGetProfiles() {
// Pretend we have a secondary user with a profile.
@@ -93,38 +94,73 @@
|| users.get(1).id == profile.id);
}
+ /** Tests UMS.getProfileIds() when a specific userType is specified. */
+ @Test
+ public void testGetProfileIds_specifyType() {
+ // Pretend we have a secondary user with a profile.
+ UserInfo secondaryUser = addUser();
+ UserInfo profile = addProfile(secondaryUser);
+
+ // TODO: When there are multiple profiles types, ensure correct output for mixed types.
+ final String userType1 = USER_TYPE_PROFILE_MANAGED;
+
+ // System user should still have no userType1 profile so getProfileIds should be empty.
+ int[] users = mUserManagerService.getProfileIds(UserHandle.USER_SYSTEM, userType1, false);
+ assertEquals("System user should have no managed profiles", 0, users.length);
+
+ // Secondary user should have one userType1 profile, so return just that.
+ users = mUserManagerService.getProfileIds(secondaryUser.id, userType1, false);
+ assertEquals("Wrong number of profiles", 1, users.length);
+ assertEquals("Wrong profile id", profile.id, users[0]);
+
+ // The profile itself is a userType1 profile, so it should return just itself.
+ users = mUserManagerService.getProfileIds(profile.id, userType1, false);
+ assertEquals("Wrong number of profiles", 1, users.length);
+ assertEquals("Wrong profile id", profile.id, users[0]);
+ }
+
@Test
public void testProfileBadge() {
// First profile for system user should get badge 0
assertEquals("First profile isn't given badge index 0", 0,
- mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM));
+ mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM,
+ USER_TYPE_PROFILE_MANAGED));
// Pretend we have a secondary user.
UserInfo secondaryUser = addUser();
// Check first profile badge for secondary user is also 0.
assertEquals("First profile for secondary user isn't given badge index 0", 0,
- mUserManagerService.getFreeProfileBadgeLU(secondaryUser.id));
+ mUserManagerService.getFreeProfileBadgeLU(secondaryUser.id,
+ USER_TYPE_PROFILE_MANAGED));
// Shouldn't impact the badge for profile in system user
assertEquals("First profile isn't given badge index 0 with secondary user", 0,
- mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM));
+ mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM,
+ USER_TYPE_PROFILE_MANAGED));
// Pretend a secondary user has a profile.
addProfile(secondaryUser);
// Shouldn't have impacted the badge for the system user
assertEquals("First profile isn't given badge index 0 in secondary user", 0,
- mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM));
+ mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM,
+ USER_TYPE_PROFILE_MANAGED));
}
@Test
public void testProfileBadgeUnique() {
List<UserInfo> users = mUserManagerService.getUsers(/* excludeDying */ false);
UserInfo system = users.get(0);
+ int max = mUserManagerService.getMaxUsersOfTypePerParent(USER_TYPE_PROFILE_MANAGED);
+ if (max < 0) {
+ // Indicates no max. Instead of infinite, we'll just do 10.
+ max = 10;
+ }
// Badges should get allocated 0 -> max
- for (int i = 0; i < UserManagerService.getMaxManagedProfiles(); ++i) {
- int nextBadge = mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM);
+ for (int i = 0; i < max; ++i) {
+ int nextBadge = mUserManagerService.getFreeProfileBadgeLU(UserHandle.USER_SYSTEM,
+ USER_TYPE_PROFILE_MANAGED);
assertEquals("Wrong badge allocated", i, nextBadge);
UserInfo profile = addProfile(system);
profile.profileBadge = nextBadge;
@@ -140,30 +176,23 @@
mUserManagerService.addRemovingUserIdLocked(profile.id);
// We should reuse the badge from the profile being removed.
assertEquals("Badge index not reused while removing a user", 0,
- mUserManagerService.getFreeProfileBadgeLU(secondaryUser.id));
+ mUserManagerService.getFreeProfileBadgeLU(secondaryUser.id,
+ USER_TYPE_PROFILE_MANAGED));
// Edge case of reuse that only applies if we ever support 3 managed profiles
// We should prioritise using lower badge indexes
- if (UserManagerService.getMaxManagedProfiles() > 2) {
+ int max = mUserManagerService.getMaxUsersOfTypePerParent(USER_TYPE_PROFILE_MANAGED);
+ if (max < 0 || max > 2) {
UserInfo profileBadgeOne = addProfile(secondaryUser);
profileBadgeOne.profileBadge = 1;
// 0 and 2 are free, we should reuse 0 rather than 2.
assertEquals("Lower index not used", 0,
- mUserManagerService.getFreeProfileBadgeLU(secondaryUser.id));
+ mUserManagerService.getFreeProfileBadgeLU(secondaryUser.id,
+ USER_TYPE_PROFILE_MANAGED));
}
}
@Test
- public void testNumberOfBadges() {
- assertTrue("Max profiles greater than number of badges",
- UserManagerService.MAX_MANAGED_PROFILES
- <= IconDrawableFactory.CORP_BADGE_COLORS.length);
- assertEquals("Num colors doesn't match number of badge labels",
- IconDrawableFactory.CORP_BADGE_COLORS.length,
- ApplicationPackageManager.CORP_BADGE_LABEL_RES_ID.length);
- }
-
- @Test
public void testCanAddMoreManagedProfiles_removeProfile() {
// if device is low-ram or doesn't support managed profiles for some other reason, just
// skip the test
@@ -171,6 +200,10 @@
false /* disallow remove */)) {
return;
}
+ if (mUserManagerService.getMaxUsersOfTypePerParent(USER_TYPE_PROFILE_MANAGED) < 0) {
+ // Indicates no limit, so we cannot run this test;
+ return;
+ }
// GIVEN we've reached the limit of managed profiles possible on the system user
while (mUserManagerService.canAddMoreManagedProfiles(UserHandle.USER_SYSTEM,
@@ -192,6 +225,10 @@
false /* disallow remove */)) {
return;
}
+ if (mUserManagerService.getMaxUsersOfTypePerParent(USER_TYPE_PROFILE_MANAGED) < 0) {
+ // Indicates no limit, so we cannot run this test;
+ return;
+ }
// GIVEN we've reached the limit of managed profiles possible on the system user
// GIVEN that the profiles are not enabled yet
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
index 6d5b994..1e760cc 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
@@ -16,11 +16,29 @@
package com.android.server.pm;
+import static android.content.pm.UserInfo.FLAG_DEMO;
+import static android.content.pm.UserInfo.FLAG_EPHEMERAL;
+import static android.content.pm.UserInfo.FLAG_FULL;
+import static android.content.pm.UserInfo.FLAG_GUEST;
+import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE;
+import static android.content.pm.UserInfo.FLAG_PROFILE;
+import static android.content.pm.UserInfo.FLAG_RESTRICTED;
+import static android.content.pm.UserInfo.FLAG_SYSTEM;
+import static android.os.UserManager.USER_TYPE_FULL_DEMO;
+import static android.os.UserManager.USER_TYPE_FULL_GUEST;
+import static android.os.UserManager.USER_TYPE_FULL_RESTRICTED;
+import static android.os.UserManager.USER_TYPE_FULL_SECONDARY;
+import static android.os.UserManager.USER_TYPE_FULL_SYSTEM;
+import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;
+import static android.os.UserManager.USER_TYPE_SYSTEM_HEADLESS;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import android.annotation.UserIdInt;
import android.content.pm.UserInfo;
+import android.content.pm.UserInfo.UserInfoFlag;
import android.os.Looper;
import android.os.Parcel;
import android.os.UserHandle;
@@ -121,8 +139,61 @@
assertEquals("A Name", mUserManagerService.getUserInfo(TEST_ID).name);
}
+ /** Test UMS.getUserTypeForUser(). */
+ @Test
+ public void testGetUserTypeForUser() throws Exception {
+ final String typeSys = mUserManagerService.getUserTypeForUser(UserHandle.USER_SYSTEM);
+ assertTrue("System user was of invalid type " + typeSys,
+ typeSys.equals(USER_TYPE_SYSTEM_HEADLESS) || typeSys.equals(USER_TYPE_FULL_SYSTEM));
+
+ final int testId = 100;
+ final String typeName = "A type";
+ UserInfo userInfo = createUser(testId, 0, typeName);
+ mUserManagerService.putUserInfo(userInfo);
+ assertEquals(typeName, mUserManagerService.getUserTypeForUser(testId));
+ }
+
+ /** Tests upgradeIfNecessaryLP (but without locking) for upgrading from version 8 to 9+. */
+ @Test
+ public void testUpgradeIfNecessaryLP_9() {
+ final int versionToTest = 9;
+
+ mUserManagerService.putUserInfo(createUser(100, FLAG_MANAGED_PROFILE, null));
+ mUserManagerService.putUserInfo(createUser(101,
+ FLAG_GUEST | FLAG_EPHEMERAL | FLAG_FULL, null));
+ mUserManagerService.putUserInfo(createUser(102, FLAG_RESTRICTED | FLAG_FULL, null));
+ mUserManagerService.putUserInfo(createUser(103, FLAG_FULL, null));
+ mUserManagerService.putUserInfo(createUser(104, FLAG_SYSTEM, null));
+ mUserManagerService.putUserInfo(createUser(105, FLAG_SYSTEM | FLAG_FULL, null));
+ mUserManagerService.putUserInfo(createUser(106, FLAG_DEMO | FLAG_FULL, null));
+
+ mUserManagerService.upgradeIfNecessaryLP(null, versionToTest - 1);
+
+ assertEquals(USER_TYPE_PROFILE_MANAGED, mUserManagerService.getUserTypeForUser(100));
+ assertTrue((mUserManagerService.getUserInfo(100).flags & FLAG_PROFILE) != 0);
+
+ assertEquals(USER_TYPE_FULL_GUEST, mUserManagerService.getUserTypeForUser(101));
+
+ assertEquals(USER_TYPE_FULL_RESTRICTED, mUserManagerService.getUserTypeForUser(102));
+ assertTrue((mUserManagerService.getUserInfo(102).flags & FLAG_PROFILE) == 0);
+
+ assertEquals(USER_TYPE_FULL_SECONDARY, mUserManagerService.getUserTypeForUser(103));
+ assertTrue((mUserManagerService.getUserInfo(103).flags & FLAG_PROFILE) == 0);
+
+ assertEquals(USER_TYPE_SYSTEM_HEADLESS, mUserManagerService.getUserTypeForUser(104));
+
+ assertEquals(USER_TYPE_FULL_SYSTEM, mUserManagerService.getUserTypeForUser(105));
+
+ assertEquals(USER_TYPE_FULL_DEMO, mUserManagerService.getUserTypeForUser(106));
+ }
+
+ /** Creates a UserInfo with the given flags and userType. */
+ private UserInfo createUser(@UserIdInt int userId, @UserInfoFlag int flags, String userType) {
+ return new UserInfo(userId, "A Name", "A path", flags, userType);
+ }
+
private UserInfo createUser() {
- UserInfo user = new UserInfo(/*id*/ 21, "A Name", "A path", /*flags*/ 0x0ff0ff);
+ UserInfo user = new UserInfo(/*id*/ 21, "A Name", "A path", /*flags*/ 0x0ff0ff, "A type");
user.serialNumber = 5;
user.creationTime = 4L << 32;
user.lastLoggedInTime = 5L << 32;
@@ -141,6 +212,7 @@
assertEquals("Name not preserved", one.name, two.name);
assertEquals("Icon path not preserved", one.iconPath, two.iconPath);
assertEquals("Flags not preserved", one.flags, two.flags);
+ assertEquals("UserType not preserved", one.userType, two.userType);
assertEquals("profile group not preserved", one.profileGroupId,
two.profileGroupId);
assertEquals("restricted profile parent not preseved", one.restrictedProfileParentId,
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserTypeTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserTypeTest.java
new file mode 100644
index 0000000..7aadd87
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserTypeTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2019 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.pm;
+
+import static android.content.pm.UserInfo.FLAG_DEMO;
+import static android.content.pm.UserInfo.FLAG_EPHEMERAL;
+import static android.content.pm.UserInfo.FLAG_FULL;
+import static android.content.pm.UserInfo.FLAG_GUEST;
+import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE;
+import static android.content.pm.UserInfo.FLAG_PROFILE;
+import static android.content.pm.UserInfo.FLAG_RESTRICTED;
+import static android.content.pm.UserInfo.FLAG_SYSTEM;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertThrows;
+
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.os.UserManager;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Tests for {@link UserTypeDetails} and {@link UserTypeFactory}.
+ *
+ * <p>Run with: atest UserManagerServiceUserTypeTest
+ */
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class UserManagerServiceUserTypeTest {
+
+ @Test
+ public void testUserTypeBuilder_createUserType() {
+ UserTypeDetails type = new UserTypeDetails.Builder()
+ .setName("a.name")
+ .setEnabled(true)
+ .setMaxAllowed(21)
+ .setBaseType(FLAG_FULL)
+ .setDefaultUserInfoPropertyFlags(FLAG_EPHEMERAL)
+ .setBadgeLabels(23, 24, 25)
+ .setBadgeColors(26, 27)
+ .setIconBadge(28)
+ .setBadgePlain(29)
+ .setBadgeNoBackground(30)
+ .setLabel(31)
+ .setMaxAllowedPerParent(32)
+ .setDefaultRestrictions(new ArrayList<>(Arrays.asList("r1", "r2")))
+ .createUserTypeDetails();
+
+ assertEquals("a.name", type.getName());
+ assertTrue(type.isEnabled());
+ assertEquals(21, type.getMaxAllowed());
+ assertEquals(FLAG_FULL | FLAG_EPHEMERAL, type.getDefaultUserInfoFlags());
+ assertEquals(28, type.getIconBadge());
+ assertEquals(29, type.getBadgePlain());
+ assertEquals(30, type.getBadgeNoBackground());
+ assertEquals(31, type.getLabel());
+ assertEquals(32, type.getMaxAllowedPerParent());
+ assertEquals(new ArrayList<>(Arrays.asList("r1", "r2")), type.getDefaultRestrictions());
+
+
+ assertEquals(23, type.getBadgeLabel(0));
+ assertEquals(24, type.getBadgeLabel(1));
+ assertEquals(25, type.getBadgeLabel(2));
+ assertEquals(25, type.getBadgeLabel(3));
+ assertEquals(25, type.getBadgeLabel(4));
+ assertEquals(Resources.ID_NULL, type.getBadgeLabel(-1));
+
+ assertEquals(26, type.getBadgeColor(0));
+ assertEquals(27, type.getBadgeColor(1));
+ assertEquals(27, type.getBadgeColor(2));
+ assertEquals(27, type.getBadgeColor(3));
+ assertEquals(Resources.ID_NULL, type.getBadgeColor(-100));
+
+ assertTrue(type.hasBadge());
+ }
+
+ @Test
+ public void testUserTypeBuilder_defaults() {
+ UserTypeDetails type = new UserTypeDetails.Builder()
+ .setName("name") // Required (no default allowed)
+ .setBaseType(FLAG_FULL) // Required (no default allowed)
+ .createUserTypeDetails();
+
+ assertTrue(type.isEnabled());
+ assertEquals(UserTypeDetails.UNLIMITED_NUMBER_OF_USERS, type.getMaxAllowed());
+ assertEquals(UserTypeDetails.UNLIMITED_NUMBER_OF_USERS, type.getMaxAllowedPerParent());
+ assertEquals(FLAG_FULL, type.getDefaultUserInfoFlags());
+ assertEquals(Resources.ID_NULL, type.getIconBadge());
+ assertEquals(Resources.ID_NULL, type.getBadgePlain());
+ assertEquals(Resources.ID_NULL, type.getBadgeNoBackground());
+ assertEquals(Resources.ID_NULL, type.getBadgeLabel(0));
+ assertEquals(Resources.ID_NULL, type.getBadgeColor(0));
+ assertEquals(Resources.ID_NULL, type.getLabel());
+ assertTrue(type.getDefaultRestrictions().isEmpty());
+
+ assertFalse(type.hasBadge());
+ }
+
+ @Test
+ public void testUserTypeBuilder_nameIsRequired() {
+ assertThrows(IllegalArgumentException.class,
+ () -> new UserTypeDetails.Builder()
+ .setMaxAllowed(21)
+ .setBaseType(FLAG_FULL)
+ .createUserTypeDetails());
+ }
+
+ @Test
+ public void testUserTypeBuilder_baseTypeIsRequired() {
+ assertThrows(IllegalArgumentException.class,
+ () -> new UserTypeDetails.Builder()
+ .setName("name")
+ .createUserTypeDetails());
+ }
+
+ @Test
+ public void testUserTypeBuilder_colorIsRequiredIfBadged() {
+ assertThrows(IllegalArgumentException.class,
+ () -> getMinimalBuilder()
+ .setIconBadge(1)
+ .setBadgeLabels(2)
+ .createUserTypeDetails());
+ }
+
+ @Test
+ public void testUserTypeBuilder_badgeLabelIsRequiredIfBadged() {
+ assertThrows(IllegalArgumentException.class,
+ () -> getMinimalBuilder()
+ .setIconBadge(1)
+ .setBadgeColors(2)
+ .createUserTypeDetails());
+ }
+
+ @Test
+ public void testCheckUserTypeConsistency() {
+ assertTrue(UserManagerService.checkUserTypeConsistency(FLAG_GUEST));
+ assertTrue(UserManagerService.checkUserTypeConsistency(FLAG_GUEST | FLAG_EPHEMERAL));
+ assertTrue(UserManagerService.checkUserTypeConsistency(FLAG_PROFILE));
+
+ assertFalse(UserManagerService.checkUserTypeConsistency(FLAG_DEMO | FLAG_RESTRICTED));
+ assertFalse(UserManagerService.checkUserTypeConsistency(FLAG_PROFILE | FLAG_SYSTEM));
+ assertFalse(UserManagerService.checkUserTypeConsistency(FLAG_PROFILE | FLAG_FULL));
+ }
+
+ @Test
+ public void testGetDefaultUserType() {
+ // Simple example.
+ assertEquals(UserManager.USER_TYPE_FULL_RESTRICTED,
+ UserInfo.getDefaultUserType(FLAG_RESTRICTED));
+
+ // Type plus a non-type flag.
+ assertEquals(UserManager.USER_TYPE_FULL_GUEST,
+ UserInfo.getDefaultUserType(FLAG_GUEST | FLAG_EPHEMERAL));
+
+ // Two types, which is illegal.
+ assertThrows(IllegalArgumentException.class,
+ () -> UserInfo.getDefaultUserType(FLAG_MANAGED_PROFILE | FLAG_GUEST));
+
+ // No type, which defaults to {@link UserManager#USER_TYPE_FULL_SECONDARY}.
+ assertEquals(UserManager.USER_TYPE_FULL_SECONDARY,
+ UserInfo.getDefaultUserType(FLAG_EPHEMERAL));
+ }
+
+ /** Returns a minimal {@link UserTypeDetails.Builder} that can legitimately be created. */
+ private UserTypeDetails.Builder getMinimalBuilder() {
+ return new UserTypeDetails.Builder().setName("name").setBaseType(FLAG_FULL);
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
index e9edba5..d071927 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -16,6 +16,7 @@
package com.android.server.pm;
+import android.annotation.UserIdInt;
import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -23,6 +24,7 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
+import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
@@ -196,6 +198,62 @@
}
}
+ /** Tests creating a FULL user via specifying userType. */
+ @MediumTest
+ public void testCreateUserViaTypes() throws Exception {
+ createUserWithTypeAndCheckFlags(UserManager.USER_TYPE_FULL_GUEST,
+ UserInfo.FLAG_GUEST | UserInfo.FLAG_FULL);
+
+ createUserWithTypeAndCheckFlags(UserManager.USER_TYPE_FULL_DEMO,
+ UserInfo.FLAG_DEMO | UserInfo.FLAG_FULL);
+
+ createUserWithTypeAndCheckFlags(UserManager.USER_TYPE_FULL_SECONDARY,
+ UserInfo.FLAG_FULL);
+ }
+
+ /** Tests creating a FULL user via specifying user flags. */
+ @MediumTest
+ public void testCreateUserViaFlags() throws Exception {
+ createUserWithFlagsAndCheckType(UserInfo.FLAG_GUEST, UserManager.USER_TYPE_FULL_GUEST,
+ UserInfo.FLAG_FULL);
+
+ createUserWithFlagsAndCheckType(0, UserManager.USER_TYPE_FULL_SECONDARY,
+ UserInfo.FLAG_FULL);
+
+ createUserWithFlagsAndCheckType(UserInfo.FLAG_FULL, UserManager.USER_TYPE_FULL_SECONDARY,
+ 0);
+
+ createUserWithFlagsAndCheckType(UserInfo.FLAG_DEMO, UserManager.USER_TYPE_FULL_DEMO,
+ UserInfo.FLAG_FULL);
+ }
+
+ /** Creates a user of the given user type and checks that the result has the requiredFlags. */
+ private void createUserWithTypeAndCheckFlags(String userType,
+ @UserIdInt int requiredFlags) {
+ final UserInfo userInfo = createUser("Name", userType, 0);
+ assertEquals("Wrong user type", userType, userInfo.userType);
+ assertEquals(
+ "Flags " + userInfo.flags + " did not contain expected " + requiredFlags,
+ requiredFlags, userInfo.flags & requiredFlags);
+ removeUser(userInfo.id);
+ }
+
+ /**
+ * Creates a user of the given flags and checks that the result is of the expectedUserType type
+ * and that it has the expected flags (including both flags and any additionalRequiredFlags).
+ */
+ private void createUserWithFlagsAndCheckType(@UserIdInt int flags, String expectedUserType,
+ @UserIdInt int additionalRequiredFlags) {
+ final UserInfo userInfo = createUser("Name", flags);
+ assertEquals("Wrong user type", expectedUserType, userInfo.userType);
+ additionalRequiredFlags |= flags;
+ assertEquals(
+ "Flags " + userInfo.flags + " did not contain expected " + additionalRequiredFlags,
+ additionalRequiredFlags, userInfo.flags & additionalRequiredFlags);
+ removeUser(userInfo.id);
+ }
+
+
@MediumTest
public void testAddGuest() throws Exception {
UserInfo userInfo1 = createUser("Guest 1", UserInfo.FLAG_GUEST);
@@ -234,7 +292,7 @@
final int primaryUserId = mUserManager.getPrimaryUser().id;
UserInfo userInfo = createProfileForUser("Profile",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
assertNotNull(userInfo);
assertNull(mUserManager.getProfileParent(primaryUserId));
UserInfo parentProfileInfo = mUserManager.getProfileParent(userInfo.id);
@@ -244,17 +302,61 @@
assertNull(mUserManager.getProfileParent(primaryUserId));
}
+ /** Test that UserManager returns the correct badge information for a managed profile. */
+ @MediumTest
+ public void testProfileTypeInformation() throws Exception {
+ final UserTypeDetails userTypeDetails =
+ UserTypeFactory.getUserTypes().get(UserManager.USER_TYPE_PROFILE_MANAGED);
+ assertNotNull("No " + UserManager.USER_TYPE_PROFILE_MANAGED + " type on device",
+ userTypeDetails);
+ assertEquals(UserManager.USER_TYPE_PROFILE_MANAGED, userTypeDetails.getName());
+
+ final int primaryUserId = mUserManager.getPrimaryUser().id;
+ UserInfo userInfo = createProfileForUser("Managed",
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
+ assertNotNull(userInfo);
+ final int userId = userInfo.id;
+ final UserHandle userHandle = new UserHandle(userId);
+
+ assertEquals(userTypeDetails.hasBadge(),
+ mUserManager.hasBadge(userId));
+ assertEquals(userTypeDetails.getIconBadge(),
+ mUserManager.getUserIconBadgeResId(userId));
+ assertEquals(userTypeDetails.getBadgePlain(),
+ mUserManager.getUserBadgeResId(userId));
+ assertEquals(userTypeDetails.getBadgeNoBackground(),
+ mUserManager.getUserBadgeNoBackgroundResId(userId));
+ assertEquals(userTypeDetails.isProfile(),
+ mUserManager.isProfile(userId));
+ assertEquals(userTypeDetails.getName(),
+ mUserManager.getUserTypeForUser(userHandle));
+
+ final int badgeIndex = userInfo.profileBadge;
+ assertEquals(
+ Resources.getSystem().getColor(userTypeDetails.getBadgeColor(badgeIndex), null),
+ mUserManager.getUserBadgeColor(userId));
+ assertEquals(
+ Resources.getSystem().getString(userTypeDetails.getBadgeLabel(badgeIndex), "Test"),
+ mUserManager.getBadgedLabelForUser("Test", userHandle));
+ }
+
// Make sure only one managed profile can be created
@MediumTest
public void testAddManagedProfile() throws Exception {
final int primaryUserId = mUserManager.getPrimaryUser().id;
UserInfo userInfo1 = createProfileForUser("Managed 1",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
UserInfo userInfo2 = createProfileForUser("Managed 2",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
assertNotNull(userInfo1);
assertNull(userInfo2);
+
+ assertEquals(userInfo1.userType, UserManager.USER_TYPE_PROFILE_MANAGED);
+ int requiredFlags = UserInfo.FLAG_MANAGED_PROFILE | UserInfo.FLAG_PROFILE;
+ assertEquals("Wrong flags " + userInfo1.flags, requiredFlags,
+ userInfo1.flags & requiredFlags);
+
// Verify that current user is not a managed profile
assertFalse(mUserManager.isManagedProfile());
}
@@ -264,7 +366,7 @@
public void testAddManagedProfile_withDisallowedPackages() throws Exception {
final int primaryUserId = mUserManager.getPrimaryUser().id;
UserInfo userInfo1 = createProfileForUser("Managed1",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
// Verify that the packagesToVerify are installed by default.
for (String pkg : PACKAGES) {
assertTrue("Package should be installed in managed profile: " + pkg,
@@ -273,7 +375,7 @@
removeUser(userInfo1.id);
UserInfo userInfo2 = createProfileForUser("Managed2",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId, PACKAGES);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId, PACKAGES);
// Verify that the packagesToVerify are not installed by default.
for (String pkg : PACKAGES) {
assertFalse("Package should not be installed in managed profile when disallowed: "
@@ -287,7 +389,7 @@
public void testAddManagedProfile_disallowedPackagesInstalledLater() throws Exception {
final int primaryUserId = mUserManager.getPrimaryUser().id;
UserInfo userInfo = createProfileForUser("Managed",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId, PACKAGES);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId, PACKAGES);
// Verify that the packagesToVerify are not installed by default.
for (String pkg : PACKAGES) {
assertFalse("Package should not be installed in managed profile when disallowed: "
@@ -326,7 +428,7 @@
primaryUserHandle);
try {
UserInfo userInfo = createProfileForUser("Managed",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
assertNull(userInfo);
} finally {
mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, false,
@@ -343,7 +445,7 @@
primaryUserHandle);
try {
UserInfo userInfo = createProfileEvenWhenDisallowedForUser("Managed",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
assertNotNull(userInfo);
} finally {
mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, false,
@@ -359,7 +461,7 @@
mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_USER, true, primaryUserHandle);
try {
UserInfo userInfo = createProfileForUser("Managed",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
assertNotNull(userInfo);
} finally {
mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_USER, false,
@@ -396,7 +498,7 @@
final int primaryUserId = mUserManager.getPrimaryUser().id;
final long startTime = System.currentTimeMillis();
UserInfo profile = createProfileForUser("Managed 1",
- UserInfo.FLAG_MANAGED_PROFILE, primaryUserId);
+ UserManager.USER_TYPE_PROFILE_MANAGED, primaryUserId);
final long endTime = System.currentTimeMillis();
assertNotNull(profile);
if (System.currentTimeMillis() > EPOCH_PLUS_30_YEARS) {
@@ -663,24 +765,32 @@
return user;
}
- private UserInfo createProfileForUser(String name, int flags, int userHandle) {
- return createProfileForUser(name, flags, userHandle, null);
+ private UserInfo createUser(String name, String userType, int flags) {
+ UserInfo user = mUserManager.createUser(name, userType, flags);
+ if (user != null) {
+ usersToRemove.add(user.id);
+ }
+ return user;
}
- private UserInfo createProfileForUser(String name, int flags, int userHandle,
+ private UserInfo createProfileForUser(String name, String userType, int userHandle) {
+ return createProfileForUser(name, userType, userHandle, null);
+ }
+
+ private UserInfo createProfileForUser(String name, String userType, int userHandle,
String[] disallowedPackages) {
UserInfo profile = mUserManager.createProfileForUser(
- name, flags, userHandle, disallowedPackages);
+ name, userType, 0, userHandle, disallowedPackages);
if (profile != null) {
usersToRemove.add(profile.id);
}
return profile;
}
- private UserInfo createProfileEvenWhenDisallowedForUser(String name, int flags,
+ private UserInfo createProfileEvenWhenDisallowedForUser(String name, String userType,
int userHandle) {
UserInfo profile = mUserManager.createProfileForUserEvenWhenDisallowed(
- name, flags, userHandle, null);
+ name, userType, 0, userHandle, null);
if (profile != null) {
usersToRemove.add(profile.id);
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java
index f0b0328..f492932 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java
@@ -147,7 +147,7 @@
final ArrayMap<String, Integer> expectedOutput = getNewPackageToWhitelistedFlagsMap();
expectedOutput.put("com.android.package1",
- UserInfo.PROFILE_FLAGS_MASK | FLAG_SYSTEM | FLAG_GUEST);
+ UserInfo.FLAG_PROFILE | FLAG_SYSTEM | FLAG_GUEST);
expectedOutput.put("com.android.package2",
UserInfo.FLAG_MANAGED_PROFILE);
@@ -376,9 +376,9 @@
/** Sets the whitelist mode to the desired value via adb's setprop. */
private void setUserTypePackageWhitelistMode(int mode) {
- UiDevice mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
try {
- String result = mUiDevice.executeShellCommand(String.format("setprop %s %d",
+ String result = uiDevice.executeShellCommand(String.format("setprop %s %d",
PACKAGE_WHITELIST_MODE_PROP, mode));
assertFalse("Failed to set sysprop " + PACKAGE_WHITELIST_MODE_PROP + ": " + result,
result != null && result.contains("Failed"));
@@ -390,7 +390,7 @@
private ArrayMap<String, Integer> getNewPackageToWhitelistedFlagsMap() {
final ArrayMap<String, Integer> pkgFlagMap = new ArrayMap<>();
// "android" is always treated as whitelisted, regardless of the xml file.
- pkgFlagMap.put("android", FLAG_SYSTEM | UserInfo.FLAG_FULL | UserInfo.PROFILE_FLAGS_MASK);
+ pkgFlagMap.put("android", FLAG_SYSTEM | UserInfo.FLAG_FULL | UserInfo.FLAG_PROFILE);
return pkgFlagMap;
}
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserTests.java b/services/tests/servicestests/src/com/android/server/pm/UserTests.java
new file mode 100644
index 0000000..525382d
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/UserTests.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2019 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.pm;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ UserDataPreparerTest.class,
+ UserLifecycleStressTest.class,
+ UserManagerServiceCreateProfileTest.class,
+ UserManagerServiceIdRecyclingTest.class,
+ UserManagerServiceTest.class,
+ UserManagerServiceUserInfoTest.class,
+ UserManagerServiceUserTypeTest.class,
+ UserManagerTest.class,
+ UserRestrictionsUtilsTest.class,
+ UserSystemPackageInstallerTest.class,
+})
+public class UserTests {
+}
+
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 88de250..592f4ec 100644
--- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
@@ -33,9 +33,11 @@
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -62,11 +64,13 @@
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
+import android.test.mock.MockContentResolver;
import android.view.Display;
import androidx.test.InstrumentationRegistry;
import com.android.internal.app.IBatteryStats;
+import com.android.internal.util.test.FakeSettingsProvider;
import com.android.server.LocalServices;
import com.android.server.SystemService;
import com.android.server.lights.LightsManager;
@@ -109,6 +113,9 @@
@Mock private WirelessChargerDetector mWirelessChargerDetectorMock;
@Mock private AmbientDisplayConfiguration mAmbientDisplayConfigurationMock;
+ @Mock
+ private InattentiveSleepWarningController mInattentiveSleepWarningControllerMock;
+
private PowerManagerService mService;
private PowerSaveState mPowerSaveState;
private DisplayPowerRequest mDisplayPowerRequest;
@@ -149,6 +156,9 @@
when(mBatterySaverPolicyMock.getBatterySaverPolicy(
eq(PowerManager.ServiceType.SCREEN_BRIGHTNESS)))
.thenReturn(mPowerSaveState);
+ when(mBatteryManagerInternalMock.isPowered(anyInt())).thenReturn(false);
+ when(mInattentiveSleepWarningControllerMock.isShown()).thenReturn(false);
+ when(mDisplayManagerInternalMock.requestPowerState(any(), anyBoolean())).thenReturn(true);
mDisplayPowerRequest = new DisplayPowerRequest();
addLocalServiceMock(LightsManager.class, mLightsManagerMock);
@@ -161,7 +171,12 @@
mResourcesSpy = spy(mContextSpy.getResources());
when(mContextSpy.getResources()).thenReturn(mResourcesSpy);
- when(mDisplayManagerInternalMock.requestPowerState(any(), anyBoolean())).thenReturn(true);
+ MockContentResolver cr = new MockContentResolver(mContextSpy);
+ cr.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());
+ when(mContextSpy.getContentResolver()).thenReturn(cr);
+
+ Settings.Global.putInt(mContextSpy.getContentResolver(),
+ Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);
}
private PowerManagerService createService() {
@@ -198,6 +213,11 @@
AmbientDisplayConfiguration createAmbientDisplayConfiguration(Context context) {
return mAmbientDisplayConfigurationMock;
}
+
+ @Override
+ InattentiveSleepWarningController createInattentiveSleepWarningController() {
+ return mInattentiveSleepWarningControllerMock;
+ }
});
return mService;
}
@@ -208,8 +228,12 @@
LocalServices.removeServiceForTest(DisplayManagerInternal.class);
LocalServices.removeServiceForTest(BatteryManagerInternal.class);
LocalServices.removeServiceForTest(ActivityManagerInternal.class);
+
Settings.Global.putInt(
mContextSpy.getContentResolver(), Settings.Global.THEATER_MODE_ON, 0);
+ setAttentiveTimeout(-1);
+ Settings.Global.putInt(mContextSpy.getContentResolver(),
+ Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);
}
/**
@@ -263,12 +287,30 @@
private void setPluggedIn(boolean isPluggedIn) {
// Set the callback to return the new state
- when(mBatteryManagerInternalMock.isPowered(BatteryManager.BATTERY_PLUGGED_ANY))
+ when(mBatteryManagerInternalMock.isPowered(anyInt()))
.thenReturn(isPluggedIn);
// Trigger PowerManager to reread the plug-in state
mBatteryReceiver.onReceive(mContextSpy, new Intent(Intent.ACTION_BATTERY_CHANGED));
}
+ private void setAttentiveTimeout(int attentiveTimeoutMillis) {
+ Settings.Secure.putInt(
+ mContextSpy.getContentResolver(), Settings.Secure.ATTENTIVE_TIMEOUT,
+ attentiveTimeoutMillis);
+ }
+
+ private void setAttentiveWarningDuration(int attentiveWarningDurationMillis) {
+ when(mResourcesSpy.getInteger(
+ com.android.internal.R.integer.config_attentiveWarningDuration))
+ .thenReturn(attentiveWarningDurationMillis);
+ }
+
+ private void setMinimumScreenOffTimeoutConfig(int minimumScreenOffTimeoutConfigMillis) {
+ when(mResourcesSpy.getInteger(
+ com.android.internal.R.integer.config_minimumScreenOffTimeout))
+ .thenReturn(minimumScreenOffTimeoutConfigMillis);
+ }
+
@Test
public void testUpdatePowerScreenPolicy_UpdateDisplayPowerRequest() {
createService();
@@ -615,4 +657,97 @@
.setDozeOverrideFromDreamManager(Display.STATE_ON, PowerManager.BRIGHTNESS_DEFAULT);
assertTrue(isAcquired[0]);
}
+
+ @Test
+ public void testInattentiveSleep_hideWarningIfStayOnIsEnabledAndPluggedIn() throws Exception {
+ setAttentiveTimeout(15000);
+ Settings.Global.putInt(mContextSpy.getContentResolver(),
+ Settings.Global.STAY_ON_WHILE_PLUGGED_IN, BatteryManager.BATTERY_PLUGGED_AC);
+
+ createService();
+ startSystem();
+
+ verify(mInattentiveSleepWarningControllerMock, times(1)).show();
+ verify(mInattentiveSleepWarningControllerMock, never()).dismiss();
+ when(mInattentiveSleepWarningControllerMock.isShown()).thenReturn(true);
+
+ setPluggedIn(true);
+ verify(mInattentiveSleepWarningControllerMock, atLeastOnce()).dismiss();
+ }
+
+ @Test
+ public void testInattentive_userActivityDismissesWarning() throws Exception {
+ setMinimumScreenOffTimeoutConfig(5);
+ setAttentiveWarningDuration(30);
+ setAttentiveTimeout(100);
+
+ createService();
+ startSystem();
+
+ mService.getBinderServiceInstance().userActivity(SystemClock.uptimeMillis(),
+ PowerManager.USER_ACTIVITY_EVENT_TOUCH, 0);
+ verify(mInattentiveSleepWarningControllerMock, never()).show();
+
+ SystemClock.sleep(70);
+ verify(mInattentiveSleepWarningControllerMock, times(1)).show();
+ verify(mInattentiveSleepWarningControllerMock, never()).dismiss();
+ when(mInattentiveSleepWarningControllerMock.isShown()).thenReturn(true);
+
+ mService.getBinderServiceInstance().userActivity(SystemClock.uptimeMillis(),
+ PowerManager.USER_ACTIVITY_EVENT_TOUCH, 0);
+ verify(mInattentiveSleepWarningControllerMock, times(1)).dismiss();
+ }
+
+ @Test
+ public void testInattentiveSleep_warningHiddenAfterWakingUp() throws Exception {
+ setMinimumScreenOffTimeoutConfig(5);
+ setAttentiveWarningDuration(20);
+ setAttentiveTimeout(30);
+
+ createService();
+ startSystem();
+ SystemClock.sleep(10);
+ verify(mInattentiveSleepWarningControllerMock, atLeastOnce()).show();
+ when(mInattentiveSleepWarningControllerMock.isShown()).thenReturn(true);
+ SystemClock.sleep(30);
+ forceAwake();
+ verify(mInattentiveSleepWarningControllerMock, atLeastOnce()).dismiss();
+ }
+
+ @Test
+ public void testInattentiveSleep_noWarningShownIfInattentiveSleepDisabled() throws Exception {
+ setAttentiveTimeout(-1);
+ createService();
+ startSystem();
+ verify(mInattentiveSleepWarningControllerMock, never()).show();
+ }
+
+ @Test
+ public void testInattentiveSleep_goesToSleepAfterTimeout() throws Exception {
+ setMinimumScreenOffTimeoutConfig(5);
+ setAttentiveTimeout(5);
+ createService();
+ startSystem();
+ SystemClock.sleep(8);
+ assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_ASLEEP);
+ }
+
+ @Test
+ public void testInattentiveSleep_goesToSleepWithWakeLock() throws Exception {
+ final String pkg = mContextSpy.getOpPackageName();
+ final Binder token = new Binder();
+ final String tag = "sleep_testWithWakeLock";
+
+ setMinimumScreenOffTimeoutConfig(5);
+ setAttentiveTimeout(10);
+ createService();
+ startSystem();
+
+ mService.getBinderServiceInstance().acquireWakeLock(token,
+ PowerManager.SCREEN_BRIGHT_WAKE_LOCK, tag, pkg,
+ null /* workSource */, null /* historyTag */);
+
+ SystemClock.sleep(11);
+ assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_ASLEEP);
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/stats/ProcfsMemoryUtilTest.java b/services/tests/servicestests/src/com/android/server/stats/ProcfsMemoryUtilTest.java
deleted file mode 100644
index d1ac19c..0000000
--- a/services/tests/servicestests/src/com/android/server/stats/ProcfsMemoryUtilTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2019 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.stats;
-
-import static com.android.server.stats.ProcfsMemoryUtil.parseCmdline;
-import static com.android.server.stats.ProcfsMemoryUtil.parseMemorySnapshotFromStatus;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import androidx.test.filters.SmallTest;
-
-import com.android.server.stats.ProcfsMemoryUtil.MemorySnapshot;
-
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * Build/Install/Run:
- * atest FrameworksServicesTests:ProcfsMemoryUtilTest
- */
-@SmallTest
-public class ProcfsMemoryUtilTest {
- private static final String STATUS_CONTENTS = "Name:\tandroid.youtube\n"
- + "State:\tS (sleeping)\n"
- + "Tgid:\t12088\n"
- + "Pid:\t12088\n"
- + "PPid:\t723\n"
- + "TracerPid:\t0\n"
- + "Uid:\t10083\t10083\t10083\t10083\n"
- + "Gid:\t10083\t10083\t10083\t10083\n"
- + "Ngid:\t0\n"
- + "FDSize:\t128\n"
- + "Groups:\t3003 9997 20083 50083 \n"
- + "VmPeak:\t 4546844 kB\n"
- + "VmSize:\t 4542636 kB\n"
- + "VmLck:\t 0 kB\n"
- + "VmPin:\t 0 kB\n"
- + "VmHWM:\t 137668 kB\n" // RSS high-water mark
- + "VmRSS:\t 126776 kB\n" // RSS
- + "RssAnon:\t 37860 kB\n"
- + "RssFile:\t 88764 kB\n"
- + "RssShmem:\t 152 kB\n"
- + "VmData:\t 4125112 kB\n"
- + "VmStk:\t 8192 kB\n"
- + "VmExe:\t 24 kB\n"
- + "VmLib:\t 102432 kB\n"
- + "VmPTE:\t 1300 kB\n"
- + "VmPMD:\t 36 kB\n"
- + "VmSwap:\t 22 kB\n" // Swap
- + "Threads:\t95\n"
- + "SigQ:\t0/13641\n"
- + "SigPnd:\t0000000000000000\n"
- + "ShdPnd:\t0000000000000000\n"
- + "SigBlk:\t0000000000001204\n"
- + "SigIgn:\t0000000000000001\n"
- + "SigCgt:\t00000006400084f8\n"
- + "CapInh:\t0000000000000000\n"
- + "CapPrm:\t0000000000000000\n"
- + "CapEff:\t0000000000000000\n"
- + "CapBnd:\t0000000000000000\n"
- + "CapAmb:\t0000000000000000\n"
- + "Seccomp:\t2\n"
- + "Cpus_allowed:\tff\n"
- + "Cpus_allowed_list:\t0-7\n"
- + "Mems_allowed:\t1\n"
- + "Mems_allowed_list:\t0\n"
- + "voluntary_ctxt_switches:\t903\n"
- + "nonvoluntary_ctxt_switches:\t104\n";
-
- @Test
- public void testParseMemorySnapshotFromStatus_parsesCorrectValue() {
- MemorySnapshot snapshot = parseMemorySnapshotFromStatus(STATUS_CONTENTS);
- assertThat(snapshot.uid).isEqualTo(10083);
- assertThat(snapshot.rssHighWaterMarkInKilobytes).isEqualTo(137668);
- assertThat(snapshot.rssInKilobytes).isEqualTo(126776);
- assertThat(snapshot.anonRssInKilobytes).isEqualTo(37860);
- assertThat(snapshot.swapInKilobytes).isEqualTo(22);
- }
-
- @Test
- public void testParseMemorySnapshotFromStatus_invalidValue() {
- MemorySnapshot snapshot =
- parseMemorySnapshotFromStatus("test\nVmRSS:\tx0x0x\nVmSwap:\t1 kB\ntest");
- assertThat(snapshot).isNull();
- }
-
- @Test
- public void testParseMemorySnapshotFromStatus_emptyContents() {
- MemorySnapshot snapshot = parseMemorySnapshotFromStatus("");
- assertThat(snapshot).isNull();
- }
-
- @Test
- public void testParseCmdline_invalidValue() {
- byte[] nothing = new byte[] {0x00, 0x74, 0x65, 0x73, 0x74}; // \0test
-
- assertThat(parseCmdline(bytesToString(nothing))).isEmpty();
- }
-
- @Test
- public void testParseCmdline_correctValue_noNullBytes() {
- assertThat(parseCmdline("com.google.app")).isEqualTo("com.google.app");
- }
-
- @Test
- public void testParseCmdline_correctValue_withNullBytes() {
- byte[] trailing = new byte[] {0x74, 0x65, 0x73, 0x74, 0x00, 0x00, 0x00}; // test\0\0\0
-
- assertThat(parseCmdline(bytesToString(trailing))).isEqualTo("test");
-
- // test\0\0test
- byte[] inside = new byte[] {0x74, 0x65, 0x73, 0x74, 0x00, 0x00, 0x74, 0x65, 0x73, 0x74};
-
- assertThat(parseCmdline(bytesToString(trailing))).isEqualTo("test");
- }
-
- @Test
- public void testParseCmdline_emptyContents() {
- assertThat(parseCmdline("")).isEmpty();
- }
-
- private static String bytesToString(byte[] bytes) {
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- output.write(bytes, 0, bytes.length);
- return output.toString();
- }
-}
diff --git a/services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java b/services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java
index 36504ac..4a13dce 100644
--- a/services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java
+++ b/services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java
@@ -28,7 +28,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.app.usage.UsageStatsManager;
import android.os.FileUtils;
import android.test.AndroidTestCase;
@@ -150,4 +149,21 @@
aih = new AppIdleHistory(mStorageDir, 5000);
assertEquals(REASON_MAIN_TIMEOUT, aih.getAppStandbyReason(PACKAGE_1, USER_ID, 5000));
}
+
+ public void testNullPackage() throws Exception {
+ AppIdleHistory aih = new AppIdleHistory(mStorageDir, 1000);
+ // Report usage of a package
+ aih.reportUsage(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE,
+ REASON_SUB_USAGE_MOVE_TO_FOREGROUND, 2000, 0);
+ // "Accidentally" report usage against a null named package
+ aih.reportUsage(null, USER_ID, STANDBY_BUCKET_ACTIVE,
+ REASON_SUB_USAGE_MOVE_TO_FOREGROUND, 2000, 0);
+ // Persist data
+ aih.writeAppIdleTimes(USER_ID);
+ // Recover data from disk
+ aih = new AppIdleHistory(mStorageDir, 5000);
+ // Verify data is intact
+ assertEquals(REASON_MAIN_USAGE | REASON_SUB_USAGE_MOVE_TO_FOREGROUND,
+ aih.getAppStandbyReason(PACKAGE_1, USER_ID, 3000));
+ }
}
\ No newline at end of file
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java
index bcff2f8..608625f 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -25,7 +26,9 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.AlarmManager;
import android.app.NotificationHistory.HistoricalNotification;
+import android.content.Context;
import android.graphics.drawable.Icon;
import android.os.Handler;
import android.util.AtomicFile;
@@ -42,8 +45,17 @@
import org.mockito.MockitoAnnotations;
import java.io.File;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RunWith(AndroidJUnit4.class)
public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
@@ -51,6 +63,11 @@
File mRootDir;
@Mock
Handler mFileWriteHandler;
+ @Mock
+ Context mContext;
+ @Mock
+ AlarmManager mAlarmManager;
+ TestFileAttrProvider mFileAttrProvider;
NotificationHistoryDatabase mDataBase;
@@ -85,36 +102,56 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ when(mContext.getSystemService(AlarmManager.class)).thenReturn(mAlarmManager);
+ when(mContext.getUser()).thenReturn(getContext().getUser());
+ when(mContext.getPackageName()).thenReturn(getContext().getPackageName());
+ mFileAttrProvider = new TestFileAttrProvider();
mRootDir = new File(mContext.getFilesDir(), "NotificationHistoryDatabaseTest");
- mDataBase = new NotificationHistoryDatabase(mRootDir);
+ mDataBase = new NotificationHistoryDatabase(mContext, mRootDir, mFileAttrProvider);
mDataBase.init(mFileWriteHandler);
}
@Test
- public void testPrune() {
+ public void testDeletionReceiver() {
+ verify(mContext, times(1)).registerReceiver(any(), any());
+ }
+
+ @Test
+ public void testPrune() throws Exception {
+ GregorianCalendar cal = new GregorianCalendar();
+ cal.setTimeInMillis(10);
int retainDays = 1;
- for (long i = 10; i >= 5; i--) {
+
+ List<AtomicFile> expectedFiles = new ArrayList<>();
+
+ // add 5 files with a creation date of "today"
+ for (long i = cal.getTimeInMillis(); i >= 5; i--) {
File file = mock(File.class);
- when(file.lastModified()).thenReturn(i);
+ mFileAttrProvider.creationDates.put(file, i);
AtomicFile af = new AtomicFile(file);
+ expectedFiles.add(af);
mDataBase.mHistoryFiles.addLast(af);
}
- GregorianCalendar cal = new GregorianCalendar();
- cal.setTimeInMillis(5);
+
cal.add(Calendar.DATE, -1 * retainDays);
+ // Add 5 more files more than retainDays old
for (int i = 5; i >= 0; i--) {
File file = mock(File.class);
- when(file.lastModified()).thenReturn(cal.getTimeInMillis() - i);
+ mFileAttrProvider.creationDates.put(file, cal.getTimeInMillis() - i);
AtomicFile af = new AtomicFile(file);
mDataBase.mHistoryFiles.addLast(af);
}
- mDataBase.prune(retainDays, 10);
- for (AtomicFile file : mDataBase.mHistoryFiles) {
- assertThat(file.getBaseFile().lastModified() > 0);
- }
+ // back to today; trim everything a day + old
+ cal.add(Calendar.DATE, 1 * retainDays);
+ mDataBase.prune(retainDays, cal.getTimeInMillis());
+
+ assertThat(mDataBase.mHistoryFiles).containsExactlyElementsIn(expectedFiles);
+
+ verify(mAlarmManager, times(6)).setExactAndAllowWhileIdle(anyInt(), anyLong(), any());
+
}
@Test
@@ -181,4 +218,12 @@
verify(af2, never()).openRead();
}
+ private class TestFileAttrProvider implements NotificationHistoryDatabase.FileAttrProvider {
+ public Map<File, Long> creationDates = new HashMap<>();
+
+ @Override
+ public long getCreationTime(File file) {
+ return creationDates.get(file);
+ }
+ }
}
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
index 776c00e..8961796 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
@@ -2417,6 +2417,24 @@
}
@Test
+ public void testLockChannelsForOEM_channelSpecific_clearData() {
+ NotificationChannel a = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
+ mHelper.getImportance(PKG_O, UID_O);
+ mHelper.lockChannelsForOEM(new String[] {PKG_O + ":" + a.getId()});
+ mHelper.createNotificationChannel(PKG_O, UID_O, a, true, false);
+ assertTrue(mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false)
+ .isImportanceLockedByOEM());
+
+ mHelper.clearData(PKG_O, UID_O);
+
+ // it's back!
+ mHelper.createNotificationChannel(PKG_O, UID_O, a, true, false);
+ // and still locked
+ assertTrue(mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false)
+ .isImportanceLockedByOEM());
+ }
+
+ @Test
public void testLockChannelsForOEM_channelDoesNotExistYet_appWide() {
NotificationChannel a = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
NotificationChannel b = new NotificationChannel("b", "b", IMPORTANCE_LOW);
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
index 39aa51a..a23e2f1 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
@@ -16,6 +16,7 @@
package com.android.server.wm;
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
@@ -24,6 +25,7 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
+import android.app.ActivityManager;
import android.graphics.Rect;
import android.view.WindowContainerTransaction;
@@ -76,5 +78,20 @@
mService.applyContainerTransaction(t);
assertEquals(newBounds, task.getBounds());
}
+
+ @Test
+ public void testStackTransaction() {
+ removeGlobalMinSizeRestriction();
+ final ActivityStack stack = new StackBuilder(mRootActivityContainer)
+ .setWindowingMode(WINDOWING_MODE_FREEFORM).build();
+ ActivityManager.StackInfo info =
+ mService.getStackInfo(WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD);
+ WindowContainerTransaction t = new WindowContainerTransaction();
+ assertEquals(stack.mRemoteToken, info.stackToken);
+ Rect newBounds = new Rect(10, 10, 100, 100);
+ t.setBounds(info.stackToken, new Rect(10, 10, 100, 100));
+ mService.applyContainerTransaction(t);
+ assertEquals(newBounds, stack.getBounds());
+ }
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java b/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java
index b6eaab7..c6203c5 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java
@@ -37,7 +37,7 @@
import org.mockito.MockitoAnnotations;
/**
- * Tests for the {@link TaskStack} class.
+ * Tests for the {@link ActivityStack} class.
*
* Build/Install/Run:
* atest FrameworksServicesTests:AnimatingActivityRegistryTest
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
index 6ee9621..fc94c5e 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
@@ -28,7 +28,6 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import android.graphics.Rect;
import android.os.IBinder;
import android.platform.test.annotations.Presubmit;
import android.view.Display;
@@ -55,7 +54,7 @@
@RunWith(WindowTestRunner.class)
public class AppChangeTransitionTests extends WindowTestsBase {
- private TaskStack mStack;
+ private ActivityStack mStack;
private Task mTask;
private ActivityRecord mActivity;
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
index ab9a7ca..9f4143f 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
@@ -26,6 +26,7 @@
import static android.view.DisplayCutout.BOUNDS_POSITION_LEFT;
import static android.view.DisplayCutout.BOUNDS_POSITION_TOP;
import static android.view.DisplayCutout.fromBoundingRect;
+import static android.view.Surface.ROTATION_90;
import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;
import static android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
import static android.view.View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
@@ -62,6 +63,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import android.annotation.SuppressLint;
@@ -70,11 +72,14 @@
import android.graphics.Rect;
import android.graphics.Region;
import android.metrics.LogMaker;
+import android.os.RemoteException;
import android.os.SystemClock;
import android.platform.test.annotations.Presubmit;
import android.util.DisplayMetrics;
import android.view.DisplayCutout;
import android.view.Gravity;
+import android.view.IDisplayWindowRotationCallback;
+import android.view.IDisplayWindowRotationController;
import android.view.ISystemGestureExclusionListener;
import android.view.MotionEvent;
import android.view.Surface;
@@ -656,7 +661,7 @@
portraitDisplay.getDisplayRotation().setRotation(Surface.ROTATION_0);
assertFalse(isOptionsPanelAtRight(portraitDisplay.getDisplayId()));
- portraitDisplay.getDisplayRotation().setRotation(Surface.ROTATION_90);
+ portraitDisplay.getDisplayRotation().setRotation(ROTATION_90);
assertTrue(isOptionsPanelAtRight(portraitDisplay.getDisplayId()));
final DisplayContent landscapeDisplay = createNewDisplay();
@@ -665,7 +670,7 @@
landscapeDisplay.getDisplayRotation().setRotation(Surface.ROTATION_0);
assertTrue(isOptionsPanelAtRight(landscapeDisplay.getDisplayId()));
- landscapeDisplay.getDisplayRotation().setRotation(Surface.ROTATION_90);
+ landscapeDisplay.getDisplayRotation().setRotation(ROTATION_90);
assertFalse(isOptionsPanelAtRight(landscapeDisplay.getDisplayId()));
}
@@ -917,6 +922,45 @@
is(Configuration.ORIENTATION_PORTRAIT));
}
+ @Test
+ public void testRemoteRotation() {
+ DisplayContent dc = createNewDisplay();
+
+ final DisplayRotation dr = dc.getDisplayRotation();
+ Mockito.doCallRealMethod().when(dr).updateRotationUnchecked(anyBoolean());
+ Mockito.doReturn(ROTATION_90).when(dr).rotationForOrientation(anyInt(), anyInt());
+ final boolean[] continued = new boolean[1];
+ spyOn(dc.mActivityDisplay);
+ Mockito.doAnswer(
+ invocation -> {
+ continued[0] = true;
+ return true;
+ }).when(dc.mActivityDisplay).updateDisplayOverrideConfigurationLocked();
+ final boolean[] called = new boolean[1];
+ mWm.mDisplayRotationController =
+ new IDisplayWindowRotationController.Stub() {
+ @Override
+ public void onRotateDisplay(int displayId, int fromRotation, int toRotation,
+ IDisplayWindowRotationCallback callback) {
+ called[0] = true;
+
+ try {
+ callback.continueRotateDisplay(toRotation, null);
+ } catch (RemoteException e) {
+ assertTrue(false);
+ }
+ }
+ };
+
+ // kill any existing rotation animation (vestigial from test setup).
+ dc.setRotationAnimation(null);
+
+ mWm.updateRotation(true /* alwaysSendConfiguration */, false /* forceRelayout */);
+ assertTrue(called[0]);
+ waitUntilHandlersIdle();
+ assertTrue(continued[0]);
+ }
+
private boolean isOptionsPanelAtRight(int displayId) {
return (mWm.getPreferredOptionsPanelGravity(displayId) & Gravity.RIGHT) == Gravity.RIGHT;
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
index 67b7a66..62ab11c 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
@@ -515,18 +515,16 @@
final Rect outFrame = new Rect();
final Rect outContentInsets = new Rect();
final Rect outStableInsets = new Rect();
- final Rect outOutsets = new Rect();
final DisplayCutout.ParcelableWrapper outDisplayCutout =
new DisplayCutout.ParcelableWrapper();
mDisplayPolicy.getLayoutHintLw(mWindow.mAttrs, null, mFrames,
false /* floatingStack */, outFrame, outContentInsets, outStableInsets,
- outOutsets, outDisplayCutout);
+ outDisplayCutout);
assertThat(outFrame, is(mFrames.mUnrestricted));
assertThat(outContentInsets, is(new Rect(0, STATUS_BAR_HEIGHT, 0, NAV_BAR_HEIGHT)));
assertThat(outStableInsets, is(new Rect(0, STATUS_BAR_HEIGHT, 0, NAV_BAR_HEIGHT)));
- assertThat(outOutsets, is(new Rect()));
assertThat(outDisplayCutout, is(new DisplayCutout.ParcelableWrapper()));
}
@@ -540,18 +538,16 @@
final Rect outFrame = new Rect();
final Rect outContentInsets = new Rect();
final Rect outStableInsets = new Rect();
- final Rect outOutsets = new Rect();
final DisplayCutout.ParcelableWrapper outDisplayCutout =
new DisplayCutout.ParcelableWrapper();
mDisplayPolicy.getLayoutHintLw(mWindow.mAttrs, taskBounds, mFrames,
false /* floatingStack */, outFrame, outContentInsets, outStableInsets,
- outOutsets, outDisplayCutout);
+ outDisplayCutout);
assertThat(outFrame, is(taskBounds));
assertThat(outContentInsets, is(new Rect()));
assertThat(outStableInsets, is(new Rect()));
- assertThat(outOutsets, is(new Rect()));
assertThat(outDisplayCutout, is(new DisplayCutout.ParcelableWrapper()));
}
@@ -568,18 +564,16 @@
final Rect outFrame = new Rect();
final Rect outContentInsets = new Rect();
final Rect outStableInsets = new Rect();
- final Rect outOutsets = new Rect();
final DisplayCutout.ParcelableWrapper outDisplayCutout =
new DisplayCutout.ParcelableWrapper();
mDisplayPolicy.getLayoutHintLw(mWindow.mAttrs, taskBounds, mFrames,
true /* floatingStack */, outFrame, outContentInsets, outStableInsets,
- outOutsets, outDisplayCutout);
+ outDisplayCutout);
assertThat(outFrame, is(taskBounds));
assertThat(outContentInsets, is(new Rect()));
assertThat(outStableInsets, is(new Rect()));
- assertThat(outOutsets, is(new Rect()));
assertThat(outDisplayCutout, is(new DisplayCutout.ParcelableWrapper()));
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java
index 703ebc9..e375f83 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java
@@ -277,47 +277,6 @@
}
@Test
- public void testDefaultToZeroOverscan() {
- mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
-
- assertOverscan(mPrimaryDisplay, 0 /* left */, 0 /* top */, 0 /* right */, 0 /* bottom */);
- }
-
- @Test
- public void testPersistOverscanInSameInstance() {
- final DisplayInfo info = mPrimaryDisplay.getDisplayInfo();
- try {
- mTarget.setOverscanLocked(info, 1 /* left */, 2 /* top */, 3 /* right */,
- 4 /* bottom */);
-
- mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
-
- assertOverscan(mPrimaryDisplay, 1 /* left */, 2 /* top */, 3 /* right */,
- 4 /* bottom */);
- } finally {
- mTarget.setOverscanLocked(info, 0, 0, 0, 0);
- mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
- }
- }
-
- @Test
- public void testPersistOverscanAcrossInstances() {
- final DisplayInfo info = mPrimaryDisplay.getDisplayInfo();
- try {
- mTarget.setOverscanLocked(info, 10 /* left */, 20 /* top */, 30 /* right */,
- 40 /* bottom */);
-
- applySettingsToDisplayByNewInstance(mPrimaryDisplay);
-
- assertOverscan(mPrimaryDisplay, 10 /* left */, 20 /* top */, 30 /* right */,
- 40 /* bottom */);
- } finally {
- mTarget.setOverscanLocked(info, 0, 0, 0, 0);
- mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
- }
- }
-
- @Test
public void testDefaultToFreeUserRotation() {
mTarget.applySettingsToDisplayLocked(mSecondaryDisplay);
@@ -690,16 +649,6 @@
return null;
}
- private static void assertOverscan(DisplayContent display, int left, int top, int right,
- int bottom) {
- final DisplayInfo info = display.getDisplayInfo();
-
- assertEquals(left, info.overscanLeft);
- assertEquals(top, info.overscanTop);
- assertEquals(right, info.overscanRight);
- assertEquals(bottom, info.overscanBottom);
- }
-
/**
* This method helps to ensure read and write persistent settings successfully because the
* constructor of {@link DisplayWindowSettings} should read the persistent file from the given
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java
index 8617fb2..dbf61db 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java
@@ -68,8 +68,8 @@
@Test
public void testStackPositionChildAt() {
// Test that always-on-top stack can't be moved to position other than top.
- final TaskStack stack1 = createTaskStackOnDisplay(mDisplayContent);
- final TaskStack stack2 = createTaskStackOnDisplay(mDisplayContent);
+ final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent);
+ final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent);
final WindowContainer taskStackContainer = stack1.getParent();
@@ -93,7 +93,7 @@
@Test
public void testStackPositionBelowPinnedStack() {
// Test that no stack can be above pinned stack.
- final TaskStack stack1 = createTaskStackOnDisplay(mDisplayContent);
+ final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent);
final WindowContainer taskStackContainer = stack1.getParent();
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
index 40ce363..5877041 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
@@ -41,7 +41,7 @@
import org.junit.runner.RunWith;
/**
- * Tests for the {@link TaskStack} class.
+ * Tests for the {@link ActivityStack} class.
*
* Build/Install/Run:
* atest WmTests:TaskStackTests
diff --git a/services/tests/wmtests/src/com/android/server/wm/TestIWindow.java b/services/tests/wmtests/src/com/android/server/wm/TestIWindow.java
index 6a94137..e1475a4 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TestIWindow.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TestIWindow.java
@@ -37,8 +37,8 @@
}
@Override
- public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets,
- Rect stableInsets, Rect outsets, boolean reportDraw, MergedConfiguration mergedConfig,
+ public void resized(Rect frame, Rect contentInsets, Rect visibleInsets,
+ Rect stableInsets, boolean reportDraw, MergedConfiguration mergedConfig,
Rect backDropFrame, boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId,
DisplayCutout.ParcelableWrapper displayCutout) throws RemoteException {
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java
index 05457cc..8140045 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java
@@ -221,6 +221,32 @@
}
@Test
+ public void testRemoveImmediatelyClearsLastSurfacePosition() {
+ reset(mTransaction);
+ try (MockSurfaceBuildingContainer top = new MockSurfaceBuildingContainer(mWm)) {
+ final WindowContainer<WindowContainer> child1 = new WindowContainer(mWm);
+ child1.setBounds(1, 1, 10, 10);
+
+ top.addChild(child1, 0);
+ assertEquals(1, child1.getLastSurfacePosition().x);
+ assertEquals(1, child1.getLastSurfacePosition().y);
+
+ WindowContainer child11 = new WindowContainer(mWm);
+ child1.addChild(child11, 0);
+
+ child1.setBounds(2, 2, 20, 20);
+ assertEquals(2, child1.getLastSurfacePosition().x);
+ assertEquals(2, child1.getLastSurfacePosition().y);
+
+ child1.removeImmediately();
+ assertEquals(0, child1.getLastSurfacePosition().x);
+ assertEquals(0, child1.getLastSurfacePosition().y);
+ assertEquals(0, child11.getLastSurfacePosition().x);
+ assertEquals(0, child11.getLastSurfacePosition().y);
+ }
+ }
+
+ @Test
public void testAddChildByIndex() {
final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm);
final TestWindowContainer root = builder.setLayer(0).build();
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java
index 428d869..0b8b6a1 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java
@@ -150,7 +150,7 @@
// When mFrame extends past cf, the content insets are
// the difference between mFrame and ContentFrame. Visible
// and stable frames work the same way.
- w.getWindowFrames().setFrames(pf, df, of, cf, vf, dcf, sf, mEmptyRect);
+ w.getWindowFrames().setFrames(pf, df, cf, vf, dcf, sf);
w.computeFrameLw();
assertFrame(w, 0, 0, 1000, 1000);
assertContentInset(w, 0, topContentInset, 0, bottomContentInset);
@@ -186,7 +186,7 @@
// Here the window has FILL_PARENT, FILL_PARENT
// so we expect it to fill the entire available frame.
- w.getWindowFrames().setFrames(pf, pf, pf, pf, pf, pf, pf, pf);
+ w.getWindowFrames().setFrames(pf, pf, pf, pf, pf, pf);
w.computeFrameLw();
assertFrame(w, 0, 0, 1000, 1000);
@@ -274,7 +274,7 @@
final Rect pf = new Rect(0, 0, logicalWidth, logicalHeight);
final WindowFrames windowFrames = w.getWindowFrames();
- windowFrames.setFrames(pf, pf, pf, pf, pf, pf, pf, mEmptyRect);
+ windowFrames.setFrames(pf, pf, pf, pf, pf, pf);
w.computeFrameLw();
// For non fullscreen tasks the containing frame is based off the
// task bounds not the parent frame.
@@ -287,7 +287,7 @@
final int cfRight = logicalWidth / 2;
final int cfBottom = logicalHeight / 2;
final Rect cf = new Rect(0, 0, cfRight, cfBottom);
- windowFrames.setFrames(pf, pf, pf, cf, cf, pf, cf, mEmptyRect);
+ windowFrames.setFrames(pf, pf, cf, cf, pf, cf);
w.computeFrameLw();
assertEquals(resolvedTaskBounds, w.getFrameLw());
int contentInsetRight = resolvedTaskBounds.right - cfRight;
@@ -306,7 +306,7 @@
final int insetBottom = insetTop + (resolvedTaskBounds.bottom - resolvedTaskBounds.top);
task.setOverrideDisplayedBounds(resolvedTaskBounds);
task.setBounds(insetLeft, insetTop, insetRight, insetBottom);
- windowFrames.setFrames(pf, pf, pf, cf, cf, pf, cf, mEmptyRect);
+ windowFrames.setFrames(pf, pf, cf, cf, pf, cf);
w.computeFrameLw();
assertEquals(resolvedTaskBounds, w.getFrameLw());
contentInsetRight = insetRight - cfRight;
@@ -328,7 +328,6 @@
final int logicalHeight = displayInfo.logicalHeight;
final Rect pf = new Rect(0, 0, logicalWidth, logicalHeight);
final Rect df = pf;
- final Rect of = df;
final Rect cf = new Rect(pf);
// Produce some insets
cf.top += displayInfo.logicalWidth / 10;
@@ -339,7 +338,7 @@
Rect dcf = new Rect(cf);
final WindowFrames windowFrames = w.getWindowFrames();
- windowFrames.setFrames(pf, df, of, cf, vf, dcf, sf, mEmptyRect);
+ windowFrames.setFrames(pf, df, cf, vf, dcf, sf);
w.computeFrameLw();
assertPolicyCrop(w, 0, cf.top, logicalWidth, cf.bottom);
@@ -353,7 +352,7 @@
// we need to account for the fact the windows surface will be made
// fullscreen and thus also make the crop fullscreen.
- windowFrames.setFrames(pf, pf, pf, pf, pf, pf, pf, pf);
+ windowFrames.setFrames(pf, pf, pf, pf, pf, pf);
w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP;
w.mAttrs.width = logicalWidth / 2;
w.mAttrs.height = logicalHeight / 2;
@@ -395,7 +394,7 @@
final Rect pf = new Rect(0, 0, logicalWidth, logicalHeight);
final WindowFrames windowFrames = w.getWindowFrames();
- windowFrames.setFrames(pf, pf, pf, pf, pf, pf, pf, mEmptyRect);
+ windowFrames.setFrames(pf, pf, pf, pf, pf, pf);
w.computeFrameLw();
// For non fullscreen tasks the containing frame is based off the
// task bounds not the parent frame.
@@ -413,7 +412,7 @@
pf.set(0, 0, logicalWidth, logicalHeight);
task.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
task.setBounds(null);
- windowFrames.setFrames(pf, pf, pf, cf, cf, pf, cf, mEmptyRect);
+ windowFrames.setFrames(pf, pf, cf, cf, pf, cf);
w.computeFrameLw();
assertFrame(w, cf);
assertContentFrame(w, cf);
@@ -434,7 +433,7 @@
pf.width(), pf.height());
final WindowFrames windowFrames = w.getWindowFrames();
- windowFrames.setFrames(pf, pf, pf, pf, pf, pf, pf, pf);
+ windowFrames.setFrames(pf, pf, pf, pf, pf, pf);
windowFrames.setDisplayCutout(cutout);
w.computeFrameLw();
@@ -461,7 +460,7 @@
pf.width(), pf.height());
final WindowFrames windowFrames = w.getWindowFrames();
- windowFrames.setFrames(pf, pf, pf, pf, pf, pf, pf, pf);
+ windowFrames.setFrames(pf, pf, pf, pf, pf, pf);
windowFrames.setDisplayCutout(cutout);
w.computeFrameLw();
@@ -501,7 +500,7 @@
final Rect winRect = new Rect(200, 200, 300, 500);
task.setBounds(winRect);
- w.getWindowFrames().setFrames(pf, df, of, cf, vf, dcf, sf, mEmptyRect);
+ w.getWindowFrames().setFrames(pf, df, cf, vf, dcf, sf);
w.computeFrameLw();
final Rect expected = new Rect(winRect.left, cf.bottom - winRect.height(),
@@ -514,7 +513,7 @@
winRect.bottom = 600;
task.setBounds(winRect);
w.setBounds(winRect);
- w.getWindowFrames().setFrames(pf, df, of, cf, vf, dcf, sf, mEmptyRect);
+ w.getWindowFrames().setFrames(pf, df, cf, vf, dcf, sf);
w.computeFrameLw();
assertFrame(w, winRect.left, 0, winRect.right, winRect.height());
@@ -524,7 +523,7 @@
assertVisibleFrame(w, expected);
// Check that it's moved back without ime insets
- w.getWindowFrames().setFrames(pf, df, of, pf, pf, dcf, sf, mEmptyRect);
+ w.getWindowFrames().setFrames(pf, df, pf, pf, dcf, sf);
w.computeFrameLw();
assertEquals(winRect, w.getFrameLw());
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
index e1f92dd..9e0d3a7 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
@@ -261,7 +261,7 @@
// minimized and home stack is resizable, so that we should ignore input for the stack.
final DockedStackDividerController controller =
mDisplayContent.getDockedDividerController();
- final TaskStack stack = createTaskStackOnDisplay(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY,
+ final ActivityStack stack = createTaskStackOnDisplay(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY,
ACTIVITY_TYPE_STANDARD, mDisplayContent);
spyOn(appWindow);
spyOn(controller);
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
index a7a78e1..0da9dc4 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
@@ -41,7 +41,6 @@
import static org.mockito.Mockito.mock;
import android.content.Context;
-import android.content.res.Configuration;
import android.util.Log;
import android.view.Display;
import android.view.DisplayInfo;
@@ -314,7 +313,7 @@
}
}
- /** Creates a {@link TaskStack} and adds it to the specified {@link DisplayContent}. */
+ /** Creates a {@link ActivityStack} and adds it to the specified {@link DisplayContent}. */
ActivityStack createTaskStackOnDisplay(DisplayContent dc) {
return createTaskStackOnDisplay(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, dc);
}
diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java
index 047fcec..9967beb 100644
--- a/services/usb/java/com/android/server/usb/UsbHostManager.java
+++ b/services/usb/java/com/android/server/usb/UsbHostManager.java
@@ -488,7 +488,7 @@
* Opens the specified USB device
*/
public ParcelFileDescriptor openDevice(String deviceAddress,
- UsbUserPermissionManager permissions, String packageName, int uid) {
+ UsbUserPermissionManager permissions, String packageName, int pid, int uid) {
synchronized (mLock) {
if (isBlackListed(deviceAddress)) {
throw new SecurityException("USB device is on a restricted bus");
@@ -500,7 +500,7 @@
"device " + deviceAddress + " does not exist or is restricted");
}
- permissions.checkPermission(device, packageName, uid);
+ permissions.checkPermission(device, packageName, pid, uid);
return nativeOpenDevice(deviceAddress);
}
}
diff --git a/services/usb/java/com/android/server/usb/UsbSerialReader.java b/services/usb/java/com/android/server/usb/UsbSerialReader.java
index 3151679..86016bb 100644
--- a/services/usb/java/com/android/server/usb/UsbSerialReader.java
+++ b/services/usb/java/com/android/server/usb/UsbSerialReader.java
@@ -93,7 +93,7 @@
int userId = UserHandle.getUserId(uid);
if (mDevice instanceof UsbDevice) {
mPermissionManager.getPermissionsForUser(userId)
- .checkPermission((UsbDevice) mDevice, packageName, uid);
+ .checkPermission((UsbDevice) mDevice, packageName, pid, uid);
} else {
mPermissionManager.getPermissionsForUser(userId)
.checkPermission((UsbAccessory) mDevice, uid);
diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java
index 0493637..27531949 100644
--- a/services/usb/java/com/android/server/usb/UsbService.java
+++ b/services/usb/java/com/android/server/usb/UsbService.java
@@ -262,6 +262,7 @@
if (mHostManager != null) {
if (deviceName != null) {
int uid = Binder.getCallingUid();
+ int pid = Binder.getCallingPid();
int user = UserHandle.getUserId(uid);
long ident = clearCallingIdentity();
@@ -269,7 +270,7 @@
synchronized (mLock) {
if (mUserManager.isSameProfileGroup(user, mCurrentUserId)) {
fd = mHostManager.openDevice(deviceName, getPermissionsForUser(user),
- packageName, uid);
+ packageName, pid, uid);
} else {
Slog.w(TAG, "Cannot open " + deviceName + " for user " + user
+ " as user is not active.");
@@ -469,11 +470,12 @@
@Override
public boolean hasDevicePermission(UsbDevice device, String packageName) {
final int uid = Binder.getCallingUid();
+ final int pid = Binder.getCallingPid();
final int userId = UserHandle.getUserId(uid);
final long token = Binder.clearCallingIdentity();
try {
- return getPermissionsForUser(userId).hasPermission(device, packageName, uid);
+ return getPermissionsForUser(userId).hasPermission(device, packageName, pid, uid);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -495,11 +497,12 @@
@Override
public void requestDevicePermission(UsbDevice device, String packageName, PendingIntent pi) {
final int uid = Binder.getCallingUid();
+ final int pid = Binder.getCallingPid();
final int userId = UserHandle.getUserId(uid);
final long token = Binder.clearCallingIdentity();
try {
- getPermissionsForUser(userId).requestPermission(device, packageName, pi, uid);
+ getPermissionsForUser(userId).requestPermission(device, packageName, pi, pid, uid);
} finally {
Binder.restoreCallingIdentity(token);
}
diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
index e700f19..58f5484 100644
--- a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
+++ b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
@@ -186,12 +186,14 @@
* Returns true if package with uid has permission to access the device.
*
* @param device to check permission for
+ * @param pid to check permission for
* @param uid to check permission for
* @return {@code true} if package with uid has permission
*/
- boolean hasPermission(@NonNull UsbDevice device, @NonNull String packageName, int uid) {
+ boolean hasPermission(@NonNull UsbDevice device, @NonNull String packageName, int pid,
+ int uid) {
if (isCameraDevicePresent(device)) {
- if (!isCameraPermissionGranted(packageName, uid)) {
+ if (!isCameraPermissionGranted(packageName, pid, uid)) {
return false;
}
}
@@ -615,10 +617,11 @@
* Check for camera permission of the calling process.
*
* @param packageName Package name of the caller.
+ * @param pid Linux pid of the calling process.
* @param uid Linux uid of the calling process.
* @return True in case camera permission is available, False otherwise.
*/
- private boolean isCameraPermissionGranted(String packageName, int uid) {
+ private boolean isCameraPermissionGranted(String packageName, int pid, int uid) {
int targetSdkVersion = android.os.Build.VERSION_CODES.P;
try {
ApplicationInfo aInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0);
@@ -634,7 +637,7 @@
}
if (targetSdkVersion >= android.os.Build.VERSION_CODES.P) {
- int allowed = mContext.checkCallingPermission(android.Manifest.permission.CAMERA);
+ int allowed = mContext.checkPermission(android.Manifest.permission.CAMERA, pid, uid);
if (android.content.pm.PackageManager.PERMISSION_DENIED == allowed) {
Slog.i(TAG, "Camera permission required for USB video class devices");
return false;
@@ -644,8 +647,8 @@
return true;
}
- public void checkPermission(UsbDevice device, String packageName, int uid) {
- if (!hasPermission(device, packageName, uid)) {
+ public void checkPermission(UsbDevice device, String packageName, int pid, int uid) {
+ if (!hasPermission(device, packageName, pid, uid)) {
throw new SecurityException("User has not given " + uid + "/" + packageName
+ " permission to access device " + device.getDeviceName());
}
@@ -678,11 +681,12 @@
requestPermissionDialog(device, accessory, canBeDefault, packageName, uid, mContext, pi);
}
- public void requestPermission(UsbDevice device, String packageName, PendingIntent pi, int uid) {
+ public void requestPermission(UsbDevice device, String packageName, PendingIntent pi, int pid,
+ int uid) {
Intent intent = new Intent();
// respond immediately if permission has already been granted
- if (hasPermission(device, packageName, uid)) {
+ if (hasPermission(device, packageName, pid, uid)) {
intent.putExtra(UsbManager.EXTRA_DEVICE, device);
intent.putExtra(UsbManager.EXTRA_PERMISSION_GRANTED, true);
try {
@@ -693,7 +697,7 @@
return;
}
if (isCameraDevicePresent(device)) {
- if (!isCameraPermissionGranted(packageName, uid)) {
+ if (!isCameraPermissionGranted(packageName, pid, uid)) {
intent.putExtra(UsbManager.EXTRA_DEVICE, device);
intent.putExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false);
try {
diff --git a/startop/apps/test/Android.bp b/startop/apps/test/Android.bp
index 3f20273..f42c755 100644
--- a/startop/apps/test/Android.bp
+++ b/startop/apps/test/Android.bp
@@ -17,6 +17,7 @@
android_app {
name: "startop_test_app",
srcs: [
+ "src/ApplicationBenchmarks.java",
"src/ComplexLayoutInflationActivity.java",
"src/CPUIntensiveBenchmarkActivity.java",
"src/CPUIntensiveBenchmarks.java",
@@ -25,8 +26,8 @@
"src/InitCheckOverheadBenchmarkActivity.java",
"src/InitCheckOverheadBenchmarks.java",
"src/LayoutInflationActivity.java",
- "src/NonInteractiveSystemServerBenchmarkActivity.java",
- "src/SystemServerBenchmarkActivity.java",
+ "src/NonInteractiveMicrobenchmarkActivity.java",
+ "src/InteractiveMicrobenchmarkActivity.java",
"src/SystemServerBenchmarks.java",
"src/TextViewInflationActivity.java",
],
diff --git a/startop/apps/test/AndroidManifest.xml b/startop/apps/test/AndroidManifest.xml
index 235aa0d..adaab61 100644
--- a/startop/apps/test/AndroidManifest.xml
+++ b/startop/apps/test/AndroidManifest.xml
@@ -97,8 +97,8 @@
</activity>
<activity
- android:label="SystemServer Benchmark"
- android:name=".SystemServerBenchmarkActivity"
+ android:label="Interactive Microbenchmarks"
+ android:name=".InteractiveMicrobenchmarkActivity"
android:exported="true" >
<intent-filter>
@@ -109,8 +109,8 @@
</activity>
<activity
- android:label="Non-interactive SystemServer Benchmark"
- android:name=".NonInteractiveSystemServerBenchmarkActivity"
+ android:label="Non-interactive Microbenchmarks"
+ android:name=".NonInteractiveMicrobenchmarkActivity"
android:exported="true" />
</application>
diff --git a/startop/apps/test/src/ApplicationBenchmarks.java b/startop/apps/test/src/ApplicationBenchmarks.java
new file mode 100644
index 0000000..7d71916
--- /dev/null
+++ b/startop/apps/test/src/ApplicationBenchmarks.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2019 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.startop.test;
+
+import android.app.Activity;
+import android.view.LayoutInflater;
+
+final class ApplicationBenchmarks {
+
+ public static final void initializeBenchmarks(Activity parent, BenchmarkRunner benchmarks) {
+ LayoutInflater inflater = LayoutInflater.from(parent);
+
+ benchmarks.addBenchmark("Complex Layout", () -> {
+ inflater.inflate(R.layout.activity_main, null);
+ });
+
+ benchmarks.addBenchmark("TextView List Layout", () -> {
+ inflater.inflate(R.layout.textview_list, null);
+ });
+
+ benchmarks.addBenchmark("FrameLayout List Layout", () -> {
+ inflater.inflate(R.layout.framelayout_list, null);
+ });
+ }
+}
diff --git a/startop/apps/test/src/CPUIntensiveBenchmarkActivity.java b/startop/apps/test/src/CPUIntensiveBenchmarkActivity.java
index 2ec5308..db3234a 100644
--- a/startop/apps/test/src/CPUIntensiveBenchmarkActivity.java
+++ b/startop/apps/test/src/CPUIntensiveBenchmarkActivity.java
@@ -18,7 +18,7 @@
import android.os.Bundle;
-public class CPUIntensiveBenchmarkActivity extends SystemServerBenchmarkActivity {
+public class CPUIntensiveBenchmarkActivity extends InteractiveMicrobenchmarkActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.system_server_benchmark_page);
diff --git a/startop/apps/test/src/InitCheckOverheadBenchmarkActivity.java b/startop/apps/test/src/InitCheckOverheadBenchmarkActivity.java
index 3e0e3b1..92d8638 100644
--- a/startop/apps/test/src/InitCheckOverheadBenchmarkActivity.java
+++ b/startop/apps/test/src/InitCheckOverheadBenchmarkActivity.java
@@ -18,7 +18,7 @@
import android.os.Bundle;
-public class InitCheckOverheadBenchmarkActivity extends SystemServerBenchmarkActivity {
+public class InitCheckOverheadBenchmarkActivity extends InteractiveMicrobenchmarkActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.system_server_benchmark_page);
diff --git a/startop/apps/test/src/SystemServerBenchmarkActivity.java b/startop/apps/test/src/InteractiveMicrobenchmarkActivity.java
similarity index 66%
rename from startop/apps/test/src/SystemServerBenchmarkActivity.java
rename to startop/apps/test/src/InteractiveMicrobenchmarkActivity.java
index 6be8df3..c3839c1 100644
--- a/startop/apps/test/src/SystemServerBenchmarkActivity.java
+++ b/startop/apps/test/src/InteractiveMicrobenchmarkActivity.java
@@ -18,12 +18,13 @@
import android.app.Activity;
import android.content.Context;
+import android.graphics.Typeface;
import android.os.Bundle;
import android.widget.Button;
import android.widget.GridLayout;
import android.widget.TextView;
-public class SystemServerBenchmarkActivity extends Activity implements BenchmarkRunner {
+public class InteractiveMicrobenchmarkActivity extends Activity implements BenchmarkRunner {
protected GridLayout mBenchmarkList;
protected void onCreate(Bundle savedInstanceState) {
@@ -32,10 +33,34 @@
mBenchmarkList = findViewById(R.id.benchmark_list);
+ addBenchmark("Empty", () -> {
+ });
+ addHeader("Application Benchmarks");
+ ApplicationBenchmarks.initializeBenchmarks(this, this);
+ addHeader("CPU Intensive Benchmarks");
+ CPUIntensiveBenchmarks.initializeBenchmarks(this, this);
+ addHeader("Init Check Overhead Benchmarks");
+ InitCheckOverheadBenchmarks.initializeBenchmarks(this, this);
+ addHeader("System Server Benchmarks");
SystemServerBenchmarks.initializeBenchmarks(this, this);
}
/**
+ * Add a heading for a group of related benchmarks
+ *
+ * @param name The name of this group of benchmarks
+ */
+ public void addHeader(CharSequence name) {
+ Context context = mBenchmarkList.getContext();
+ TextView header = new TextView(context);
+ header.setText(name);
+ header.setTypeface(header.getTypeface(), Typeface.BOLD);
+ GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+ params.columnSpec = GridLayout.spec(0, 3);
+ mBenchmarkList.addView(header, params);
+ }
+
+ /**
* Adds a benchmark to the set to run.
*
* @param name A short name that shows up in the UI or benchmark results
diff --git a/startop/apps/test/src/NonInteractiveSystemServerBenchmarkActivity.java b/startop/apps/test/src/NonInteractiveMicrobenchmarkActivity.java
similarity index 96%
rename from startop/apps/test/src/NonInteractiveSystemServerBenchmarkActivity.java
rename to startop/apps/test/src/NonInteractiveMicrobenchmarkActivity.java
index a2dc2cf..0162ac6 100644
--- a/startop/apps/test/src/NonInteractiveSystemServerBenchmarkActivity.java
+++ b/startop/apps/test/src/NonInteractiveMicrobenchmarkActivity.java
@@ -36,7 +36,7 @@
import android.widget.GridLayout;
import android.widget.TextView;
-public class NonInteractiveSystemServerBenchmarkActivity extends Activity {
+public class NonInteractiveMicrobenchmarkActivity extends Activity {
ArrayList<CharSequence> benchmarkNames = new ArrayList();
ArrayList<Runnable> benchmarkThunks = new ArrayList();
diff --git a/startop/apps/test/src/SystemServerBenchmarks.java b/startop/apps/test/src/SystemServerBenchmarks.java
index 25b43f4..8114bc2 100644
--- a/startop/apps/test/src/SystemServerBenchmarks.java
+++ b/startop/apps/test/src/SystemServerBenchmarks.java
@@ -57,9 +57,6 @@
static void initializeBenchmarks(Activity parent, BenchmarkRunner benchmarks) {
final String packageName = parent.getPackageName();
- benchmarks.addBenchmark("Empty", () -> {
- });
-
PackageManager pm = parent.getPackageManager();
benchmarks.addBenchmark("getInstalledApplications", () -> {
pm.getInstalledApplications(PackageManager.MATCH_SYSTEM_ONLY);
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 24b4046..3ecf8d7 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -25,8 +25,11 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
+import android.os.IBinder;
import android.os.ParcelFileDescriptor;
+import com.android.internal.telecom.IVideoProvider;
+
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
@@ -2132,13 +2135,22 @@
cannedTextResponsesChanged = true;
}
- VideoCallImpl newVideoCallImpl = parcelableCall.getVideoCallImpl(mCallingPackage,
- mTargetSdkVersion);
- boolean videoCallChanged = parcelableCall.isVideoCallProviderChanged() &&
- !Objects.equals(mVideoCallImpl, newVideoCallImpl);
+ IVideoProvider previousVideoProvider = mVideoCallImpl == null ? null :
+ mVideoCallImpl.getVideoProvider();
+ IVideoProvider newVideoProvider = parcelableCall.getVideoProvider();
+
+ // parcelableCall.isVideoCallProviderChanged is only true when we have a video provider
+ // specified; so we should check if the actual IVideoProvider changes as well.
+ boolean videoCallChanged = parcelableCall.isVideoCallProviderChanged()
+ && !Objects.equals(previousVideoProvider, newVideoProvider);
if (videoCallChanged) {
- mVideoCallImpl = newVideoCallImpl;
+ if (mVideoCallImpl != null) {
+ mVideoCallImpl.destroy();
+ }
+ mVideoCallImpl = parcelableCall.isVideoCallProviderChanged() ?
+ parcelableCall.getVideoCallImpl(mCallingPackage, mTargetSdkVersion) : null;
}
+
if (mVideoCallImpl != null) {
mVideoCallImpl.setVideoState(getDetails().getVideoState());
}
diff --git a/telecomm/java/android/telecom/CallScreeningService.java b/telecomm/java/android/telecom/CallScreeningService.java
index ef1c790..b91787c 100644
--- a/telecomm/java/android/telecom/CallScreeningService.java
+++ b/telecomm/java/android/telecom/CallScreeningService.java
@@ -106,8 +106,14 @@
SomeArgs args = (SomeArgs) msg.obj;
try {
mCallScreeningAdapter = (ICallScreeningAdapter) args.arg1;
- onScreenCall(
- Call.Details.createFromParcelableCall((ParcelableCall) args.arg2));
+ Call.Details callDetails = Call.Details
+ .createFromParcelableCall((ParcelableCall) args.arg2);
+ onScreenCall(callDetails);
+ if (callDetails.getCallDirection() == Call.Details.DIRECTION_OUTGOING) {
+ mCallScreeningAdapter.allowCall(callDetails.getTelecomCallId());
+ }
+ } catch (RemoteException e) {
+ Log.w(this, "Exception when screening call: " + e);
} finally {
args.recycle();
}
diff --git a/telecomm/java/android/telecom/Logging/Session.java b/telecomm/java/android/telecom/Logging/Session.java
index 95a47e1..d82e93f 100644
--- a/telecomm/java/android/telecom/Logging/Session.java
+++ b/telecomm/java/android/telecom/Logging/Session.java
@@ -237,7 +237,10 @@
// keep track of calls and bail if we hit the recursion limit
private String getFullSessionId(int parentCount) {
if (parentCount >= SESSION_RECURSION_LIMIT) {
- Log.w(LOG_TAG, "getFullSessionId: Hit recursion limit!");
+ // Don't use Telecom's Log.w here or it will cause infinite recursion because it will
+ // try to add session information to this logging statement, which will cause it to hit
+ // this condition again and so on...
+ android.util.Slog.w(LOG_TAG, "getFullSessionId: Hit recursion limit!");
return TRUNCATE_STRING + mSessionId;
}
// Cache mParentSession locally to prevent a concurrency problem where
@@ -265,7 +268,11 @@
Session topNode = this;
while (topNode.getParentSession() != null) {
if (currParentCount >= SESSION_RECURSION_LIMIT) {
- Log.w(LOG_TAG, "getRootSession: Hit recursion limit from " + callingMethod);
+ // Don't use Telecom's Log.w here or it will cause infinite recursion because it
+ // will try to add session information to this logging statement, which will cause
+ // it to hit this condition again and so on...
+ android.util.Slog.w(LOG_TAG, "getRootSession: Hit recursion limit from "
+ + callingMethod);
break;
}
topNode = topNode.getParentSession();
@@ -289,7 +296,10 @@
private void printSessionTree(int tabI, StringBuilder sb, int currChildCount) {
// Prevent infinite recursion.
if (currChildCount >= SESSION_RECURSION_LIMIT) {
- Log.w(LOG_TAG, "printSessionTree: Hit recursion limit!");
+ // Don't use Telecom's Log.w here or it will cause infinite recursion because it will
+ // try to add session information to this logging statement, which will cause it to hit
+ // this condition again and so on...
+ android.util.Slog.w(LOG_TAG, "printSessionTree: Hit recursion limit!");
sb.append(TRUNCATE_STRING);
return;
}
@@ -315,7 +325,10 @@
private synchronized void getFullMethodPath(StringBuilder sb, boolean truncatePath,
int parentCount) {
if (parentCount >= SESSION_RECURSION_LIMIT) {
- Log.w(LOG_TAG, "getFullMethodPath: Hit recursion limit!");
+ // Don't use Telecom's Log.w here or it will cause infinite recursion because it will
+ // try to add session information to this logging statement, which will cause it to hit
+ // this condition again and so on...
+ android.util.Slog.w(LOG_TAG, "getFullMethodPath: Hit recursion limit!");
sb.append(TRUNCATE_STRING);
return;
}
diff --git a/telecomm/java/android/telecom/Logging/SessionManager.java b/telecomm/java/android/telecom/Logging/SessionManager.java
index 49c3a72..ac30058 100644
--- a/telecomm/java/android/telecom/Logging/SessionManager.java
+++ b/telecomm/java/android/telecom/Logging/SessionManager.java
@@ -202,7 +202,18 @@
return createSubsession(false);
}
- private synchronized Session createSubsession(boolean isStartedFromActiveSession) {
+ /**
+ * Creates a new subsession based on an existing session. Will not be started until
+ * {@link #continueSession(Session, String)} or {@link #cancelSubsession(Session)} is called.
+ * <p>
+ * Only public for testing!
+ * @param isStartedFromActiveSession true if this subsession is being created for a task on the
+ * same thread, false if it is being created for a related task on another thread.
+ * @return a new {@link Session}, call {@link #continueSession(Session, String)} to continue the
+ * session and {@link #endSession()} when done with this subsession.
+ */
+ @VisibleForTesting
+ public synchronized Session createSubsession(boolean isStartedFromActiveSession) {
int threadId = getCallingThreadId();
Session threadSession = mSessionMapper.get(threadId);
if (threadSession == null) {
diff --git a/telecomm/java/android/telecom/ParcelableCall.java b/telecomm/java/android/telecom/ParcelableCall.java
index aa50991..fdc3243 100644
--- a/telecomm/java/android/telecom/ParcelableCall.java
+++ b/telecomm/java/android/telecom/ParcelableCall.java
@@ -21,6 +21,7 @@
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
+import android.os.IBinder;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException;
@@ -225,6 +226,10 @@
return mVideoCall;
}
+ public IVideoProvider getVideoProvider() {
+ return mVideoCallProvider;
+ }
+
public boolean getIsRttCallChanged() {
return mIsRttCallChanged;
}
diff --git a/telecomm/java/android/telecom/VideoCallImpl.java b/telecomm/java/android/telecom/VideoCallImpl.java
index cb74012..4a1aa0a 100644
--- a/telecomm/java/android/telecom/VideoCallImpl.java
+++ b/telecomm/java/android/telecom/VideoCallImpl.java
@@ -32,6 +32,8 @@
import com.android.internal.telecom.IVideoCallback;
import com.android.internal.telecom.IVideoProvider;
+import java.util.NoSuchElementException;
+
/**
* Implementation of a Video Call, which allows InCallUi to communicate commands to the underlying
* {@link Connection.VideoProvider}, and direct callbacks from the
@@ -53,7 +55,11 @@
private IBinder.DeathRecipient mDeathRecipient = new IBinder.DeathRecipient() {
@Override
public void binderDied() {
- mVideoProvider.asBinder().unlinkToDeath(this, 0);
+ try {
+ mVideoProvider.asBinder().unlinkToDeath(this, 0);
+ } catch (NoSuchElementException nse) {
+ // Already unlinked in destroy below.
+ }
}
};
@@ -222,6 +228,11 @@
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
public void destroy() {
unregisterCallback(mCallback);
+ try {
+ mVideoProvider.asBinder().unlinkToDeath(mDeathRecipient, 0);
+ } catch (NoSuchElementException nse) {
+ // Already unlinked in binderDied above.
+ }
}
/** {@inheritDoc} */
@@ -353,4 +364,12 @@
public void setVideoState(int videoState) {
mVideoState = videoState;
}
+
+ /**
+ * Get the video provider binder.
+ * @return the video provider binder.
+ */
+ public IVideoProvider getVideoProvider() {
+ return mVideoProvider;
+ }
}
diff --git a/telephony/common/com/android/internal/telephony/PackageChangeReceiver.java b/telephony/common/com/android/internal/telephony/PackageChangeReceiver.java
new file mode 100644
index 0000000..922af12
--- /dev/null
+++ b/telephony/common/com/android/internal/telephony/PackageChangeReceiver.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.telephony;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+
+import com.android.internal.os.BackgroundThread;
+
+/**
+ * Helper class for monitoring the state of packages: adding, removing,
+ * updating, and disappearing and reappearing on the SD card.
+ */
+public abstract class PackageChangeReceiver extends BroadcastReceiver {
+ static final IntentFilter sPackageIntentFilter = new IntentFilter();
+ static {
+ sPackageIntentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+ sPackageIntentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+ sPackageIntentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+ sPackageIntentFilter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);
+ sPackageIntentFilter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
+ sPackageIntentFilter.addDataScheme("package");
+ }
+ Context mRegisteredContext;
+
+ /**
+ * To register the intents that needed for monitoring the state of packages
+ */
+ public void register(@NonNull Context context, @Nullable Looper thread,
+ @Nullable UserHandle user) {
+ if (mRegisteredContext != null) {
+ throw new IllegalStateException("Already registered");
+ }
+ Handler handler = (thread == null) ? BackgroundThread.getHandler() : new Handler(thread);
+ mRegisteredContext = context;
+ if (handler != null) {
+ if (user != null) {
+ context.registerReceiverAsUser(this, user, sPackageIntentFilter, null, handler);
+ } else {
+ context.registerReceiver(this, sPackageIntentFilter,
+ null, handler);
+ }
+ } else {
+ throw new NullPointerException();
+ }
+ }
+
+ /**
+ * To unregister the intents for monitoring the state of packages
+ */
+ public void unregister() {
+ if (mRegisteredContext == null) {
+ throw new IllegalStateException("Not registered");
+ }
+ mRegisteredContext.unregisterReceiver(this);
+ mRegisteredContext = null;
+ }
+
+ /**
+ * This method is invoked when receive the Intent.ACTION_PACKAGE_ADDED
+ */
+ public void onPackageAdded(@Nullable String packageName) {
+ }
+
+ /**
+ * This method is invoked when receive the Intent.ACTION_PACKAGE_REMOVED
+ */
+ public void onPackageRemoved(@Nullable String packageName) {
+ }
+
+ /**
+ * This method is invoked when Intent.EXTRA_REPLACING as extra field is true
+ */
+ public void onPackageUpdateFinished(@Nullable String packageName) {
+ }
+
+ /**
+ * This method is invoked when receive the Intent.ACTION_PACKAGE_CHANGED or
+ * Intent.EXTRA_REPLACING as extra field is true
+ */
+ public void onPackageModified(@Nullable String packageName) {
+ }
+
+ /**
+ * This method is invoked when receive the Intent.ACTION_QUERY_PACKAGE_RESTART and
+ * Intent.ACTION_PACKAGE_RESTARTED
+ */
+ public void onHandleForceStop(@Nullable String[] packages, boolean doit) {
+ }
+
+ /**
+ * This method is invoked when receive the Intent.ACTION_PACKAGE_REMOVED
+ */
+ public void onPackageDisappeared() {
+ }
+
+ /**
+ * This method is invoked when receive the Intent.ACTION_PACKAGE_ADDED
+ */
+ public void onPackageAppeared() {
+ }
+
+ @Override
+ public void onReceive(@Nullable Context context, @Nullable Intent intent) {
+ String action = intent.getAction();
+
+ if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
+ String pkg = getPackageName(intent);
+ if (pkg != null) {
+ if (intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
+ onPackageUpdateFinished(pkg);
+ onPackageModified(pkg);
+ } else {
+ onPackageAdded(pkg);
+ }
+ onPackageAppeared();
+ }
+ } else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
+ String pkg = getPackageName(intent);
+ if (pkg != null) {
+ if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
+ onPackageRemoved(pkg);
+ }
+ onPackageDisappeared();
+ }
+ } else if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) {
+ String pkg = getPackageName(intent);
+ if (pkg != null) {
+ onPackageModified(pkg);
+ }
+ } else if (Intent.ACTION_QUERY_PACKAGE_RESTART.equals(action)) {
+ String[] disappearingPackages = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);
+ onHandleForceStop(disappearingPackages, false);
+ } else if (Intent.ACTION_PACKAGE_RESTARTED.equals(action)) {
+ String[] disappearingPackages = new String[] {getPackageName(intent)};
+ onHandleForceStop(disappearingPackages, true);
+ }
+ }
+
+ String getPackageName(Intent intent) {
+ Uri uri = intent.getData();
+ String pkg = uri != null ? uri.getSchemeSpecificPart() : null;
+ return pkg;
+ }
+}
diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java
index f4eae8e..70ce1bf 100644
--- a/telephony/common/com/android/internal/telephony/SmsApplication.java
+++ b/telephony/common/com/android/internal/telephony/SmsApplication.java
@@ -39,11 +39,11 @@
import android.os.UserHandle;
import android.provider.Telephony;
import android.provider.Telephony.Sms.Intents;
+import android.telephony.PackageChangeReceiver;
import android.telephony.Rlog;
import android.telephony.TelephonyManager;
import android.util.Log;
-import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -777,7 +777,7 @@
* Tracks package changes and ensures that the default SMS app is always configured to be the
* preferred activity for SENDTO sms/mms intents.
*/
- private static final class SmsPackageMonitor extends PackageMonitor {
+ private static final class SmsPackageMonitor extends PackageChangeReceiver {
final Context mContext;
public SmsPackageMonitor(Context context) {
@@ -786,12 +786,12 @@
}
@Override
- public void onPackageDisappeared(String packageName, int reason) {
+ public void onPackageDisappeared() {
onPackageChanged();
}
@Override
- public void onPackageAppeared(String packageName, int reason) {
+ public void onPackageAppeared() {
onPackageChanged();
}
@@ -824,7 +824,7 @@
public static void initSmsPackageMonitor(Context context) {
sSmsPackageMonitor = new SmsPackageMonitor(context);
- sSmsPackageMonitor.register(context, context.getMainLooper(), UserHandle.ALL, false);
+ sSmsPackageMonitor.register(context, context.getMainLooper(), UserHandle.ALL);
}
@UnsupportedAppUsage
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index a315e6d..2cdf21d 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -3797,7 +3797,8 @@
+ " ICarrierConfigLoader is null");
return null;
}
- return loader.getConfigForSubId(subId, mContext.getOpPackageName());
+ return loader.getConfigForSubIdWithFeature(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
Rlog.e(TAG, "Error getting config for subId " + subId + ": "
+ ex.toString());
diff --git a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java
index 407ced7..270eafe 100644
--- a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java
+++ b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java
@@ -203,9 +203,12 @@
}
/**
+ * Get whether network has configured carrier aggregation or not.
+ *
* @return {@code true} if using carrier aggregation.
* @hide
*/
+ @SystemApi
public boolean isUsingCarrierAggregation() {
return mIsUsingCarrierAggregation;
}
diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java
index 56b7236..fc717e7 100644
--- a/telephony/java/android/telephony/NetworkRegistrationInfo.java
+++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java
@@ -323,9 +323,12 @@
public @Domain int getDomain() { return mDomain; }
/**
+ * Get the 5G NR connection state.
+ *
* @return the 5G NR connection state.
* @hide
*/
+ @SystemApi
public @NRState int getNrState() {
return mNrState;
}
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index f503348..9ace86c 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -1384,9 +1384,12 @@
}
/**
+ * Get the 5G NR frequency range the device is currently registered.
+ *
* @return the frequency range of 5G NR.
* @hide
*/
+ @SystemApi
public @FrequencyRange int getNrFrequencyRange() {
return mNrFrequencyRange;
}
@@ -1464,44 +1467,44 @@
/** @hide */
public static int rilRadioTechnologyToNetworkType(@RilRadioTechnology int rat) {
switch(rat) {
- case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS:
+ case RIL_RADIO_TECHNOLOGY_GPRS:
return TelephonyManager.NETWORK_TYPE_GPRS;
- case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE:
+ case RIL_RADIO_TECHNOLOGY_EDGE:
return TelephonyManager.NETWORK_TYPE_EDGE;
- case ServiceState.RIL_RADIO_TECHNOLOGY_UMTS:
+ case RIL_RADIO_TECHNOLOGY_UMTS:
return TelephonyManager.NETWORK_TYPE_UMTS;
- case ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA:
+ case RIL_RADIO_TECHNOLOGY_HSDPA:
return TelephonyManager.NETWORK_TYPE_HSDPA;
- case ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA:
+ case RIL_RADIO_TECHNOLOGY_HSUPA:
return TelephonyManager.NETWORK_TYPE_HSUPA;
- case ServiceState.RIL_RADIO_TECHNOLOGY_HSPA:
+ case RIL_RADIO_TECHNOLOGY_HSPA:
return TelephonyManager.NETWORK_TYPE_HSPA;
- case ServiceState.RIL_RADIO_TECHNOLOGY_IS95A:
- case ServiceState.RIL_RADIO_TECHNOLOGY_IS95B:
+ case RIL_RADIO_TECHNOLOGY_IS95A:
+ case RIL_RADIO_TECHNOLOGY_IS95B:
return TelephonyManager.NETWORK_TYPE_CDMA;
- case ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT:
+ case RIL_RADIO_TECHNOLOGY_1xRTT:
return TelephonyManager.NETWORK_TYPE_1xRTT;
- case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0:
+ case RIL_RADIO_TECHNOLOGY_EVDO_0:
return TelephonyManager.NETWORK_TYPE_EVDO_0;
- case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A:
+ case RIL_RADIO_TECHNOLOGY_EVDO_A:
return TelephonyManager.NETWORK_TYPE_EVDO_A;
- case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B:
+ case RIL_RADIO_TECHNOLOGY_EVDO_B:
return TelephonyManager.NETWORK_TYPE_EVDO_B;
- case ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD:
+ case RIL_RADIO_TECHNOLOGY_EHRPD:
return TelephonyManager.NETWORK_TYPE_EHRPD;
- case ServiceState.RIL_RADIO_TECHNOLOGY_LTE:
+ case RIL_RADIO_TECHNOLOGY_LTE:
return TelephonyManager.NETWORK_TYPE_LTE;
- case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
+ case RIL_RADIO_TECHNOLOGY_HSPAP:
return TelephonyManager.NETWORK_TYPE_HSPAP;
- case ServiceState.RIL_RADIO_TECHNOLOGY_GSM:
+ case RIL_RADIO_TECHNOLOGY_GSM:
return TelephonyManager.NETWORK_TYPE_GSM;
- case ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA:
+ case RIL_RADIO_TECHNOLOGY_TD_SCDMA:
return TelephonyManager.NETWORK_TYPE_TD_SCDMA;
- case ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN:
+ case RIL_RADIO_TECHNOLOGY_IWLAN:
return TelephonyManager.NETWORK_TYPE_IWLAN;
- case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA:
+ case RIL_RADIO_TECHNOLOGY_LTE_CA:
return TelephonyManager.NETWORK_TYPE_LTE_CA;
- case ServiceState.RIL_RADIO_TECHNOLOGY_NR:
+ case RIL_RADIO_TECHNOLOGY_NR:
return TelephonyManager.NETWORK_TYPE_NR;
default:
return TelephonyManager.NETWORK_TYPE_UNKNOWN;
@@ -1546,45 +1549,45 @@
public static int networkTypeToRilRadioTechnology(int networkType) {
switch(networkType) {
case TelephonyManager.NETWORK_TYPE_GPRS:
- return ServiceState.RIL_RADIO_TECHNOLOGY_GPRS;
+ return RIL_RADIO_TECHNOLOGY_GPRS;
case TelephonyManager.NETWORK_TYPE_EDGE:
- return ServiceState.RIL_RADIO_TECHNOLOGY_EDGE;
+ return RIL_RADIO_TECHNOLOGY_EDGE;
case TelephonyManager.NETWORK_TYPE_UMTS:
- return ServiceState.RIL_RADIO_TECHNOLOGY_UMTS;
+ return RIL_RADIO_TECHNOLOGY_UMTS;
case TelephonyManager.NETWORK_TYPE_HSDPA:
- return ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA;
+ return RIL_RADIO_TECHNOLOGY_HSDPA;
case TelephonyManager.NETWORK_TYPE_HSUPA:
- return ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA;
+ return RIL_RADIO_TECHNOLOGY_HSUPA;
case TelephonyManager.NETWORK_TYPE_HSPA:
- return ServiceState.RIL_RADIO_TECHNOLOGY_HSPA;
+ return RIL_RADIO_TECHNOLOGY_HSPA;
case TelephonyManager.NETWORK_TYPE_CDMA:
- return ServiceState.RIL_RADIO_TECHNOLOGY_IS95A;
+ return RIL_RADIO_TECHNOLOGY_IS95A;
case TelephonyManager.NETWORK_TYPE_1xRTT:
- return ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT;
+ return RIL_RADIO_TECHNOLOGY_1xRTT;
case TelephonyManager.NETWORK_TYPE_EVDO_0:
- return ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0;
+ return RIL_RADIO_TECHNOLOGY_EVDO_0;
case TelephonyManager.NETWORK_TYPE_EVDO_A:
- return ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A;
+ return RIL_RADIO_TECHNOLOGY_EVDO_A;
case TelephonyManager.NETWORK_TYPE_EVDO_B:
- return ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B;
+ return RIL_RADIO_TECHNOLOGY_EVDO_B;
case TelephonyManager.NETWORK_TYPE_EHRPD:
- return ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD;
+ return RIL_RADIO_TECHNOLOGY_EHRPD;
case TelephonyManager.NETWORK_TYPE_LTE:
- return ServiceState.RIL_RADIO_TECHNOLOGY_LTE;
+ return RIL_RADIO_TECHNOLOGY_LTE;
case TelephonyManager.NETWORK_TYPE_HSPAP:
- return ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP;
+ return RIL_RADIO_TECHNOLOGY_HSPAP;
case TelephonyManager.NETWORK_TYPE_GSM:
- return ServiceState.RIL_RADIO_TECHNOLOGY_GSM;
+ return RIL_RADIO_TECHNOLOGY_GSM;
case TelephonyManager.NETWORK_TYPE_TD_SCDMA:
- return ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA;
+ return RIL_RADIO_TECHNOLOGY_TD_SCDMA;
case TelephonyManager.NETWORK_TYPE_IWLAN:
- return ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;
+ return RIL_RADIO_TECHNOLOGY_IWLAN;
case TelephonyManager.NETWORK_TYPE_LTE_CA:
- return ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA;
+ return RIL_RADIO_TECHNOLOGY_LTE_CA;
case TelephonyManager.NETWORK_TYPE_NR:
- return ServiceState.RIL_RADIO_TECHNOLOGY_NR;
+ return RIL_RADIO_TECHNOLOGY_NR;
default:
- return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
+ return RIL_RADIO_TECHNOLOGY_UNKNOWN;
}
}
@@ -1950,8 +1953,11 @@
/**
* The current registered raw data network operator name in long alphanumeric format.
*
+ * @return long raw name of operator, null if unregistered or unknown
* @hide
*/
+ @Nullable
+ @SystemApi
public String getOperatorAlphaLongRaw() {
return mOperatorAlphaLongRaw;
}
@@ -1966,8 +1972,11 @@
/**
* The current registered raw data network operator name in short alphanumeric format.
*
+ * @return short raw name of operator, null if unregistered or unknown
* @hide
*/
+ @Nullable
+ @SystemApi
public String getOperatorAlphaShortRaw() {
return mOperatorAlphaShortRaw;
}
diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java
index 1309b4d..3f95a81 100644
--- a/telephony/java/android/telephony/SmsManager.java
+++ b/telephony/java/android/telephony/SmsManager.java
@@ -2659,7 +2659,7 @@
ISms iccISms = getISmsServiceOrThrow();
if (iccISms != null) {
return iccISms.checkSmsShortCodeDestination(getSubscriptionId(),
- ActivityThread.currentPackageName(), destAddress, countryIso);
+ ActivityThread.currentPackageName(), null, destAddress, countryIso);
}
} catch (RemoteException e) {
Log.e(TAG, "checkSmsShortCodeDestination() RemoteException", e);
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index f527bc3..9eff809 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -654,6 +654,7 @@
* Return whether the subscription's group is disabled.
* @hide
*/
+ @SystemApi
public boolean isGroupDisabled() {
return mIsGroupDisabled;
}
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index dfcfed7..3d63e4a 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1154,7 +1154,8 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- subInfo = iSub.getActiveSubscriptionInfo(subId, mContext.getOpPackageName());
+ subInfo = iSub.getActiveSubscriptionInfo(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -1182,7 +1183,8 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- result = iSub.getActiveSubscriptionInfoForIccId(iccId, mContext.getOpPackageName());
+ result = iSub.getActiveSubscriptionInfoForIccId(iccId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -1216,7 +1218,7 @@
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
result = iSub.getActiveSubscriptionInfoForSimSlotIndex(slotIndex,
- mContext.getOpPackageName());
+ mContext.getOpPackageName(), mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -1239,7 +1241,8 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- result = iSub.getAllSubInfoList(mContext.getOpPackageName());
+ result = iSub.getAllSubInfoList(mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -1283,18 +1286,39 @@
}
/**
- * This is similar to {@link #getActiveSubscriptionInfoList()}, but if userVisibleOnly
- * is true, it will filter out the hidden subscriptions.
+ * Get both hidden and visible SubscriptionInfo(s) of the currently active SIM(s).
+ * The records will be sorted by {@link SubscriptionInfo#getSimSlotIndex}
+ * then by {@link SubscriptionInfo#getSubscriptionId}.
*
- * @hide
+ * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
+ * or that the calling app has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges}). In the latter case, only records accessible
+ * to the calling app are returned.
+ *
+ * @return Sorted list of the currently available {@link SubscriptionInfo}
+ * records on the device.
+ * This is similar to {@link #getActiveSubscriptionInfoList} except that it will return
+ * both active and hidden SubscriptionInfos.
+ *
*/
- public List<SubscriptionInfo> getActiveSubscriptionInfoList(boolean userVisibleOnly) {
+ public @Nullable List<SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList() {
+ return getActiveSubscriptionInfoList(/* userVisibleonly */false);
+ }
+
+ /**
+ * This is similar to {@link #getActiveSubscriptionInfoList()}, but if userVisibleOnly
+ * is true, it will filter out the hidden subscriptions.
+ *
+ * @hide
+ */
+ public @Nullable List<SubscriptionInfo> getActiveSubscriptionInfoList(boolean userVisibleOnly) {
List<SubscriptionInfo> activeList = null;
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- activeList = iSub.getActiveSubscriptionInfoList(mContext.getOpPackageName());
+ activeList = iSub.getActiveSubscriptionInfoList(mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -1344,7 +1368,8 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- result = iSub.getAvailableSubscriptionInfoList(mContext.getOpPackageName());
+ result = iSub.getAvailableSubscriptionInfoList(mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -1461,7 +1486,8 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- result = iSub.getAllSubInfoCount(mContext.getOpPackageName());
+ result = iSub.getAllSubInfoCount(mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -1489,7 +1515,8 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- result = iSub.getActiveSubInfoCount(mContext.getOpPackageName());
+ result = iSub.getActiveSubInfoCount(mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -2227,7 +2254,7 @@
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
resultValue = iSub.getSubscriptionProperty(subId, propKey,
- context.getOpPackageName());
+ context.getOpPackageName(), context.getFeatureId());
}
} catch (RemoteException ex) {
// ignore it
@@ -2350,7 +2377,8 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- return iSub.isActiveSubId(subId, mContext.getOpPackageName());
+ return iSub.isActiveSubId(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
}
@@ -2715,13 +2743,14 @@
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions() {
- String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
+ String contextPkg = mContext != null ? mContext.getOpPackageName() : "<unknown>";
+ String contextFeature = mContext != null ? mContext.getFeatureId() : null;
List<SubscriptionInfo> subInfoList = null;
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- subInfoList = iSub.getOpportunisticSubscriptions(pkgForDebug);
+ subInfoList = iSub.getOpportunisticSubscriptions(contextPkg, contextFeature);
}
} catch (RemoteException ex) {
// ignore it
@@ -2959,7 +2988,8 @@
@RequiresPermission(Manifest.permission.READ_PHONE_STATE)
public @NonNull List<SubscriptionInfo> getSubscriptionsInGroup(@NonNull ParcelUuid groupUuid) {
Preconditions.checkNotNull(groupUuid, "groupUuid can't be null");
- String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
+ String contextPkg = mContext != null ? mContext.getOpPackageName() : "<unknown>";
+ String contextFeature = mContext != null ? mContext.getFeatureId() : null;
if (VDBG) {
logd("[getSubscriptionsInGroup]+ groupUuid:" + groupUuid);
}
@@ -2968,7 +2998,7 @@
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- result = iSub.getSubscriptionsInGroup(groupUuid, pkgForDebug);
+ result = iSub.getSubscriptionsInGroup(groupUuid, contextPkg, contextFeature);
} else {
if (!isSystemProcess()) {
throw new IllegalStateException("telephony service is null.");
@@ -3182,13 +3212,14 @@
}
/**
- * Get active data subscription id.
+ * Get active data subscription id. Active data subscription refers to the subscription
+ * currently chosen to provide cellular internet connection to the user. This may be
+ * different from getDefaultDataSubscriptionId(). Eg. Opportunistics data
+ *
* See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details.
*
- * @return Active data subscription id
- *
- * //TODO: Refactor this API in b/134702460
- * @hide
+ * @return Active data subscription id if any is chosen, or
+ * SubscriptionManager.INVALID_SUBSCRIPTION_ID if not.
*/
public static int getActiveDataSubscriptionId() {
try {
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index a350e40..64b5aa5 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1689,7 +1689,8 @@
if (telephony == null) return null;
try {
- return telephony.getDeviceSoftwareVersionForSlot(slotIndex, getOpPackageName());
+ return telephony.getDeviceSoftwareVersionForSlot(slotIndex, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -1730,7 +1731,8 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return null;
- return telephony.getDeviceId(mContext.getOpPackageName());
+ return telephony.getDeviceIdWithFeature(mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -1774,7 +1776,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getDeviceIdForPhone(slotIndex, mContext.getOpPackageName());
+ return info.getDeviceIdForPhone(slotIndex, mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -1832,7 +1835,7 @@
if (telephony == null) return null;
try {
- return telephony.getImeiForSlot(slotIndex, getOpPackageName());
+ return telephony.getImeiForSlot(slotIndex, getOpPackageName(), getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -1926,7 +1929,7 @@
if (telephony == null) return null;
try {
- String meid = telephony.getMeidForSlot(slotIndex, getOpPackageName());
+ String meid = telephony.getMeidForSlot(slotIndex, getOpPackageName(), getFeatureId());
if (TextUtils.isEmpty(meid)) {
Log.d(TAG, "getMeid: return null because MEID is not available");
return null;
@@ -2027,7 +2030,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- String nai = info.getNaiForSubscriber(subId, mContext.getOpPackageName());
+ String nai = info.getNaiForSubscriber(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Rlog.v(TAG, "Nai = " + nai);
}
@@ -2578,7 +2582,7 @@
ITelephony telephony = getITelephony();
if (telephony == null) return "";
return telephony.getNetworkCountryIsoForPhone(getPhoneId(),
- null /* no permission check */);
+ null /* no permission check */, null);
} catch (RemoteException ex) {
return "";
}
@@ -2618,7 +2622,8 @@
ITelephony telephony = getITelephony();
if (telephony == null) return "";
- return telephony.getNetworkCountryIsoForPhone(slotIndex, getOpPackageName());
+ return telephony.getNetworkCountryIsoForPhone(slotIndex, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
return "";
}
@@ -2722,7 +2727,8 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.getNetworkTypeForSubscriber(subId, getOpPackageName());
+ return telephony.getNetworkTypeForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} else {
// This can happen when the ITelephony interface is not up yet.
return NETWORK_TYPE_UNKNOWN;
@@ -2786,7 +2792,8 @@
try{
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.getDataNetworkTypeForSubscriber(subId, getOpPackageName());
+ return telephony.getDataNetworkTypeForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} else {
// This can happen when the ITelephony interface is not up yet.
return NETWORK_TYPE_UNKNOWN;
@@ -2822,7 +2829,8 @@
try{
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.getVoiceNetworkTypeForSubscriber(subId, getOpPackageName());
+ return telephony.getVoiceNetworkTypeForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} else {
// This can happen when the ITelephony interface is not up yet.
return NETWORK_TYPE_UNKNOWN;
@@ -3566,13 +3574,36 @@
}
/**
+ * Returns the ISO-3166 country code equivalent for the SIM provider's country code
+ * of the default subscription
+ * <p>
+ * The ISO-3166 country code is provided in lowercase 2 character format.
+ * @return the lowercase 2 character ISO-3166 country code, or empty string is not available.
+ * <p>
+ * Note: This API is introduced to unblock mainlining work as the following APIs in
+ * Linkify.java invokes getSimCountryIso() without a context. TODO(Bug 144576376): remove
+ * this API once the following APIs are redesigned to access telephonymanager with a context.
+ *
+ * {@link Linkify#addLinks(@NonNull Spannable text, @LinkifyMask int mask)}
+ * {@link Linkify#addLinks(@NonNull Spannable text, @LinkifyMask int mask,
+ @Nullable Function<String, URLSpan> urlSpanFactory)}
+ *
+ * @hide
+ */
+ @SystemApi
+ @NonNull
+ public static String getDefaultSimCountryIso() {
+ return getSimCountryIso(SubscriptionManager.getDefaultSubscriptionId());
+ }
+
+ /**
* Returns the ISO country code equivalent for the SIM provider's country code.
*
* @param subId for which SimCountryIso is returned
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
- public String getSimCountryIso(int subId) {
+ public static String getSimCountryIso(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimCountryIsoForPhone(phoneId);
}
@@ -3583,7 +3614,7 @@
* @hide
*/
@UnsupportedAppUsage
- public String getSimCountryIsoForPhone(int phoneId) {
+ public static String getSimCountryIsoForPhone(int phoneId) {
return getTelephonyProperty(phoneId, TelephonyProperties.icc_operator_iso_country(), "");
}
@@ -3647,7 +3678,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getIccSerialNumberForSubscriber(subId, mContext.getOpPackageName());
+ return info.getIccSerialNumberForSubscriber(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -3691,7 +3723,8 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
- return telephony.getLteOnCdmaModeForSubscriber(subId, getOpPackageName());
+ return telephony.getLteOnCdmaModeForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
// Assume no ICC card if remote exception which shouldn't happen
return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
@@ -3919,7 +3952,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getSubscriberIdForSubscriber(subId, mContext.getOpPackageName());
+ return info.getSubscriberIdForSubscriber(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4086,7 +4120,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getGroupIdLevel1ForSubscriber(getSubId(), mContext.getOpPackageName());
+ return info.getGroupIdLevel1ForSubscriber(getSubId(), mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4109,7 +4144,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getGroupIdLevel1ForSubscriber(subId, mContext.getOpPackageName());
+ return info.getGroupIdLevel1ForSubscriber(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4159,7 +4195,8 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null)
- number = telephony.getLine1NumberForDisplay(subId, mContext.getOpPackageName());
+ number = telephony.getLine1NumberForDisplay(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
@@ -4170,7 +4207,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getLine1NumberForSubscriber(subId, mContext.getOpPackageName());
+ return info.getLine1NumberForSubscriber(subId, mContext.getOpPackageName(),
+ mContext.getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4226,6 +4264,7 @@
* @hide
* nobody seems to call this.
*/
+ @UnsupportedAppUsage
@TestApi
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public String getLine1AlphaTag() {
@@ -4248,7 +4287,7 @@
ITelephony telephony = getITelephony();
if (telephony != null)
alphaTag = telephony.getLine1AlphaTagForDisplay(subId,
- getOpPackageName());
+ getOpPackageName(), getFeatureId());
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
@@ -4259,7 +4298,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getLine1AlphaTagForSubscriber(subId, getOpPackageName());
+ return info.getLine1AlphaTagForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4288,7 +4328,8 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null)
- return telephony.getMergedSubscriberIds(getSubId(), getOpPackageName());
+ return telephony.getMergedSubscriberIds(getSubId(), getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
@@ -4343,7 +4384,7 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getMsisdnForSubscriber(subId, getOpPackageName());
+ return info.getMsisdnForSubscriber(subId, getOpPackageName(), getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4377,7 +4418,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getVoiceMailNumberForSubscriber(subId, getOpPackageName());
+ return info.getVoiceMailNumberForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4501,8 +4543,8 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony
- .getVisualVoicemailPackageName(mContext.getOpPackageName(), getSubId());
+ return telephony.getVisualVoicemailPackageName(mContext.getOpPackageName(),
+ getFeatureId(), getSubId());
}
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
@@ -4949,7 +4991,8 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return 0;
- return telephony.getVoiceMessageCountForSubscriber(subId, getOpPackageName());
+ return telephony.getVoiceMessageCountForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
return 0;
} catch (NullPointerException ex) {
@@ -4985,7 +5028,8 @@
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
- return info.getVoiceMailAlphaTagForSubscriber(subId, getOpPackageName());
+ return info.getVoiceMailAlphaTagForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -5364,7 +5408,7 @@
} else if (listener.mSubId != null) {
subId = listener.mSubId;
}
- registry.listenForSubscriber(subId, getOpPackageName(),
+ registry.listenForSubscriber(subId, getOpPackageName(), getFeatureId(),
listener.callback, events, notifyNow);
} else {
Rlog.w(TAG, "telephony registry not ready.");
@@ -5394,7 +5438,8 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return -1;
- return telephony.getCdmaEriIconIndexForSubscriber(subId, getOpPackageName());
+ return telephony.getCdmaEriIconIndexForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
// the phone process is restarting.
return -1;
@@ -5429,7 +5474,8 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return -1;
- return telephony.getCdmaEriIconModeForSubscriber(subId, getOpPackageName());
+ return telephony.getCdmaEriIconModeForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
// the phone process is restarting.
return -1;
@@ -5460,7 +5506,8 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return null;
- return telephony.getCdmaEriTextForSubscriber(subId, getOpPackageName());
+ return telephony.getCdmaEriTextForSubscriber(subId, getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
// the phone process is restarting.
return null;
@@ -6963,7 +7010,8 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return null;
- return telephony.getForbiddenPlmns(subId, appType, mContext.getOpPackageName());
+ return telephony.getForbiddenPlmns(subId, appType, mContext.getOpPackageName(),
+ getFeatureId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -6996,7 +7044,7 @@
ITelephony telephony = getITelephony();
if (telephony == null) return 0;
return telephony.setForbiddenPlmns(
- getSubId(), APPTYPE_USIM, fplmns, getOpPackageName());
+ getSubId(), APPTYPE_USIM, fplmns, getOpPackageName(), getFeatureId());
} catch (RemoteException ex) {
Rlog.e(TAG, "setForbiddenPlmns RemoteException: " + ex.getMessage());
} catch (NullPointerException ex) {
@@ -7017,7 +7065,7 @@
ITelephony telephony = getITelephony();
if (telephony == null)
return new String[0];
- return telephony.getPcscfAddress(apnType, getOpPackageName());
+ return telephony.getPcscfAddress(apnType, getOpPackageName(), getFeatureId());
} catch (RemoteException e) {
return new String[0];
}
@@ -8248,7 +8296,7 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null)
- return telephony.isRadioOn(getOpPackageName());
+ return telephony.isRadioOnWithFeature(getOpPackageName(), getFeatureId());
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isRadioOn", e);
}
@@ -8523,7 +8571,8 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.getRadioPowerState(getSlotIndex(), mContext.getOpPackageName());
+ return telephony.getRadioPowerState(getSlotIndex(), mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
// This could happen if binder process crashes.
@@ -8881,7 +8930,7 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null)
- return telephony.isVideoCallingEnabled(getOpPackageName());
+ return telephony.isVideoCallingEnabled(getOpPackageName(), getFeatureId());
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isVideoCallingEnabled", e);
}
@@ -8897,7 +8946,8 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.canChangeDtmfToneLength(mSubId, getOpPackageName());
+ return telephony.canChangeDtmfToneLength(mSubId, getOpPackageName(),
+ getFeatureId());
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#canChangeDtmfToneLength", e);
@@ -8916,7 +8966,7 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.isWorldPhone(mSubId, getOpPackageName());
+ return telephony.isWorldPhone(mSubId, getOpPackageName(), getFeatureId());
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isWorldPhone", e);
@@ -9639,7 +9689,7 @@
ITelephony service = getITelephony();
if (service != null) {
retval = service.getSubIdForPhoneAccountHandle(
- phoneAccountHandle, mContext.getOpPackageName());
+ phoneAccountHandle, mContext.getOpPackageName(), mContext.getFeatureId());
}
} catch (RemoteException ex) {
Log.e(TAG, "getSubscriptionId RemoteException", ex);
@@ -10501,7 +10551,7 @@
try {
ITelephony service = getITelephony();
if (service != null) {
- return service.getClientRequestStats(getOpPackageName(), subId);
+ return service.getClientRequestStats(getOpPackageName(), getFeatureId(), subId);
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#getClientRequestStats", e);
@@ -10765,6 +10815,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public int getCarrierIdListVersion() {
try {
@@ -10788,7 +10839,7 @@
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getNumberOfModemsWithSimultaneousDataConnections(
- getSubId(), getOpPackageName());
+ getSubId(), getOpPackageName(), getFeatureId());
}
} catch (RemoteException ex) {
// This could happen if binder process crashes.
@@ -10811,6 +10862,7 @@
* @hide
*/
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
+ @SystemApi
public boolean setOpportunisticNetworkState(boolean enable) {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
boolean ret = false;
@@ -10838,6 +10890,7 @@
* @hide
*/
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
+ @SystemApi
public boolean isOpportunisticNetworkEnabled() {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
boolean isEnabled = false;
@@ -11090,7 +11143,8 @@
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.getEmergencyNumberList(mContext.getOpPackageName());
+ return telephony.getEmergencyNumberList(mContext.getOpPackageName(),
+ mContext.getFeatureId());
} else {
throw new IllegalStateException("telephony service is null.");
}
@@ -11145,7 +11199,7 @@
ITelephony telephony = getITelephony();
if (telephony != null) {
emergencyNumberList = telephony.getEmergencyNumberList(
- mContext.getOpPackageName());
+ mContext.getOpPackageName(), mContext.getFeatureId());
if (emergencyNumberList != null) {
for (Integer subscriptionId : emergencyNumberList.keySet()) {
List<EmergencyNumber> numberList = emergencyNumberList.get(subscriptionId);
@@ -11366,12 +11420,14 @@
android.Manifest.permission.READ_PHONE_STATE
})
public int getPreferredOpportunisticDataSubscription() {
- String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
+ String packageName = mContext != null ? mContext.getOpPackageName() : "<unknown>";
+ String featureId = mContext != null ? mContext.getFeatureId() : null;
int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
try {
IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService != null) {
- subId = iOpportunisticNetworkService.getPreferredDataSubscriptionId(pkgForDebug);
+ subId = iOpportunisticNetworkService.getPreferredDataSubscriptionId(
+ packageName, featureId);
}
} catch (RemoteException ex) {
Rlog.e(TAG, "getPreferredDataSubscriptionId RemoteException", ex);
@@ -11475,11 +11531,13 @@
* @param slotIndex which slot it's checking.
* @hide
*/
+ @SystemApi
public boolean isModemEnabledForSlot(int slotIndex) {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
- return telephony.isModemEnabledForSlot(slotIndex, mContext.getOpPackageName());
+ return telephony.isModemEnabledForSlot(slotIndex, mContext.getOpPackageName(),
+ mContext.getFeatureId());
}
} catch (RemoteException ex) {
Log.e(TAG, "enableModem RemoteException", ex);
@@ -11584,7 +11642,7 @@
try {
ITelephony service = getITelephony();
if (service != null) {
- return service.isMultiSimSupported(getOpPackageName());
+ return service.isMultiSimSupported(getOpPackageName(), getFeatureId());
}
} catch (RemoteException e) {
Log.e(TAG, "isMultiSimSupported RemoteException", e);
@@ -11636,7 +11694,7 @@
ITelephony service = getITelephony();
if (service != null) {
return service.doesSwitchMultiSimConfigTriggerReboot(getSubId(),
- getOpPackageName());
+ getOpPackageName(), getFeatureId());
}
} catch (RemoteException e) {
Log.e(TAG, "doesSwitchMultiSimConfigTriggerReboot RemoteException", e);
@@ -11653,6 +11711,7 @@
*
* @hide
*/
+ @UnsupportedAppUsage
@TestApi
public Pair<Integer, Integer> getRadioHalVersion() {
try {
diff --git a/telephony/java/android/telephony/euicc/EuiccManager.java b/telephony/java/android/telephony/euicc/EuiccManager.java
index 0025c7a..cb66a96 100644
--- a/telephony/java/android/telephony/euicc/EuiccManager.java
+++ b/telephony/java/android/telephony/euicc/EuiccManager.java
@@ -189,6 +189,29 @@
"android.telephony.euicc.action.RENAME_SUBSCRIPTION_PRIVILEGED";
/**
+ * Intent action sent by a carrier app to launch the eSIM activation flow provided by the LPA UI
+ * (LUI). The carrier app must send this intent with one of the following:
+ *
+ * <p>{@link #EXTRA_USE_QR_SCANNER} not set or set to false: The LPA should try to get an
+ * activation code from the carrier app by binding to the carrier app service implementing
+ * {@link android.service.euicc.EuiccService#ACTION_BIND_CARRIER_PROVISIONING_SERVICE}.
+ * <p>{@link #EXTRA_USE_QR_SCANNER} set to true: The LPA should launch a QR scanner for the user
+ * to scan an eSIM profile QR code.
+ *
+ * <p>Upon completion, the LPA should return one of the following results to the carrier app:
+ *
+ * <p>{@code Activity.RESULT_OK}: The LPA has succeeded in downloading the new eSIM profile.
+ * <p>{@code Activity.RESULT_CANCELED}: The carrier app should treat this as if the user pressed
+ * the back button.
+ * <p>Anything else: The carrier app should treat this as an error.
+ *
+ * <p>LPA needs to check if caller's package name is allowed to perform this action.
+ **/
+ @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_START_EUICC_ACTIVATION =
+ "android.telephony.euicc.action.START_EUICC_ACTIVATION";
+
+ /**
* Result code for an operation indicating that the operation succeeded.
*/
public static final int EMBEDDED_SUBSCRIPTION_RESULT_OK = 0;
@@ -342,10 +365,20 @@
*
* @hide
*/
- // TODO: Make this a @SystemApi.
+ @SystemApi
public static final String EXTRA_PHYSICAL_SLOT_ID =
"android.telephony.euicc.extra.PHYSICAL_SLOT_ID";
+
+ /**
+ * Key for an extra set on actions {@link #ACTION_START_EUICC_ACTIVATION} providing a boolean
+ * value of whether to start eSIM activation with QR scanner.
+ *
+ * <p>Expected type of the extra data: boolean
+ **/
+ public static final String EXTRA_USE_QR_SCANNER =
+ "android.telephony.euicc.extra.USE_QR_SCANNER";
+
/**
* Optional meta-data attribute for a carrier app providing an icon to use to represent the
* carrier. If not provided, the app's launcher icon will be used as a fallback.
@@ -830,7 +863,7 @@
* @param callbackIntent a PendingIntent to launch when the operation completes.
*
* @deprecated From R, callers should specify a flag for specific set of subscriptions to erase
- * and use {@link #eraseSubscriptionsWithOptions(int, PendingIntent)} instead
+ * and use {@link #eraseSubscriptions(int, PendingIntent)} instead
*
* @hide
*/
@@ -862,7 +895,7 @@
*/
@SystemApi
@RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)
- public void eraseSubscriptionsWithOptions(
+ public void eraseSubscriptions(
@ResetOption int options, @NonNull PendingIntent callbackIntent) {
if (!isEnabled()) {
sendUnavailableError(callbackIntent);
diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java
index eb0e2f7..5fd0af5 100644
--- a/telephony/java/android/telephony/ims/ImsMmTelManager.java
+++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java
@@ -979,25 +979,25 @@
/**
* Get the status of the MmTel Feature registered on this subscription.
+ * @param executor The executor that will be used to call the callback.
* @param callback A callback containing an Integer describing the current state of the
* MmTel feature, Which will be one of the following:
* {@link ImsFeature#STATE_UNAVAILABLE},
* {@link ImsFeature#STATE_INITIALIZING},
* {@link ImsFeature#STATE_READY}. Will be called using the executor
* specified when the service state has been retrieved from the IMS service.
- * @param executor The executor that will be used to call the callback.
* @throws ImsException if the IMS service associated with this subscription is not available or
* the IMS service is not available.
*/
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
- public void getFeatureState(@NonNull @ImsFeature.ImsState Consumer<Integer> callback,
- @NonNull @CallbackExecutor Executor executor) throws ImsException {
- if (callback == null) {
- throw new IllegalArgumentException("Must include a non-null Consumer.");
- }
+ public void getFeatureState(@NonNull @CallbackExecutor Executor executor,
+ @NonNull @ImsFeature.ImsState Consumer<Integer> callback) throws ImsException {
if (executor == null) {
throw new IllegalArgumentException("Must include a non-null Executor.");
}
+ if (callback == null) {
+ throw new IllegalArgumentException("Must include a non-null Consumer.");
+ }
try {
getITelephony().getImsMmTelFeatureState(mSubId, new IIntegerConsumer.Stub() {
@Override
diff --git a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl
index 8e50a8f..ee09c1c 100644
--- a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl
+++ b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl
@@ -23,9 +23,13 @@
*/
interface ICarrierConfigLoader {
+ /** @deprecated Use {@link #getConfigForSubIdWithFeature(int, String, String) instead */
@UnsupportedAppUsage
PersistableBundle getConfigForSubId(int subId, String callingPackage);
+ PersistableBundle getConfigForSubIdWithFeature(int subId, String callingPackage,
+ String callingFeatureId);
+
void overrideConfig(int subId, in PersistableBundle overrides);
void notifyConfigChangedForSubId(int subId);
diff --git a/telephony/java/com/android/internal/telephony/IOns.aidl b/telephony/java/com/android/internal/telephony/IOns.aidl
index 2c48b65..76b6951 100755
--- a/telephony/java/com/android/internal/telephony/IOns.aidl
+++ b/telephony/java/com/android/internal/telephony/IOns.aidl
@@ -83,7 +83,7 @@
* subscription id
*
*/
- int getPreferredDataSubscriptionId(String callingPackage);
+ int getPreferredDataSubscriptionId(String callingPackage, String callingFeatureId);
/**
* Update availability of a list of networks in the current location.
diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
index 15e7fc2..28ef235 100644
--- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
+++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
@@ -24,114 +24,128 @@
*/
interface IPhoneSubInfo {
+ /** @deprecated Use {@link #getDeviceIdWithFeature(String, String) instead */
+ @UnsupportedAppUsage
+ String getDeviceId(String callingPackage);
+
/**
* Retrieves the unique device ID, e.g., IMEI for GSM phones.
*/
- @UnsupportedAppUsage
- String getDeviceId(String callingPackage);
+ String getDeviceIdWithFeature(String callingPackage, String callingFeatureId);
/**
* Retrieves the unique Network Access ID
*/
- String getNaiForSubscriber(int subId, String callingPackage);
+ String getNaiForSubscriber(int subId, String callingPackage, String callingFeatureId);
/**
* Retrieves the unique device ID of a phone for the device, e.g., IMEI
* for GSM phones.
*/
- String getDeviceIdForPhone(int phoneId, String callingPackage);
+ String getDeviceIdForPhone(int phoneId, String callingPackage, String callingFeatureId);
/**
* Retrieves the IMEI.
*/
- String getImeiForSubscriber(int subId, String callingPackage);
+ String getImeiForSubscriber(int subId, String callingPackage, String callingFeatureId);
/**
* Retrieves the software version number for the device, e.g., IMEI/SV
* for GSM phones.
*/
- String getDeviceSvn(String callingPackage);
+ String getDeviceSvn(String callingPackage, String callingFeatureId);
/**
* Retrieves the software version number of a subId for the device, e.g., IMEI/SV
* for GSM phones.
*/
- String getDeviceSvnUsingSubId(int subId, String callingPackage);
+ String getDeviceSvnUsingSubId(int subId, String callingPackage, String callingFeatureId);
- /**
- * Retrieves the unique sbuscriber ID, e.g., IMSI for GSM phones.
- */
+ /** @deprecated Use {@link #getSubscriberIdWithFeature(String, String) instead */
@UnsupportedAppUsage
String getSubscriberId(String callingPackage);
/**
+ * Retrieves the unique sbuscriber ID, e.g., IMSI for GSM phones.
+ */
+ String getSubscriberIdWithFeature(String callingPackage, String callingComponenId);
+
+ /**
* Retrieves the unique subscriber ID of a given subId, e.g., IMSI for GSM phones.
*/
- String getSubscriberIdForSubscriber(int subId, String callingPackage);
+ String getSubscriberIdForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Retrieves the Group Identifier Level1 for GSM phones of a subId.
*/
- String getGroupIdLevel1ForSubscriber(int subId, String callingPackage);
+ String getGroupIdLevel1ForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
- /**
- * Retrieves the serial number of the ICC, if applicable.
- */
+ /** @deprecared Use {@link getIccSerialNumberWithFeature(String, String)} instead */
@UnsupportedAppUsage
String getIccSerialNumber(String callingPackage);
/**
+ * Retrieves the serial number of the ICC, if applicable.
+ */
+ String getIccSerialNumberWithFeature(String callingPackage, String callingFeatureId);
+
+ /**
* Retrieves the serial number of a given subId.
*/
- String getIccSerialNumberForSubscriber(int subId, String callingPackage);
+ String getIccSerialNumberForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Retrieves the phone number string for line 1.
*/
- String getLine1Number(String callingPackage);
+ String getLine1Number(String callingPackage, String callingFeatureId);
/**
* Retrieves the phone number string for line 1 of a subcription.
*/
- String getLine1NumberForSubscriber(int subId, String callingPackage);
+ String getLine1NumberForSubscriber(int subId, String callingPackage, String callingFeatureId);
/**
* Retrieves the alpha identifier for line 1.
*/
- String getLine1AlphaTag(String callingPackage);
+ String getLine1AlphaTag(String callingPackage, String callingFeatureId);
/**
* Retrieves the alpha identifier for line 1 of a subId.
*/
- String getLine1AlphaTagForSubscriber(int subId, String callingPackage);
+ String getLine1AlphaTagForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Retrieves MSISDN Number.
*/
- String getMsisdn(String callingPackage);
+ String getMsisdn(String callingPackage, String callingFeatureId);
/**
* Retrieves the Msisdn of a subId.
*/
- String getMsisdnForSubscriber(int subId, String callingPackage);
+ String getMsisdnForSubscriber(int subId, String callingPackage, String callingFeatureId);
/**
* Retrieves the voice mail number.
*/
- String getVoiceMailNumber(String callingPackage);
+ String getVoiceMailNumber(String callingPackage, String callingFeatureId);
/**
* Retrieves the voice mail number of a given subId.
*/
- String getVoiceMailNumberForSubscriber(int subId, String callingPackage);
+ String getVoiceMailNumberForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Retrieves the Carrier information used to encrypt IMSI and IMPI.
*/
ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int subId, int keyType,
- String callingPackage);
+ String callingPackage);
/**
* Stores the Carrier information used to encrypt IMSI and IMPI.
@@ -149,13 +163,14 @@
/**
* Retrieves the alpha identifier associated with the voice mail number.
*/
- String getVoiceMailAlphaTag(String callingPackage);
+ String getVoiceMailAlphaTag(String callingPackage, String callingFeatureId);
/**
* Retrieves the alpha identifier associated with the voice mail number
* of a subId.
*/
- String getVoiceMailAlphaTagForSubscriber(int subId, String callingPackage);
+ String getVoiceMailAlphaTagForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Returns the IMS private user identity (IMPI) that was loaded from the ISIM.
diff --git a/telephony/java/com/android/internal/telephony/ISms.aidl b/telephony/java/com/android/internal/telephony/ISms.aidl
index 91aa3ce..ac4c8ec 100644
--- a/telephony/java/com/android/internal/telephony/ISms.aidl
+++ b/telephony/java/com/android/internal/telephony/ISms.aidl
@@ -573,7 +573,8 @@
*
* @param destAddress the destination address to test for possible short code
*/
- int checkSmsShortCodeDestination(int subId, String callingApk, String destAddress, String countryIso);
+ int checkSmsShortCodeDestination(int subId, String callingApk, String callingFeatureId,
+ String destAddress, String countryIso);
/**
* Gets the SMSC address from (U)SIM.
diff --git a/telephony/java/com/android/internal/telephony/ISmsImplBase.java b/telephony/java/com/android/internal/telephony/ISmsImplBase.java
index d9d4b60..9865f76 100644
--- a/telephony/java/com/android/internal/telephony/ISmsImplBase.java
+++ b/telephony/java/com/android/internal/telephony/ISmsImplBase.java
@@ -18,7 +18,6 @@
import android.app.PendingIntent;
import android.net.Uri;
-import android.os.Bundle;
import java.util.List;
@@ -197,8 +196,8 @@
}
@Override
- public int checkSmsShortCodeDestination(
- int subid, String callingApk, String destAddress, String countryIso) {
+ public int checkSmsShortCodeDestination(int subid, String callingPackage,
+ String callingFeatureId, String destAddress, String countryIso) {
throw new UnsupportedOperationException();
}
diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl
index 7cc37d0d2..151aae8 100755
--- a/telephony/java/com/android/internal/telephony/ISub.aidl
+++ b/telephony/java/com/android/internal/telephony/ISub.aidl
@@ -23,47 +23,56 @@
interface ISub {
/**
* @param callingPackage The package maing the call.
+ * @param callingFeatureId The feature in the package
* @return a list of all subscriptions in the database, this includes
* all subscriptions that have been seen.
*/
- List<SubscriptionInfo> getAllSubInfoList(String callingPackage);
+ List<SubscriptionInfo> getAllSubInfoList(String callingPackage, String callingFeatureId);
/**
* @param callingPackage The package maing the call.
+ * @param callingFeatureId The feature in the package
* @return the count of all subscriptions in the database, this includes
* all subscriptions that have been seen.
*/
- int getAllSubInfoCount(String callingPackage);
+ int getAllSubInfoCount(String callingPackage, String callingFeatureId);
/**
* Get the active SubscriptionInfo with the subId key
* @param subId The unique SubscriptionInfo key in database
* @param callingPackage The package maing the call.
+ * @param callingFeatureId The feature in the package
* @return SubscriptionInfo, maybe null if its not active
*/
- SubscriptionInfo getActiveSubscriptionInfo(int subId, String callingPackage);
+ SubscriptionInfo getActiveSubscriptionInfo(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Get the active SubscriptionInfo associated with the iccId
* @param iccId the IccId of SIM card
* @param callingPackage The package maing the call.
+ * @param callingFeatureId The feature in the package
* @return SubscriptionInfo, maybe null if its not active
*/
- SubscriptionInfo getActiveSubscriptionInfoForIccId(String iccId, String callingPackage);
+ SubscriptionInfo getActiveSubscriptionInfoForIccId(String iccId, String callingPackage,
+ String callingFeatureId);
/**
* Get the active SubscriptionInfo associated with the slotIndex
* @param slotIndex the slot which the subscription is inserted
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package
* @return SubscriptionInfo, null for Remote-SIMs or non-active slotIndex.
*/
- SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int slotIndex, String callingPackage);
+ SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int slotIndex, String callingPackage,
+ String callingFeatureId);
/**
* Get the SubscriptionInfo(s) of the active subscriptions. The records will be sorted
* by {@link SubscriptionInfo#getSimSlotIndex} then by {@link SubscriptionInfo#getSubscriptionId}.
*
* @param callingPackage The package maing the call.
+ * @param callingFeatureId The feature in the package
* @return Sorted list of the currently {@link SubscriptionInfo} records available on the device.
* <ul>
* <li>
@@ -80,13 +89,15 @@
* </li>
* </ul>
*/
- List<SubscriptionInfo> getActiveSubscriptionInfoList(String callingPackage);
+ List<SubscriptionInfo> getActiveSubscriptionInfoList(String callingPackage,
+ String callingFeatureId);
/**
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* @return the number of active subscriptions
*/
- int getActiveSubInfoCount(String callingPackage);
+ int getActiveSubInfoCount(String callingPackage, String callingFeatureId);
/**
* @return the maximum number of subscriptions this device will support at any one time.
@@ -96,7 +107,8 @@
/**
* @see android.telephony.SubscriptionManager#getAvailableSubscriptionInfoList
*/
- List<SubscriptionInfo> getAvailableSubscriptionInfoList(String callingPackage);
+ List<SubscriptionInfo> getAvailableSubscriptionInfoList(String callingPackage,
+ String callingFeatureId);
/**
* @see android.telephony.SubscriptionManager#getAccessibleSubscriptionInfoList
@@ -225,7 +237,8 @@
* Return opportunistic subscriptions that can be visible to the caller.
* @return the list of opportunistic subscription info. If none exists, an empty list.
*/
- List<SubscriptionInfo> getOpportunisticSubscriptions(String callingPackage);
+ List<SubscriptionInfo> getOpportunisticSubscriptions(String callingPackage,
+ String callingFeatureId);
void removeSubscriptionsFromGroup(in int[] subIdList, in ParcelUuid groupUuid,
String callingPackage);
@@ -233,7 +246,8 @@
void addSubscriptionsIntoGroup(in int[] subIdList, in ParcelUuid groupUuid,
String callingPackage);
- List<SubscriptionInfo> getSubscriptionsInGroup(in ParcelUuid groupUuid, String callingPackage);
+ List<SubscriptionInfo> getSubscriptionsInGroup(in ParcelUuid groupUuid, String callingPackage,
+ String callingFeatureId);
int getSlotIndex(int subId);
@@ -265,7 +279,8 @@
int setSubscriptionProperty(int subId, String propKey, String propValue);
- String getSubscriptionProperty(int subId, String propKey, String callingPackage);
+ String getSubscriptionProperty(int subId, String propKey, String callingPackage,
+ String callingFeatureId);
boolean setSubscriptionEnabled(boolean enable, int subId);
@@ -278,7 +293,7 @@
*/
int getSimStateForSlotIndex(int slotIndex);
- boolean isActiveSubId(int subId, String callingPackage);
+ boolean isActiveSubId(int subId, String callingPackage, String callingFeatureId);
boolean setAlwaysAllowMmsData(int subId, boolean alwaysAllow);
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 050388c..e96a078 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -89,22 +89,32 @@
@UnsupportedAppUsage
void call(String callingPackage, String number);
+ /** @deprecated Use {@link #isRadioOnWithFeature(String, String) instead */
+ @UnsupportedAppUsage
+ boolean isRadioOn(String callingPackage);
+
/**
* Check to see if the radio is on or not.
* @param callingPackage the name of the package making the call.
+ * @param callingFeatureId The feature in the package.
* @return returns true if the radio is on.
*/
+ boolean isRadioOnWithFeature(String callingPackage, String callingFeatureId);
+
+ /**
+ * @deprecated Use {@link #isRadioOnForSubscriberWithFeature(int, String, String) instead
+ */
@UnsupportedAppUsage
- boolean isRadioOn(String callingPackage);
+ boolean isRadioOnForSubscriber(int subId, String callingPackage);
/**
* Check to see if the radio is on or not on particular subId.
* @param subId user preferred subId.
* @param callingPackage the name of the package making the call.
+ * @param callingFeatureId The feature in the package.
* @return returns true if the radio is on.
*/
- @UnsupportedAppUsage
- boolean isRadioOnForSubscriber(int subId, String callingPackage);
+ boolean isRadioOnForSubscriberWithFeature(int subId, String callingPackage, String callingFeatureId);
/**
* Supply a pin to unlock the SIM. Blocks until a result is determined.
@@ -302,7 +312,7 @@
* operator's MCC (Mobile Country Code).
* @see android.telephony.TelephonyManager#getNetworkCountryIso
*/
- String getNetworkCountryIsoForPhone(int phoneId, String callingPkg);
+ String getNetworkCountryIsoForPhone(int phoneId, String callingPkg, String callingFeatureId);
/**
* Returns the neighboring cell information of the device.
@@ -371,23 +381,27 @@
/**
* Returns the CDMA ERI icon index to display
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- int getCdmaEriIconIndex(String callingPackage);
+ int getCdmaEriIconIndex(String callingPackage, String callingFeatureId);
/**
* Returns the CDMA ERI icon index to display on particular subId.
* @param subId user preferred subId.
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- int getCdmaEriIconIndexForSubscriber(int subId, String callingPackage);
+ int getCdmaEriIconIndexForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Returns the CDMA ERI icon mode,
* 0 - ON
* 1 - FLASHING
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- int getCdmaEriIconMode(String callingPackage);
+ int getCdmaEriIconMode(String callingPackage, String callingFeatureId);
/**
* Returns the CDMA ERI icon mode on particular subId,
@@ -395,21 +409,25 @@
* 1 - FLASHING
* @param subId user preferred subId.
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- int getCdmaEriIconModeForSubscriber(int subId, String callingPackage);
+ int getCdmaEriIconModeForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Returns the CDMA ERI text,
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- String getCdmaEriText(String callingPackage);
+ String getCdmaEriText(String callingPackage, String callingFeatureId);
/**
* Returns the CDMA ERI text for particular subId,
* @param subId user preferred subId.
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- String getCdmaEriTextForSubscriber(int subId, String callingPackage);
+ String getCdmaEriTextForSubscriber(int subId, String callingPackage, String callingFeatureId);
/**
* Returns true if OTA service provisioning needs to run.
@@ -452,7 +470,8 @@
* @param subId user preferred subId.
* Returns the unread count of voicemails
*/
- int getVoiceMessageCountForSubscriber(int subId, String callingPackage);
+ int getVoiceMessageCountForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Returns true if current state supports both voice and data
@@ -462,7 +481,7 @@
Bundle getVisualVoicemailSettings(String callingPackage, int subId);
- String getVisualVoicemailPackageName(String callingPackage, int subId);
+ String getVisualVoicemailPackageName(String callingPackage, String callingFeatureId, int subId);
// Not oneway, caller needs to make sure the vaule is set before receiving a SMS
void enableVisualVoicemailSmsFilter(String callingPackage, int subId,
@@ -494,29 +513,35 @@
* Returns the network type of a subId.
* @param subId user preferred subId.
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- int getNetworkTypeForSubscriber(int subId, String callingPackage);
+ int getNetworkTypeForSubscriber(int subId, String callingPackage, String callingFeatureId);
/**
* Returns the network type for data transmission
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- int getDataNetworkType(String callingPackage);
+ int getDataNetworkType(String callingPackage, String callingFeatureId);
/**
* Returns the data network type of a subId
* @param subId user preferred subId.
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- int getDataNetworkTypeForSubscriber(int subId, String callingPackage);
+ int getDataNetworkTypeForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Returns the voice network type of a subId
* @param subId user preferred subId.
- * @param callingPackage package making the call.
+ * @param callingPackage package making the call.getLteOnCdmaMode
+ * @param callingFeatureId The feature in the package.
* Returns the network type
*/
- int getVoiceNetworkTypeForSubscriber(int subId, String callingPackage);
+ int getVoiceNetworkTypeForSubscriber(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Return true if an ICC card is present
@@ -537,10 +562,11 @@
* the mode may be unknown.
*
* @param callingPackage the name of the calling package
+ * @param callingFeatureId The feature in the package.
* @return {@link Phone#LTE_ON_CDMA_UNKNOWN}, {@link Phone#LTE_ON_CDMA_FALSE}
* or {@link PHone#LTE_ON_CDMA_TRUE}
*/
- int getLteOnCdmaMode(String callingPackage);
+ int getLteOnCdmaMode(String callingPackage, String callingFeatureId);
/**
* Return if the current radio is LTE on CDMA. This
@@ -548,10 +574,11 @@
* the mode may be unknown.
*
* @param callingPackage the name of the calling package
+ * @param callingFeatureId The feature in the package.
* @return {@link Phone#LTE_ON_CDMA_UNKNOWN}, {@link Phone#LTE_ON_CDMA_FALSE}
* or {@link PHone#LTE_ON_CDMA_TRUE}
*/
- int getLteOnCdmaModeForSubscriber(int subId, String callingPackage);
+ int getLteOnCdmaModeForSubscriber(int subId, String callingPackage, String callingFeatureId);
/**
* Returns all observed cell information of the device.
@@ -800,10 +827,11 @@
* Get the calculated preferred network type.
* Used for device configuration by some CDMA operators.
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
*
* @return the calculated preferred network type, defined in RILConstants.java.
*/
- int getCalculatedPreferredNetworkType(String callingPackage);
+ int getCalculatedPreferredNetworkType(String callingPackage, String callingFeatureId);
/*
* Get the preferred network type.
@@ -981,8 +1009,9 @@
* Get P-CSCF address from PCO after data connection is established or modified.
* @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
*/
- String[] getPcscfAddress(String apnType, String callingPackage);
+ String[] getPcscfAddress(String apnType, String callingPackage, String callingFeatureId);
/**
* Set IMS registration state
@@ -1072,9 +1101,10 @@
*
* @param subId whose dialing number for line 1 is returned.
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* @return the displayed dialing number if set, or null if not set.
*/
- String getLine1NumberForDisplay(int subId, String callingPackage);
+ String getLine1NumberForDisplay(int subId, String callingPackage, String callingFeatureId);
/**
* Returns the displayed alphatag of the dialing number if it was set
@@ -1082,10 +1112,11 @@
*
* @param subId whose alphatag associated with line 1 is returned.
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* @return the displayed alphatag of the dialing number if set, or null if
* not set.
*/
- String getLine1AlphaTagForDisplay(int subId, String callingPackage);
+ String getLine1AlphaTagForDisplay(int subId, String callingPackage, String callingFeatureId);
/**
* Return the set of subscriber IDs that should be considered "merged together" for data usage
@@ -1097,7 +1128,7 @@
*
* @hide
*/
- String[] getMergedSubscriberIds(int subId, String callingPackage);
+ String[] getMergedSubscriberIds(int subId, String callingPackage, String callingFeatureId);
/**
* @hide
@@ -1196,26 +1227,29 @@
* Whether video calling has been enabled by the user.
*
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* @return {@code true} if the user has enabled video calling, {@code false} otherwise.
*/
- boolean isVideoCallingEnabled(String callingPackage);
+ boolean isVideoCallingEnabled(String callingPackage, String callingFeatureId);
/**
* Whether the DTMF tone length can be changed.
*
* @param subId The subscription to use.
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* @return {@code true} if the DTMF tone length can be changed.
*/
- boolean canChangeDtmfToneLength(int subId, String callingPackage);
+ boolean canChangeDtmfToneLength(int subId, String callingPackage, String callingFeatureId);
/**
* Whether the device is a world phone.
*
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* @return {@code true} if the devices is a world phone.
*/
- boolean isWorldPhone(int subId, String callingPackage);
+ boolean isWorldPhone(int subId, String callingPackage, String callingFeatureId);
/**
* Whether the phone supports TTY mode.
@@ -1257,26 +1291,31 @@
*/
int getImsRegTechnologyForMmTel(int subId);
+ /** @deprecated Use {@link #getDeviceIdWithFeature(String, String) instead */
+ @UnsupportedAppUsage
+ String getDeviceId(String callingPackage);
+
/**
* Returns the unique device ID of phone, for example, the IMEI for
* GSM and the MEID for CDMA phones. Return null if device ID is not available.
*
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
- @UnsupportedAppUsage
- String getDeviceId(String callingPackage);
+ String getDeviceIdWithFeature(String callingPackage, String callingFeatureId);
/**
* Returns the IMEI for the given slot.
*
* @param slotIndex - device slot.
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
- String getImeiForSlot(int slotIndex, String callingPackage);
+ String getImeiForSlot(int slotIndex, String callingPackage, String callingFeatureId);
/**
* Returns the Type Allocation Code from the IMEI for the given slot.
@@ -1290,10 +1329,11 @@
*
* @param slotIndex - device slot.
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
- String getMeidForSlot(int slotIndex, String callingPackage);
+ String getMeidForSlot(int slotIndex, String callingPackage, String callingFeatureId);
/**
* Returns the Manufacturer Code from the MEID for the given slot.
@@ -1307,10 +1347,12 @@
*
* @param slotIndex - device slot.
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
- String getDeviceSoftwareVersionForSlot(int slotIndex, String callingPackage);
+ String getDeviceSoftwareVersionForSlot(int slotIndex, String callingPackage,
+ String callingFeatureId);
/**
* Returns the subscription ID associated with the specified PhoneAccount.
@@ -1321,7 +1363,7 @@
* Returns the subscription ID associated with the specified PhoneAccountHandle.
*/
int getSubIdForPhoneAccountHandle(in PhoneAccountHandle phoneAccountHandle,
- String callingPackage);
+ String callingPackage, String callingFeatureId);
/**
* Returns the PhoneAccountHandle associated with a subscription ID.
@@ -1605,10 +1647,12 @@
* Get Client request stats which will contain statistical information
* on each request made by client.
* @param callingPackage package making the call.
+ * @param callingFeatureId The feature in the package.
* @param subId Subscription index
* @hide
*/
- List<ClientRequestStats> getClientRequestStats(String callingPackage, int subid);
+ List<ClientRequestStats> getClientRequestStats(String callingPackage, String callingFeatureId,
+ int subid);
/**
* Set SIM card power state.
@@ -1627,7 +1671,8 @@
* @param subId subscription ID used for authentication
* @param appType the icc application type, like {@link #APPTYPE_USIM}
*/
- String[] getForbiddenPlmns(int subId, int appType, String callingPackage);
+ String[] getForbiddenPlmns(int subId, int appType, String callingPackage,
+ String callingFeatureId);
/**
* Set the forbidden PLMN list from the givven app type (ex APPTYPE_USIM) on a particular
@@ -1636,10 +1681,12 @@
* @param subId subId the id of the subscription
* @param appType appType the uicc app type, must be USIM or SIM.
* @param fplmns plmns the Forbiden plmns list that needed to be written to the SIM.
- * @param content callingPackage the op Package name.
+ * @param callingPackage the op Package name.
+ * @param callingFeatureId the feature in the package.
* @return number of fplmns that is successfully written to the SIM
*/
- int setForbiddenPlmns(int subId, int appType, in List<String> fplmns, String callingPackage);
+ int setForbiddenPlmns(int subId, int appType, in List<String> fplmns, String callingPackage,
+ String callingFeatureId);
/**
* Check if phone is in emergency callback mode
@@ -1783,7 +1830,8 @@
* How many modems can have simultaneous data connections.
* @hide
*/
- int getNumberOfModemsWithSimultaneousDataConnections(int subId, String callingPackage);
+ int getNumberOfModemsWithSimultaneousDataConnections(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Return the network selection mode on the subscription with id {@code subId}.
@@ -1799,7 +1847,7 @@
* Return the modem radio power state for slot index.
*
*/
- int getRadioPowerState(int slotIndex, String callingPackage);
+ int getRadioPowerState(int slotIndex, String callingPackage, String callingFeatureId);
// IMS specific AIDL commands, see ImsMmTelManager.java
@@ -1929,7 +1977,7 @@
/**
* Return the emergency number list from all the active subscriptions.
*/
- Map getEmergencyNumberList(String callingPackage);
+ Map getEmergencyNumberList(String callingPackage, String callingFeatureId);
/**
* Identify if the number is emergency number, based on all the active subscriptions.
@@ -2014,12 +2062,13 @@
* Returns if the usage of multiple SIM cards at the same time is supported.
*
* @param callingPackage The package making the call.
+ * @param callingFeatureId The feature in the package.
* @return {@link #MULTISIM_ALLOWED} if the device supports multiple SIMs.
* {@link #MULTISIM_NOT_SUPPORTED_BY_HARDWARE} if the device does not support multiple SIMs.
* {@link #MULTISIM_NOT_SUPPORTED_BY_CARRIER} in the device supports multiple SIMs, but the
* functionality is restricted by the carrier.
*/
- int isMultiSimSupported(String callingPackage);
+ int isMultiSimSupported(String callingPackage, String callingFeatureId);
/**
* Switch configs to enable multi-sim or switch back to single-sim
@@ -2031,7 +2080,8 @@
* Get if altering modems configurations will trigger reboot.
* @hide
*/
- boolean doesSwitchMultiSimConfigTriggerReboot(int subId, String callingPackage);
+ boolean doesSwitchMultiSimConfigTriggerReboot(int subId, String callingPackage,
+ String callingFeatureId);
/**
* Get the mapping from logical slots to physical slots.
@@ -2050,7 +2100,7 @@
*/
boolean isApplicationOnUicc(int subId, int appType);
- boolean isModemEnabledForSlot(int slotIndex, String callingPackage);
+ boolean isModemEnabledForSlot(int slotIndex, String callingPackage, String callingFeatureId);
boolean isDataEnabledForApn(int apnType, int subId, String callingPackage);
diff --git a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
index 8a852ee..6e20621 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
@@ -18,6 +18,7 @@
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import android.Manifest;
+import android.annotation.Nullable;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
@@ -95,16 +96,19 @@
* inaccesible to carrier-privileged apps).
*/
public static boolean checkCallingOrSelfReadPhoneState(
- Context context, int subId, String callingPackage, String message) {
+ Context context, int subId, String callingPackage, @Nullable String callingFeatureId,
+ String message) {
return checkReadPhoneState(context, subId, Binder.getCallingPid(), Binder.getCallingUid(),
- callingPackage, message);
+ callingPackage, callingFeatureId, message);
}
/** Identical to checkCallingOrSelfReadPhoneState but never throws SecurityException */
public static boolean checkCallingOrSelfReadPhoneStateNoThrow(
- Context context, int subId, String callingPackage, String message) {
+ Context context, int subId, String callingPackage, @Nullable String callingFeatureId,
+ String message) {
try {
- return checkCallingOrSelfReadPhoneState(context, subId, callingPackage, message);
+ return checkCallingOrSelfReadPhoneState(context, subId, callingPackage,
+ callingFeatureId, message);
} catch (SecurityException se) {
return false;
}
@@ -132,9 +136,11 @@
* devices.
*/
public static boolean checkReadPhoneState(
- Context context, int subId, int pid, int uid, String callingPackage, String message) {
+ Context context, int subId, int pid, int uid, String callingPackage,
+ @Nullable String callingFeatureId, String message) {
return checkReadPhoneState(
- context, TELEPHONY_SUPPLIER, subId, pid, uid, callingPackage, message);
+ context, TELEPHONY_SUPPLIER, subId, pid, uid, callingPackage, callingFeatureId,
+ message);
}
/**
@@ -153,7 +159,7 @@
@VisibleForTesting
public static boolean checkReadPhoneState(
Context context, Supplier<ITelephony> telephonySupplier, int subId, int pid, int uid,
- String callingPackage, String message) {
+ String callingPackage, @Nullable String callingFeatureId, String message) {
try {
context.enforcePermission(
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, pid, uid, message);
@@ -178,8 +184,8 @@
// We have READ_PHONE_STATE permission, so return true as long as the AppOps bit hasn't been
// revoked.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
- return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_STATE, uid, callingPackage)
- == AppOpsManager.MODE_ALLOWED;
+ return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_STATE, uid, callingPackage,
+ callingFeatureId, null) == AppOpsManager.MODE_ALLOWED;
}
/**
@@ -196,16 +202,16 @@
* @return {@code true} if the app can read phone state or has carrier privilege;
* {@code false} otherwise.
*/
- public static boolean checkReadPhoneStateOnAnyActiveSub(
- Context context, int pid, int uid, String callingPackage, String message) {
+ public static boolean checkReadPhoneStateOnAnyActiveSub(Context context, int pid, int uid,
+ String callingPackage, @Nullable String callingFeatureId, String message) {
return checkReadPhoneStateOnAnyActiveSub(context, TELEPHONY_SUPPLIER, pid, uid,
- callingPackage, message);
+ callingPackage, callingFeatureId, message);
}
@VisibleForTesting
public static boolean checkReadPhoneStateOnAnyActiveSub(
Context context, Supplier<ITelephony> telephonySupplier, int pid, int uid,
- String callingPackage, String message) {
+ String callingPackage, @Nullable String callingFeatureId, String message) {
try {
context.enforcePermission(
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, pid, uid, message);
@@ -226,8 +232,8 @@
// We have READ_PHONE_STATE permission, so return true as long as the AppOps bit hasn't been
// revoked.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
- return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_STATE, uid, callingPackage) ==
- AppOpsManager.MODE_ALLOWED;
+ return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_STATE, uid, callingPackage,
+ callingFeatureId, null) == AppOpsManager.MODE_ALLOWED;
}
/**
@@ -248,9 +254,10 @@
* </ul>
*/
public static boolean checkCallingOrSelfReadDeviceIdentifiers(Context context,
- String callingPackage, String message) {
+ String callingPackage, @Nullable String callingFeatureId, String message) {
return checkCallingOrSelfReadDeviceIdentifiers(context,
- SubscriptionManager.INVALID_SUBSCRIPTION_ID, callingPackage, message);
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID, callingPackage, callingFeatureId,
+ message);
}
/**
@@ -271,9 +278,9 @@
* </ul>
*/
public static boolean checkCallingOrSelfReadDeviceIdentifiers(Context context, int subId,
- String callingPackage, String message) {
+ String callingPackage, @Nullable String callingFeatureId, String message) {
return checkPrivilegedReadPermissionOrCarrierPrivilegePermission(
- context, subId, callingPackage, message, true);
+ context, subId, callingPackage, callingFeatureId, message, true);
}
/**
@@ -293,9 +300,9 @@
* </ul>
*/
public static boolean checkCallingOrSelfReadSubscriberIdentifiers(Context context, int subId,
- String callingPackage, String message) {
+ String callingPackage, @Nullable String callingFeatureId, String message) {
return checkPrivilegedReadPermissionOrCarrierPrivilegePermission(
- context, subId, callingPackage, message, false);
+ context, subId, callingPackage, callingFeatureId, message, false);
}
/**
@@ -317,8 +324,8 @@
* </ul>
*/
private static boolean checkPrivilegedReadPermissionOrCarrierPrivilegePermission(
- Context context, int subId, String callingPackage, String message,
- boolean allowCarrierPrivilegeOnAnySub) {
+ Context context, int subId, String callingPackage, @Nullable String callingFeatureId,
+ String message, boolean allowCarrierPrivilegeOnAnySub) {
int uid = Binder.getCallingUid();
int pid = Binder.getCallingPid();
// Allow system and root access to the device identifiers.
@@ -351,7 +358,7 @@
Context.APP_OPS_SERVICE);
try {
if (appOpsManager.noteOpNoThrow(AppOpsManager.OPSTR_READ_DEVICE_IDENTIFIERS, uid,
- callingPackage) == AppOpsManager.MODE_ALLOWED) {
+ callingPackage, callingFeatureId, null) == AppOpsManager.MODE_ALLOWED) {
return true;
}
} finally {
@@ -444,15 +451,16 @@
* to it, {@code false} otherwise.
*/
public static boolean checkReadCallLog(
- Context context, int subId, int pid, int uid, String callingPackage) {
+ Context context, int subId, int pid, int uid, String callingPackage,
+ @Nullable String callingPackageName) {
return checkReadCallLog(
- context, TELEPHONY_SUPPLIER, subId, pid, uid, callingPackage);
+ context, TELEPHONY_SUPPLIER, subId, pid, uid, callingPackage, callingPackageName);
}
@VisibleForTesting
public static boolean checkReadCallLog(
Context context, Supplier<ITelephony> telephonySupplier, int subId, int pid, int uid,
- String callingPackage) {
+ String callingPackage, @Nullable String callingFeatureId) {
if (context.checkPermission(Manifest.permission.READ_CALL_LOG, pid, uid)
!= PERMISSION_GRANTED) {
@@ -468,8 +476,8 @@
// We have READ_CALL_LOG permission, so return true as long as the AppOps bit hasn't been
// revoked.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
- return appOps.noteOp(AppOpsManager.OPSTR_READ_CALL_LOG, uid, callingPackage) ==
- AppOpsManager.MODE_ALLOWED;
+ return appOps.noteOp(AppOpsManager.OPSTR_READ_CALL_LOG, uid, callingPackage,
+ callingFeatureId, null) == AppOpsManager.MODE_ALLOWED;
}
/**
@@ -479,20 +487,21 @@
* default SMS app and apps with READ_SMS or READ_PHONE_NUMBERS can also read phone numbers.
*/
public static boolean checkCallingOrSelfReadPhoneNumber(
- Context context, int subId, String callingPackage, String message) {
+ Context context, int subId, String callingPackage, @Nullable String callingFeatureId,
+ String message) {
return checkReadPhoneNumber(
context, TELEPHONY_SUPPLIER, subId, Binder.getCallingPid(), Binder.getCallingUid(),
- callingPackage, message);
+ callingPackage, callingFeatureId, message);
}
@VisibleForTesting
public static boolean checkReadPhoneNumber(
Context context, Supplier<ITelephony> telephonySupplier, int subId, int pid, int uid,
- String callingPackage, String message) {
+ String callingPackage, @Nullable String callingFeatureId, String message) {
// Default SMS app can always read it.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
- if (appOps.noteOp(AppOpsManager.OPSTR_WRITE_SMS, uid, callingPackage) ==
- AppOpsManager.MODE_ALLOWED) {
+ if (appOps.noteOp(AppOpsManager.OPSTR_WRITE_SMS, uid, callingPackage, callingFeatureId,
+ null) == AppOpsManager.MODE_ALLOWED) {
return true;
}
@@ -502,14 +511,15 @@
// First, check if we can read the phone state.
try {
return checkReadPhoneState(
- context, telephonySupplier, subId, pid, uid, callingPackage, message);
+ context, telephonySupplier, subId, pid, uid, callingPackage, callingFeatureId,
+ message);
} catch (SecurityException readPhoneStateSecurityException) {
}
// Can be read with READ_SMS too.
try {
context.enforcePermission(android.Manifest.permission.READ_SMS, pid, uid, message);
- return appOps.noteOp(AppOpsManager.OPSTR_READ_SMS, uid, callingPackage)
- == AppOpsManager.MODE_ALLOWED;
+ return appOps.noteOp(AppOpsManager.OPSTR_READ_SMS, uid, callingPackage,
+ callingFeatureId, null) == AppOpsManager.MODE_ALLOWED;
} catch (SecurityException readSmsSecurityException) {
}
@@ -517,8 +527,8 @@
try {
context.enforcePermission(android.Manifest.permission.READ_PHONE_NUMBERS, pid, uid,
message);
- return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_NUMBERS, uid, callingPackage)
- == AppOpsManager.MODE_ALLOWED;
+ return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_NUMBERS, uid, callingPackage,
+ callingFeatureId, null) == AppOpsManager.MODE_ALLOWED;
} catch (SecurityException readPhoneNumberSecurityException) {
}
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 0b5d446..aa4174a 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -27,7 +27,10 @@
":framework-core-sources-for-test-mock",
":framework_native_aidl",
],
- libs: ["framework-all"],
+ libs: [
+ "framework-all",
+ "app-compat-annotations",
+ ],
api_packages: [
"android.test.mock",
diff --git a/test-mock/src/android/test/mock/MockContentProvider.java b/test-mock/src/android/test/mock/MockContentProvider.java
index 9d3e120..85e5916 100644
--- a/test-mock/src/android/test/mock/MockContentProvider.java
+++ b/test-mock/src/android/test/mock/MockContentProvider.java
@@ -71,8 +71,8 @@
@Override
public int delete(String callingPackage, @Nullable String featureId, Uri url,
- String selection, String[] selectionArgs) throws RemoteException {
- return MockContentProvider.this.delete(url, selection, selectionArgs);
+ Bundle extras) throws RemoteException {
+ return MockContentProvider.this.delete(url, extras);
}
@Override
@@ -82,8 +82,8 @@
@Override
public Uri insert(String callingPackage, @Nullable String featureId, Uri url,
- ContentValues initialValues) throws RemoteException {
- return MockContentProvider.this.insert(url, initialValues);
+ ContentValues initialValues, Bundle extras) throws RemoteException {
+ return MockContentProvider.this.insert(url, initialValues, extras);
}
@Override
@@ -109,9 +109,8 @@
@Override
public int update(String callingPackage, @Nullable String featureId, Uri url,
- ContentValues values, String selection, String[] selectionArgs)
- throws RemoteException {
- return MockContentProvider.this.update(url, values, selection, selectionArgs);
+ ContentValues values, Bundle extras) throws RemoteException {
+ return MockContentProvider.this.update(url, values, extras);
}
@Override
diff --git a/test-mock/src/android/test/mock/MockContentResolver.java b/test-mock/src/android/test/mock/MockContentResolver.java
index a70152c..8283019 100644
--- a/test-mock/src/android/test/mock/MockContentResolver.java
+++ b/test-mock/src/android/test/mock/MockContentResolver.java
@@ -16,6 +16,8 @@
package android.test.mock;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.ContentProvider;
import android.content.ContentResolver;
import android.content.Context;
@@ -130,17 +132,47 @@
}
/**
- * Overrides {@link android.content.ContentResolver#notifyChange(Uri, ContentObserver, boolean)
- * ContentResolver.notifChange(Uri, ContentObserver, boolean)}. All parameters are ignored.
- * The method hides providers linked to MockContentResolver from other observers in the system.
- *
- * @param uri (Ignored) The uri of the content provider.
- * @param observer (Ignored) The observer that originated the change.
- * @param syncToNetwork (Ignored) If true, attempt to sync the change to the network.
+ * Overrides the behavior from the parent class to completely ignore any
+ * content notifications sent to this object. This effectively hides clients
+ * from observers elsewhere in the system.
*/
@Override
- public void notifyChange(Uri uri,
- ContentObserver observer,
+ public void notifyChange(@NonNull Uri uri, @Nullable ContentObserver observer) {
+ }
+
+ /**
+ * Overrides the behavior from the parent class to completely ignore any
+ * content notifications sent to this object. This effectively hides clients
+ * from observers elsewhere in the system.
+ *
+ * @deprecated callers should consider migrating to
+ * {@link #notifyChange(Uri, ContentObserver, int)}, as it
+ * offers support for many more options than just
+ * {@link #NOTIFY_SYNC_TO_NETWORK}.
+ */
+ @Override
+ @Deprecated
+ public void notifyChange(@NonNull Uri uri, @Nullable ContentObserver observer,
boolean syncToNetwork) {
}
+
+ /**
+ * Overrides the behavior from the parent class to completely ignore any
+ * content notifications sent to this object. This effectively hides clients
+ * from observers elsewhere in the system.
+ */
+ @Override
+ public void notifyChange(@NonNull Uri uri, @Nullable ContentObserver observer,
+ @NotifyFlags int flags) {
+ }
+
+ /**
+ * Overrides the behavior from the parent class to completely ignore any
+ * content notifications sent to this object. This effectively hides clients
+ * from observers elsewhere in the system.
+ */
+ @Override
+ public void notifyChange(@NonNull Iterable<Uri> uris, @Nullable ContentObserver observer,
+ @NotifyFlags int flags) {
+ }
}
diff --git a/test-mock/src/android/test/mock/MockIContentProvider.java b/test-mock/src/android/test/mock/MockIContentProvider.java
index e512b52..464abfb 100644
--- a/test-mock/src/android/test/mock/MockIContentProvider.java
+++ b/test-mock/src/android/test/mock/MockIContentProvider.java
@@ -51,7 +51,7 @@
@Override
@SuppressWarnings("unused")
public int delete(String callingPackage, @Nullable String featureId, Uri url,
- String selection, String[] selectionArgs) throws RemoteException {
+ Bundle extras) throws RemoteException {
throw new UnsupportedOperationException("unimplemented mock method");
}
@@ -63,7 +63,7 @@
@Override
@SuppressWarnings("unused")
public Uri insert(String callingPackage, @Nullable String featureId, Uri url,
- ContentValues initialValues) throws RemoteException {
+ ContentValues initialValues, Bundle extras) throws RemoteException {
throw new UnsupportedOperationException("unimplemented mock method");
}
@@ -99,7 +99,7 @@
@Override
public int update(String callingPackage, @Nullable String featureId, Uri url,
- ContentValues values, String selection, String[] selectionArgs) throws RemoteException {
+ ContentValues values, Bundle extras) throws RemoteException {
throw new UnsupportedOperationException("unimplemented mock method");
}
diff --git a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java
index db2f659..883c172 100644
--- a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java
+++ b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java
@@ -27,8 +27,8 @@
import android.util.EventLog;
import android.util.EventLog.Event;
-import androidx.test.InstrumentationRegistry;
import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
import dalvik.system.DexClassLoader;
@@ -91,7 +91,7 @@
@BeforeClass
public static void setUpAll() {
- sContext = InstrumentationRegistry.getTargetContext();
+ sContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
sMyUid = android.os.Process.myUid();
}
@@ -331,7 +331,7 @@
// Abstract out the logic for running a native code loading test multiple times if needed and
// leaving time for audit messages to reach the log.
- private abstract class TestNativeCodeWithRetries {
+ private abstract static class TestNativeCodeWithRetries {
String mExpectedContentHash;
String mExpectedNameHash;
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java
index fd31aa5..e033d0a 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java
@@ -78,6 +78,7 @@
return TransitionRunner.newBuilder()
.withTag("OpenAppWarm_" + testApp.getLauncherName()
+ rotationToString(beginRotation))
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBeforeAll(() -> setRotation(device, beginRotation))
.runBeforeAll(testApp::open)
@@ -94,6 +95,7 @@
device) {
return TransitionRunner.newBuilder()
.withTag("closeAppWithBackKey_" + testApp.getLauncherName())
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(testApp::open)
.runBefore(device::waitForIdle)
@@ -108,6 +110,7 @@
device) {
return TransitionRunner.newBuilder()
.withTag("closeAppWithHomeKey_" + testApp.getLauncherName())
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(testApp::open)
.runBefore(device::waitForIdle)
@@ -123,6 +126,7 @@
return TransitionRunner.newBuilder()
.withTag("OpenAppCold_" + testApp.getLauncherName()
+ rotationToString(beginRotation))
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(device::pressHome)
.runBeforeAll(() -> setRotation(device, beginRotation))
@@ -140,6 +144,7 @@
.withTag("changeAppRotation_" + testApp.getLauncherName()
+ rotationToString(beginRotation) + "_" +
rotationToString(endRotation))
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBeforeAll(testApp::open)
.runBefore(() -> setRotation(device, beginRotation))
@@ -156,6 +161,7 @@
rotationToString(beginRotation) + "_" + rotationToString(endRotation);
return TransitionRunner.newBuilder()
.withTag(testTag)
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBeforeAll(() -> {
context.startActivity(intent);
@@ -173,6 +179,7 @@
static TransitionBuilder appToSplitScreen(IAppHelper testApp, UiDevice device) {
return TransitionRunner.newBuilder()
.withTag("appToSplitScreen_" + testApp.getLauncherName())
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(testApp::open)
.runBefore(device::waitForIdle)
@@ -186,6 +193,7 @@
static TransitionBuilder splitScreenToLauncher(IAppHelper testApp, UiDevice device) {
return TransitionRunner.newBuilder()
.withTag("splitScreenToLauncher_" + testApp.getLauncherName())
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(testApp::open)
.runBefore(device::waitForIdle)
@@ -200,6 +208,7 @@
return TransitionRunner.newBuilder()
.withTag("editTextSetFocus_" + testApp.getLauncherName()
+ rotationToString(beginRotation))
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(device::pressHome)
.runBefore(() -> setRotation(device, beginRotation))
@@ -218,6 +227,7 @@
+ rotationToString(beginRotation);
return TransitionRunner.newBuilder()
.withTag(testTag)
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBeforeAll(() -> setRotation(device, beginRotation))
.runBeforeAll(() -> clearRecents(device))
@@ -246,6 +256,7 @@
return TransitionRunner.newBuilder()
.withTag("editTextLoseFocusToHome_" + testApp.getLauncherName()
+ rotationToString(beginRotation))
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(device::pressHome)
.runBefore(() -> setRotation(device, beginRotation))
@@ -262,6 +273,7 @@
return TransitionRunner.newBuilder()
.withTag("editTextLoseFocusToApp_" + testApp.getLauncherName()
+ rotationToString(beginRotation))
+ .recordAllRuns()
.runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
.runBefore(device::pressHome)
.runBefore(() -> setRotation(device, beginRotation))
diff --git a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
index cd04c2e..3d72ee6 100644
--- a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
+++ b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
@@ -18,13 +18,13 @@
import android.app.Notification;
import android.app.NotificationManager;
-import android.view.View;
-import android.content.Intent;
import android.app.PendingIntent;
import android.app.StatusBarManager;
+import android.content.Intent;
import android.os.Handler;
-import android.util.Log;
import android.os.SystemClock;
+import android.util.Log;
+import android.view.View;
import android.view.Window;
import android.view.WindowManager;
diff --git a/tests/WindowManagerStressTest/AndroidManifest.xml b/tests/WindowManagerStressTest/AndroidManifest.xml
deleted file mode 100644
index 17e0f15..0000000
--- a/tests/WindowManagerStressTest/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="test.windowmanagerstresstest">
-
- <application
- android:allowBackup="false"
- android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name"
- android:supportsRtl="true"
- android:theme="@style/AppTheme">
- <activity android:name=".MainActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/tests/WindowManagerStressTest/res/layout/activity_main.xml b/tests/WindowManagerStressTest/res/layout/activity_main.xml
deleted file mode 100644
index 6cf8269..0000000
--- a/tests/WindowManagerStressTest/res/layout/activity_main.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- tools:context="test.amslam.MainActivity">
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/run"
- android:text="@string/run" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/output" />
-
-</LinearLayout>
diff --git a/tests/WindowManagerStressTest/res/mipmap-hdpi/ic_launcher.png b/tests/WindowManagerStressTest/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
--- a/tests/WindowManagerStressTest/res/mipmap-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/tests/WindowManagerStressTest/res/mipmap-mdpi/ic_launcher.png b/tests/WindowManagerStressTest/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
--- a/tests/WindowManagerStressTest/res/mipmap-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/tests/WindowManagerStressTest/res/mipmap-xhdpi/ic_launcher.png b/tests/WindowManagerStressTest/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
--- a/tests/WindowManagerStressTest/res/mipmap-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/tests/WindowManagerStressTest/res/mipmap-xxhdpi/ic_launcher.png b/tests/WindowManagerStressTest/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
--- a/tests/WindowManagerStressTest/res/mipmap-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/tests/WindowManagerStressTest/res/mipmap-xxxhdpi/ic_launcher.png b/tests/WindowManagerStressTest/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
--- a/tests/WindowManagerStressTest/res/mipmap-xxxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/tests/WindowManagerStressTest/res/values/colors.xml b/tests/WindowManagerStressTest/res/values/colors.xml
deleted file mode 100644
index 4270ca6..0000000
--- a/tests/WindowManagerStressTest/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <color name="colorPrimary">#3F51B5</color>
- <color name="colorPrimaryDark">#303F9F</color>
- <color name="colorAccent">#FF4081</color>
-</resources>
diff --git a/tests/WindowManagerStressTest/res/values/dimens.xml b/tests/WindowManagerStressTest/res/values/dimens.xml
deleted file mode 100644
index ed4ccbc..0000000
--- a/tests/WindowManagerStressTest/res/values/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/tests/WindowManagerStressTest/res/values/strings.xml b/tests/WindowManagerStressTest/res/values/strings.xml
deleted file mode 100644
index cef05dc..0000000
--- a/tests/WindowManagerStressTest/res/values/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-<resources>
- <string name="app_name">WmSlam</string>
- <string name="run">Run</string>
-</resources>
diff --git a/tests/WindowManagerStressTest/res/values/styles.xml b/tests/WindowManagerStressTest/res/values/styles.xml
deleted file mode 100644
index 0983b25..0000000
--- a/tests/WindowManagerStressTest/res/values/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <!-- Base application theme. -->
- <style name="AppTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
- <!-- Customize your theme here. -->
- <item name="android:colorPrimary">@color/colorPrimary</item>
- <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
- <item name="android:colorAccent">@color/colorAccent</item>
- </style>
-</resources>
diff --git a/tests/WindowManagerStressTest/src/test/windowmanagerstresstest/MainActivity.java b/tests/WindowManagerStressTest/src/test/windowmanagerstresstest/MainActivity.java
deleted file mode 100644
index 8564698..0000000
--- a/tests/WindowManagerStressTest/src/test/windowmanagerstresstest/MainActivity.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package test.windowmanagerstresstest;
-
-import android.app.Activity;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.util.Log;
-import android.util.MergedConfiguration;
-import android.view.Display;
-import android.view.DisplayCutout;
-import android.view.IWindowSession;
-import android.view.InsetsState;
-import android.view.Surface;
-import android.view.SurfaceControl;
-import android.view.View;
-import android.view.WindowManager;
-import android.view.WindowManager.LayoutParams;
-import android.view.WindowManagerGlobal;
-import android.widget.TextView;
-
-import com.android.internal.view.BaseIWindow;
-
-import java.util.ArrayList;
-
-public class MainActivity extends Activity {
-
- private static final String TAG = "WmSlam";
-
- private TextView mOutput;
- private volatile boolean finished;
- private final ArrayList<BaseIWindow> mWindows = new ArrayList<>();
- private final LayoutParams mLayoutParams = new LayoutParams();
- private final Rect mTmpRect = new Rect();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- mOutput = (TextView) findViewById(R.id.output);
-
- findViewById(R.id.run).setOnClickListener(view -> {
- view.setEnabled(false);
- mOutput.setText("");
- startBatch();
- });
- mLayoutParams.token = getActivityToken();
- }
-
- void startBatch() {
- new Thread(() -> {
- finished = false;
- addWindows();
- startCpuRunnables();
- for (int i = 0; i < 5; i++) {
- final long time = SystemClock.uptimeMillis();
- slamWm();
- log("Total: " + (SystemClock.uptimeMillis() - time) + " ms");
- }
- removeWindows();
- finished = true;
- }).start();
- }
-
- void startCpuRunnables() {
- for (int i = 0; i < 10; i++) {
- new Thread(mUseCpuRunnable).start();
- }
- }
-
- private final Runnable mUseCpuRunnable = new Runnable() {
- @Override
- public void run() {
- while (!finished) {
- }
- }
- };
-
- private void log(String text) {
- mOutput.post(() -> mOutput.append(text + "\n"));
- Log.d(TAG, text);
- }
-
- private void slamWm() {
- ArrayList<Thread> threads = new ArrayList<>();
- for (int i = 0; i < 20; i++) {
- for (BaseIWindow window : mWindows) {
- Thread t = new Thread(() -> {
- try {
- WindowManagerGlobal.getWindowSession().relayout(window,
- window.mSeq, mLayoutParams, -1, -1, View.VISIBLE, 0, -1, mTmpRect,
- mTmpRect, mTmpRect, mTmpRect, mTmpRect, mTmpRect, mTmpRect,
- new DisplayCutout.ParcelableWrapper(), new MergedConfiguration(),
- new SurfaceControl(), new InsetsState());
- } catch (RemoteException e) {
- e.printStackTrace();
- }
- });
- threads.add(t);
- t.start();
- }
- }
- for (Thread t : threads) {
- try {
- t.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- void addWindows() {
- for (int i = 0; i < 50; i++) {
- final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
- layoutParams.token = getActivityToken();
- final BaseIWindow window = new BaseIWindow();
- final IWindowSession session = WindowManagerGlobal.getWindowSession();
- final Rect tmpRect = new Rect();
- try {
- final int res = session.addToDisplayWithoutInputChannel(window, window.mSeq,
- layoutParams, View.VISIBLE, Display.DEFAULT_DISPLAY, tmpRect, tmpRect,
- new InsetsState());
- } catch (RemoteException e) {
- e.printStackTrace();
- }
- mWindows.add(window);
- }
- }
-
- void removeWindows() {
- for (BaseIWindow window : mWindows) {
- try {
- WindowManagerGlobal.getWindowSession().remove(window);
- } catch (RemoteException e) {
- e.printStackTrace();
- }
- }
- }
-}
diff --git a/tests/net/integration/AndroidManifest.xml b/tests/net/integration/AndroidManifest.xml
index 91b3cd9..4dd3b5a 100644
--- a/tests/net/integration/AndroidManifest.xml
+++ b/tests/net/integration/AndroidManifest.xml
@@ -17,7 +17,6 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="com.android.server.net.integrationtests">
<!-- For ConnectivityService registerReceiverAsUser (receiving broadcasts) -->
@@ -26,13 +25,19 @@
<uses-permission android:name="android.permission.MANAGE_USERS" />
<!-- ConnectivityService sends notifications to BatteryStats -->
<uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
+ <!-- Reading network status -->
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
+ <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+ <!-- Reading DeviceConfig flags -->
+ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
<application android:debuggable="true">
<uses-library android:name="android.test.runner" />
<!-- This manifest is merged with the base manifest of the real NetworkStack app.
Remove the NetworkStackService from the base (real) manifest, and replace with a test
service that responds to the same intent -->
- <service android:name="com.android.server.NetworkStackService" tools:node="remove"/>
<service android:name=".TestNetworkStackService"
android:process="com.android.server.net.integrationtests.testnetworkstack">
<intent-filter>
@@ -45,9 +50,9 @@
<action android:name=".INetworkStackInstrumentation"/>
</intent-filter>
</service>
- <service tools:replace="android:process"
- android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"
- android:process="com.android.server.net.integrationtests.testnetworkstack"/>
+ <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"
+ android:process="com.android.server.net.integrationtests.testnetworkstack"
+ android:permission="android.permission.BIND_JOB_SERVICE"/>
</application>
diff --git a/tests/net/java/android/net/netlink/InetDiagSocketTest.java b/tests/net/java/android/net/netlink/InetDiagSocketTest.java
index 1f2bb0a..84c5784 100644
--- a/tests/net/java/android/net/netlink/InetDiagSocketTest.java
+++ b/tests/net/java/android/net/netlink/InetDiagSocketTest.java
@@ -46,7 +46,6 @@
import libcore.util.HexEncoding;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -202,14 +201,29 @@
checkGetConnectionOwnerUid("::1", "::1");
}
- @Ignore("Times out on Marlin/Sailfish")
/* Verify fix for b/141603906 */
@Test
public void testB141603906() throws Exception {
final InetSocketAddress src = new InetSocketAddress(0);
final InetSocketAddress dst = new InetSocketAddress(0);
- for (int i = 1; i <= 100000; i++) {
- mCm.getConnectionOwnerUid(IPPROTO_TCP, src, dst);
+ final int numThreads = 8;
+ final int numSockets = 5000;
+ final Thread[] threads = new Thread[numThreads];
+
+ for (int i = 0; i < numThreads; i++) {
+ threads[i] = new Thread(() -> {
+ for (int j = 0; j < numSockets; j++) {
+ mCm.getConnectionOwnerUid(IPPROTO_TCP, src, dst);
+ }
+ });
+ }
+
+ for (Thread thread : threads) {
+ thread.start();
+ }
+
+ for (Thread thread : threads) {
+ thread.join();
}
}
diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 1be4ea8..6f44230 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -210,6 +210,7 @@
tools: [":soong_zip"],
srcs: [
"Configuration.proto",
+ "ResourcesInternal.proto",
"Resources.proto",
],
out: ["aapt2-protos.zip"],
diff --git a/tools/aapt2/java/ProguardRules.cpp b/tools/aapt2/java/ProguardRules.cpp
index 05ba8f0..806f4e3 100644
--- a/tools/aapt2/java/ProguardRules.cpp
+++ b/tools/aapt2/java/ProguardRules.cpp
@@ -404,12 +404,15 @@
for (const auto& entry : keep_set.conditional_class_set_) {
std::set<UsageLocation> locations;
- bool can_be_conditional = true;
- for (const UsageLocation& location : entry.second) {
- can_be_conditional &= CollectLocations(location, keep_set, &locations);
+ bool can_be_conditional = false;
+ if (keep_set.conditional_keep_rules_) {
+ can_be_conditional = true;
+ for (const UsageLocation& location : entry.second) {
+ can_be_conditional &= CollectLocations(location, keep_set, &locations);
+ }
}
- if (keep_set.conditional_keep_rules_ && can_be_conditional) {
+ if (can_be_conditional) {
for (const UsageLocation& location : locations) {
printer.Print("# Referenced at ").Println(location.source.to_string());
printer.Print("-if class **.R$layout { int ")
diff --git a/tools/hiddenapi/generate_hiddenapi_lists.py b/tools/hiddenapi/generate_hiddenapi_lists.py
index e883c6b..46105f4 100755
--- a/tools/hiddenapi/generate_hiddenapi_lists.py
+++ b/tools/hiddenapi/generate_hiddenapi_lists.py
@@ -241,8 +241,6 @@
flags = csv[1:]
if (FLAG_PUBLIC_API in flags) or (FLAG_SYSTEM_API in flags):
flags.append(FLAG_WHITELIST)
- elif FLAG_TEST_API in flags:
- flags.append(FLAG_GREYLIST)
self._dict[csv[0]].update(flags)
def assign_flag(self, flag, apis, source="<unknown>"):
diff --git a/tools/hiddenapi/generate_hiddenapi_lists_test.py b/tools/hiddenapi/generate_hiddenapi_lists_test.py
index 4dc880b..55c3a7d 100755
--- a/tools/hiddenapi/generate_hiddenapi_lists_test.py
+++ b/tools/hiddenapi/generate_hiddenapi_lists_test.py
@@ -53,14 +53,22 @@
# Test new additions.
flags.parse_and_merge_csv([
'A,' + FLAG_GREYLIST,
- 'B,' + FLAG_BLACKLIST + ',' + FLAG_GREYLIST_MAX_O ])
- self.assertEqual(flags.generate_csv(),
- [ 'A,' + FLAG_GREYLIST,
- 'B,' + FLAG_BLACKLIST + "," + FLAG_GREYLIST_MAX_O ])
+ 'B,' + FLAG_BLACKLIST + ',' + FLAG_GREYLIST_MAX_O,
+ 'C,' + FLAG_SYSTEM_API + ',' + FLAG_WHITELIST,
+ 'D,' + FLAG_GREYLIST+ ',' + FLAG_TEST_API,
+ 'E,' + FLAG_BLACKLIST+ ',' + FLAG_TEST_API,
+ ])
+ self.assertEqual(flags.generate_csv(), [
+ 'A,' + FLAG_GREYLIST,
+ 'B,' + FLAG_BLACKLIST + "," + FLAG_GREYLIST_MAX_O,
+ 'C,' + FLAG_SYSTEM_API + ',' + FLAG_WHITELIST,
+ 'D,' + FLAG_GREYLIST+ ',' + FLAG_TEST_API,
+ 'E,' + FLAG_BLACKLIST+ ',' + FLAG_TEST_API,
+ ])
# Test unknown flag.
with self.assertRaises(AssertionError):
- flags.parse_and_merge_csv([ 'C,foo' ])
+ flags.parse_and_merge_csv([ 'Z,foo' ])
def test_assign_flag(self):
flags = FlagsDict()
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 30c24d3..90343d4 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -2627,7 +2627,6 @@
out.writeInt(apBand);
out.writeInt(apChannel);
BackupUtils.writeString(out, preSharedKey);
- BackupUtils.writeString(out, saePasswordId);
out.writeInt(getAuthType());
out.writeBoolean(hiddenSSID);
return baos.toByteArray();
@@ -2651,7 +2650,6 @@
config.apBand = in.readInt();
config.apChannel = in.readInt();
config.preSharedKey = BackupUtils.readString(in);
- config.saePasswordId = BackupUtils.readString(in);
config.allowedKeyManagement.set(in.readInt());
if (version >= 3) {
config.hiddenSSID = in.readBoolean();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 93960de..a61a5af 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2257,6 +2257,8 @@
public static final long WIFI_FEATURE_MBO = 0x800000000L; // MBO Support
/** @hide */
public static final long WIFI_FEATURE_OCE = 0x1000000000L; // OCE Support
+ /** @hide */
+ public static final long WIFI_FEATURE_INFRA_6G = 0x2000000000L; // Support 6 GHz band
private long getSupportedFeatures() {
try {
@@ -2271,6 +2273,7 @@
private boolean isFeatureSupported(long feature) {
return (getSupportedFeatures() & feature) == feature;
}
+
/**
* @return true if this adapter supports 5 GHz band
*/
@@ -2279,6 +2282,14 @@
}
/**
+ * @return true if the device supports operating in the 6 GHz band and Wi-Fi is enabled,
+ * false otherwise.
+ */
+ public boolean is6GHzBandSupported() {
+ return isFeatureSupported(WIFI_FEATURE_INFRA_6G);
+ }
+
+ /**
* @return true if this adapter supports Passpoint
* @hide
*/
@@ -3351,7 +3362,7 @@
/**
* Base class for soft AP callback. Should be extended by applications and set when calling
- * {@link WifiManager#registerSoftApCallback(SoftApCallback, Handler)}.
+ * {@link WifiManager#registerSoftApCallback(Executor, SoftApCallback)}.
*
* @hide
*/
@@ -3452,16 +3463,16 @@
* without the permission will trigger a {@link java.lang.SecurityException}.
* <p>
*
- * @param callback Callback for soft AP events
* @param executor The executor to execute the callbacks of the {@code executor}
* object. If null, then the application's main executor will be used.
+ * @param callback Callback for soft AP events
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
- public void registerSoftApCallback(@NonNull SoftApCallback callback,
- @Nullable @CallbackExecutor Executor executor) {
+ public void registerSoftApCallback(@Nullable @CallbackExecutor Executor executor,
+ @NonNull SoftApCallback callback) {
if (callback == null) throw new IllegalArgumentException("callback cannot be null");
Log.v(TAG, "registerSoftApCallback: callback=" + callback + ", executor=" + executor);
diff --git a/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java b/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java
index fd26817b..60fe604 100644
--- a/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java
+++ b/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java
@@ -120,10 +120,12 @@
new Creator<WifiAwareNetworkInfo>() {
@Override
public WifiAwareNetworkInfo createFromParcel(Parcel in) {
+ byte[] addr = in.createByteArray();
+ String interfaceName = in.readString();
+ int port = in.readInt();
+ int transportProtocol = in.readInt();
Inet6Address ipv6Addr;
try {
- byte[] addr = in.createByteArray();
- String interfaceName = in.readString();
NetworkInterface ni = null;
if (interfaceName != null) {
try {
@@ -135,11 +137,8 @@
ipv6Addr = Inet6Address.getByAddress(null, addr, ni);
} catch (UnknownHostException e) {
e.printStackTrace();
- return null;
+ return new WifiAwareNetworkInfo(null);
}
- int port = in.readInt();
- int transportProtocol = in.readInt();
-
return new WifiAwareNetworkInfo(ipv6Addr, port, transportProtocol);
}
diff --git a/wifi/java/android/net/wifi/aware/WifiAwareNetworkSpecifier.java b/wifi/java/android/net/wifi/aware/WifiAwareNetworkSpecifier.java
index 0511f24..5a4ed3c 100644
--- a/wifi/java/android/net/wifi/aware/WifiAwareNetworkSpecifier.java
+++ b/wifi/java/android/net/wifi/aware/WifiAwareNetworkSpecifier.java
@@ -20,7 +20,6 @@
import android.annotation.IntRange;
import android.annotation.NonNull;
-import android.annotation.SystemApi;
import android.net.NetworkSpecifier;
import android.os.Parcel;
import android.os.Parcelable;
@@ -337,7 +336,8 @@
* Configure the PSK Passphrase for the Wi-Fi Aware connection being requested. This method
* is optional - if not called, then an Open (unencrypted) connection will be created.
*
- * @param pskPassphrase The (optional) passphrase to be used to encrypt the link.
+ * @param pskPassphrase The (optional) passphrase to be used to encrypt the link. Use the
+ * {@link #setPmk(byte[])} to specify a PMK.
* @return the current {@link Builder} builder, enabling chaining of builder
* methods.
*/
@@ -358,9 +358,7 @@
* specify a Passphrase.
* @return the current {@link Builder} builder, enabling chaining of builder
* methods.
- * @hide
*/
- @SystemApi
public @NonNull Builder setPmk(@NonNull byte[] pmk) {
if (!WifiAwareUtils.validatePmk(pmk)) {
throw new IllegalArgumentException("PMK must 32 bytes");
@@ -377,7 +375,7 @@
* <ul>
* <li>The server device must be the Publisher device!
* <li>The port information can only be specified on secure links, specified using
- * {@link #setPskPassphrase(String)}.
+ * {@link #setPskPassphrase(String)} or {@link #setPmk(byte[])}.
* </ul>
*
* @param port A positive integer indicating the port to be used for communication.
@@ -400,7 +398,7 @@
* <ul>
* <li>The server device must be the Publisher device!
* <li>The transport protocol information can only be specified on secure links,
- * specified using {@link #setPskPassphrase(String)}.
+ * specified using {@link #setPskPassphrase(String)} or {@link #setPmk(byte[])}.
* </ul>
* The transport protocol number is assigned by the Internet Assigned Numbers Authority
* (IANA) https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml.
@@ -426,7 +424,7 @@
* {@link android.net.NetworkCapabilities#TRANSPORT_WIFI_AWARE}.
* <p> The default builder constructor will initialize a NetworkSpecifier which requests an
* open (non-encrypted) link. To request an encrypted link use the
- * {@link #setPskPassphrase(String)} builder method.
+ * {@link #setPskPassphrase(String)} or {@link #setPmk(byte[])} builder methods.
*
* @return A {@link NetworkSpecifier} to be used to construct
* {@link android.net.NetworkRequest.Builder#setNetworkSpecifier(NetworkSpecifier)} to pass
diff --git a/wifi/java/com/android/server/wifi/BaseWifiService.java b/wifi/java/com/android/server/wifi/BaseWifiService.java
index 6a6e7a1..cf74ff0 100644
--- a/wifi/java/com/android/server/wifi/BaseWifiService.java
+++ b/wifi/java/com/android/server/wifi/BaseWifiService.java
@@ -289,18 +289,6 @@
throw new UnsupportedOperationException();
}
- /** @deprecated replaced by {@link #startLocalOnlyHotspot(ILocalOnlyHotspotCallback, String)} */
- @Deprecated
- public int startLocalOnlyHotspot(Messenger messenger, IBinder binder, String packageName) {
- throw new UnsupportedOperationException();
- }
-
- /** @deprecated replaced by newer signature */
- @Deprecated
- public int startLocalOnlyHotspot(ILocalOnlyHotspotCallback callback, String packageName) {
- return startLocalOnlyHotspot(callback, packageName, null, null);
- }
-
@Override
public int startLocalOnlyHotspot(ILocalOnlyHotspotCallback callback, String packageName,
String featureId, SoftApConfiguration customConfig) {
@@ -312,12 +300,6 @@
throw new UnsupportedOperationException();
}
- /** @deprecated replaced by {@link #startWatchLocalOnlyHotspot(ILocalOnlyHotspotCallback)} */
- @Deprecated
- public void startWatchLocalOnlyHotspot(Messenger messenger, IBinder binder) {
- throw new UnsupportedOperationException();
- }
-
@Override
public void startWatchLocalOnlyHotspot(ILocalOnlyHotspotCallback callback) {
throw new UnsupportedOperationException();
diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java
index 17f3bb2..6305277 100644
--- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java
+++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java
@@ -702,7 +702,7 @@
@Test
public void registerSoftApCallbackThrowsIllegalArgumentExceptionOnNullArgumentForCallback() {
try {
- mWifiManager.registerSoftApCallback(null, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), null);
fail("expected IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
@@ -726,7 +726,7 @@
@Test
public void registerSoftApCallbackUsesMainLooperOnNullArgumentForHandler() {
when(mContext.getMainLooper()).thenReturn(mLooper.getLooper());
- mWifiManager.registerSoftApCallback(mSoftApCallback, null);
+ mWifiManager.registerSoftApCallback(null, mSoftApCallback);
verify(mContext).getMainExecutor();
}
@@ -735,7 +735,7 @@
*/
@Test
public void registerSoftApCallbackCallGoesToWifiServiceImpl() throws Exception {
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback);
verify(mWifiService).registerSoftApCallback(any(IBinder.class),
any(ISoftApCallback.Stub.class), anyInt());
}
@@ -746,7 +746,7 @@
@Test
public void unregisterSoftApCallbackCallGoesToWifiServiceImpl() throws Exception {
ArgumentCaptor<Integer> callbackIdentifier = ArgumentCaptor.forClass(Integer.class);
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback);
verify(mWifiService).registerSoftApCallback(any(IBinder.class),
any(ISoftApCallback.Stub.class), callbackIdentifier.capture());
@@ -761,7 +761,7 @@
public void softApCallbackProxyCallsOnStateChanged() throws Exception {
ArgumentCaptor<ISoftApCallback.Stub> callbackCaptor =
ArgumentCaptor.forClass(ISoftApCallback.Stub.class);
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback);
verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(),
anyInt());
@@ -777,7 +777,7 @@
public void softApCallbackProxyCallsOnConnectedClientsChanged() throws Exception {
ArgumentCaptor<ISoftApCallback.Stub> callbackCaptor =
ArgumentCaptor.forClass(ISoftApCallback.Stub.class);
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback);
verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(),
anyInt());
@@ -798,7 +798,7 @@
testSoftApInfo.setBandwidth(TEST_AP_BANDWIDTH);
ArgumentCaptor<ISoftApCallback.Stub> callbackCaptor =
ArgumentCaptor.forClass(ISoftApCallback.Stub.class);
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback);
verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(),
anyInt());
@@ -817,7 +817,7 @@
testSoftApInfo.setBandwidth(TEST_AP_BANDWIDTH);
ArgumentCaptor<ISoftApCallback.Stub> callbackCaptor =
ArgumentCaptor.forClass(ISoftApCallback.Stub.class);
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback);
verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(),
anyInt());
@@ -843,7 +843,7 @@
ArgumentCaptor.forClass(ISoftApCallback.Stub.class);
TestLooper altLooper = new TestLooper();
Handler altHandler = new Handler(altLooper.getLooper());
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(altHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(altHandler), mSoftApCallback);
verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(),
anyInt());
@@ -857,7 +857,7 @@
*/
@Test
public void testCorrectLooperIsUsedForSoftApCallbackHandler() throws Exception {
- mWifiManager.registerSoftApCallback(mSoftApCallback, new HandlerExecutor(mHandler));
+ mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback);
mLooper.dispatchAll();
verify(mWifiService).registerSoftApCallback(any(IBinder.class),
any(ISoftApCallback.Stub.class), anyInt());
@@ -1586,6 +1586,7 @@
assertTrue(mWifiManager.isP2pSupported());
assertFalse(mWifiManager.isPortableHotspotSupported());
assertFalse(mWifiManager.is5GHzBandSupported());
+ assertFalse(mWifiManager.is6GHzBandSupported());
assertFalse(mWifiManager.isDeviceToDeviceRttSupported());
assertFalse(mWifiManager.isDeviceToApRttSupported());
assertFalse(mWifiManager.isPreferredNetworkOffloadSupported());
