diff options
735 files changed, 13882 insertions, 46124 deletions
diff --git a/apct-tests/perftests/multiuser/AndroidManifest.xml b/apct-tests/perftests/multiuser/AndroidManifest.xml index b2a9524d29c4..893c8ca9328b 100644 --- a/apct-tests/perftests/multiuser/AndroidManifest.xml +++ b/apct-tests/perftests/multiuser/AndroidManifest.xml @@ -22,6 +22,7 @@ <uses-permission android:name="android.permission.INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> + <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <application> <uses-library android:name="android.test.runner" /> diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java index 32107b4e789e..e74e4a958eb9 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java @@ -38,8 +38,10 @@ import android.os.Bundle; import android.os.IBinder; import android.os.IProgressListener; import android.os.RemoteException; +import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; +import android.perftests.utils.ShellHelper; import android.util.Log; import android.view.WindowManagerGlobal; @@ -85,6 +87,14 @@ public class UserLifecycleTests { private static final String DUMMY_PACKAGE_NAME = "perftests.multiuser.apps.dummyapp"; + // Copy of UserSystemPackageInstaller whitelist mode constants. + private static final String PACKAGE_WHITELIST_MODE_PROP = + "persist.debug.user.package_whitelist_mode"; + private static final int USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE = 0; + private static final int USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE = 0b001; + private static final int USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST = 0b100; + private static final int USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT = -1; + private UserManager mUm; private ActivityManager mAm; private IActivityManager mIam; @@ -442,6 +452,55 @@ public class UserLifecycleTests { } } + // TODO: This is just a POC. Do this properly and add more. + /** Tests starting (unlocking) a newly-created profile using the user-type-pkg-whitelist. */ + @Test + public void managedProfileUnlock_usingWhitelist() throws Exception { + assumeTrue(mHasManagedUserFeature); + final int origMode = getUserTypePackageWhitelistMode(); + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE + | USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST); + + try { + while (mRunner.keepRunning()) { + mRunner.pauseTiming(); + final int userId = createManagedProfile(); + mRunner.resumeTiming(); + + startUserInBackground(userId); + + mRunner.pauseTiming(); + removeUser(userId); + mRunner.resumeTiming(); + } + } finally { + setUserTypePackageWhitelistMode(origMode); + } + } + /** Tests starting (unlocking) a newly-created profile NOT using the user-type-pkg-whitelist. */ + @Test + public void managedProfileUnlock_notUsingWhitelist() throws Exception { + assumeTrue(mHasManagedUserFeature); + final int origMode = getUserTypePackageWhitelistMode(); + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE); + + try { + while (mRunner.keepRunning()) { + mRunner.pauseTiming(); + final int userId = createManagedProfile(); + mRunner.resumeTiming(); + + startUserInBackground(userId); + + mRunner.pauseTiming(); + removeUser(userId); + mRunner.resumeTiming(); + } + } finally { + setUserTypePackageWhitelistMode(origMode); + } + } + /** Creates a new user, returning its userId. */ private int createUserNoFlags() { return createUserWithFlags(/* flags= */ 0); @@ -458,6 +517,10 @@ public class UserLifecycleTests { private int createManagedProfile() { final UserInfo userInfo = mUm.createProfileForUser("TestProfile", UserInfo.FLAG_MANAGED_PROFILE, mAm.getCurrentUser()); + if (userInfo == null) { + throw new IllegalStateException("Creating managed profile failed. Most likely there is " + + "already a pre-existing profile on the device."); + } mUsersToRemove.add(userInfo.id); return userInfo.id; } @@ -627,6 +690,20 @@ public class UserLifecycleTests { } } + /** Gets the PACKAGE_WHITELIST_MODE_PROP System Property. */ + private int getUserTypePackageWhitelistMode() { + return SystemProperties.getInt(PACKAGE_WHITELIST_MODE_PROP, + USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT); + } + + /** Sets the PACKAGE_WHITELIST_MODE_PROP System Property to the given value. */ + private void setUserTypePackageWhitelistMode(int mode) { + String result = ShellHelper.runShellCommand( + String.format("setprop %s %d", PACKAGE_WHITELIST_MODE_PROP, mode)); + attestFalse("Failed to set sysprop " + PACKAGE_WHITELIST_MODE_PROP + ": " + result, + result != null && result.contains("Failed")); + } + private void removeUser(int userId) { try { mUm.removeUser(userId); diff --git a/apct-tests/perftests/textclassifier/run.sh b/apct-tests/perftests/textclassifier/run.sh index 8660d26388ac..d36d190a573a 100755 --- a/apct-tests/perftests/textclassifier/run.sh +++ b/apct-tests/perftests/textclassifier/run.sh @@ -1,5 +1,5 @@ set -e -make TextClassifierPerfTests perf-setup.sh +build/soong/soong_ui.bash --make-mode TextClassifierPerfTests perf-setup.sh adb install ${OUT}/testcases/TextClassifierPerfTests/arm64/TextClassifierPerfTests.apk adb shell cmd package compile -m speed -f com.android.perftests.textclassifier adb push ${OUT}/obj/EXECUTABLES/perf-setup.sh_intermediates/perf-setup.sh /data/local/tmp/ diff --git a/apex/jobscheduler/README_js-mainline.md b/apex/jobscheduler/README_js-mainline.md index c1ad666e3e05..ea20e3e29d99 100644 --- a/apex/jobscheduler/README_js-mainline.md +++ b/apex/jobscheduler/README_js-mainline.md @@ -1,23 +1,11 @@ # Making Job Scheduler into a Mainline Module -## TODOs - -See also: -- http://go/moving-js-code-for-mainline -- http://go/jobscheduler-code-dependencies-2019-07 - -- [ ] Move this into `frameworks/apex/jobscheduler/...`. Currently it's in `frameworks/base/apex/...` -because `frameworks/apex/` is not a part of any git projects. (and also working on multiple -projects is a pain.) - ## Current structure - JS service side classes are put in `jobscheduler-service.jar`. It's *not* included in services.jar, and instead it's put in the system server classpath, which currently looks like the following: -`SYSTEMSERVERCLASSPATH=/system/framework/services.jar:/system/framework/jobscheduler-service.jar:/system/framework/ethernet-service.jar:/system/framework/wifi-service.jar:/system/framework/com.android.location.provider.jar` - - (Note `jobscheduler-service.jar` will be put at the end in http://ag/9128109) +`SYSTEMSERVERCLASSPATH=/system/framework/services.jar:/system/framework/ethernet-service.jar:/system/framework/com.android.location.provider.jar:/system/framework/jobscheduler-service.jar` `SYSTEMSERVERCLASSPATH` is generated from `PRODUCT_SYSTEM_SERVER_JARS`. @@ -29,10 +17,4 @@ as of http://ag/9145619. `framework.jar` merging the two jar files, and this jar file is what's put on the device and loaded by Zygote. - -This is *not* the final design. From a gerrit comment on http://ag/9145619: - -> This CL is just the first step, and the current state isn't not really the final form. For now we just want to have two separate jars, which makes it easier for us to analyze dependencies between them, and I wanted to minimize the change to the rest of the system. So, for example, zygote will still only have "framework.jar" in its classpath, instead of the two jars for now. -> But yes, eventually, we won't even be able to have the monolithic "framework.jar" file because of mainline, so we need to figure out how to build the system without creating it. At that point zygote will have the two separate jar files in its classpath. -> When we reach that point, we should revisit the naming of it, and yes, maybe the simple "framework.jar" is a good option. -> But again, for now, I want to make this change as transparent as possible to the rest of the world. +The current structure is *not* the final design. diff --git a/api/current.txt b/api/current.txt index d688220fd17b..fc7685d2da97 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8,6 +8,7 @@ package android { public static final class Manifest.permission { ctor public Manifest.permission(); field public static final String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER"; + field public static final String ACCESSIBILITY_SHORTCUT_TARGET = "android.permission.ACCESSIBILITY_SHORTCUT_TARGET"; field public static final String ACCESS_BACKGROUND_LOCATION = "android.permission.ACCESS_BACKGROUND_LOCATION"; field public static final String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES"; field public static final String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION"; @@ -6799,6 +6800,7 @@ package android.app.admin { method public boolean isResetPasswordTokenActive(android.content.ComponentName); method public boolean isSecurityLoggingEnabled(@Nullable android.content.ComponentName); method public boolean isUninstallBlocked(@Nullable android.content.ComponentName, String); + method public boolean isUniqueDeviceAttestationSupported(); method public boolean isUsingUnifiedPassword(@NonNull android.content.ComponentName); method public void lockNow(); method public void lockNow(int); @@ -6980,6 +6982,7 @@ package android.app.admin { field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1 field public static final int ID_TYPE_BASE_INFO = 1; // 0x1 field public static final int ID_TYPE_IMEI = 4; // 0x4 + field public static final int ID_TYPE_INDIVIDUAL_ATTESTATION = 16; // 0x10 field public static final int ID_TYPE_MEID = 8; // 0x8 field public static final int ID_TYPE_SERIAL = 2; // 0x2 field public static final int INSTALLKEY_REQUEST_CREDENTIALS_ACCESS = 1; // 0x1 @@ -23089,8 +23092,9 @@ package android.location { public class LocationManager { method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addGpsStatusListener(android.location.GpsStatus.Listener); - method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.OnNmeaMessageListener); + 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); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void addProximityAlert(double, double, float, long, @NonNull android.app.PendingIntent); method public void addTestProvider(@NonNull String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int); method @Deprecated public void clearTestProviderEnabled(@NonNull String); @@ -23107,12 +23111,15 @@ package android.location { method @NonNull public java.util.List<java.lang.String> getProviders(@NonNull android.location.Criteria, boolean); method public boolean isLocationEnabled(); method public boolean isProviderEnabled(@NonNull String); - method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback(@NonNull android.location.GnssMeasurementsEvent.Callback); + method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback(@NonNull android.location.GnssMeasurementsEvent.Callback); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback(@NonNull android.location.GnssMeasurementsEvent.Callback, @Nullable android.os.Handler); - method public boolean registerGnssNavigationMessageCallback(@NonNull android.location.GnssNavigationMessage.Callback); + method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback(@NonNull java.util.concurrent.Executor, @NonNull android.location.GnssMeasurementsEvent.Callback); + method @Deprecated public boolean registerGnssNavigationMessageCallback(@NonNull android.location.GnssNavigationMessage.Callback); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssNavigationMessageCallback(@NonNull android.location.GnssNavigationMessage.Callback, @Nullable android.os.Handler); - method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull android.location.GnssStatus.Callback); + method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssNavigationMessageCallback(@NonNull java.util.concurrent.Executor, @NonNull android.location.GnssNavigationMessage.Callback); + method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull android.location.GnssStatus.Callback); 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 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); @@ -23121,7 +23128,9 @@ package android.location { method public void removeUpdates(@NonNull android.app.PendingIntent); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull String, long, float, @NonNull android.location.LocationListener); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull String, long, float, @NonNull android.location.LocationListener, @Nullable android.os.Looper); + method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull String, long, float, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(long, float, @NonNull android.location.Criteria, @NonNull android.location.LocationListener, @Nullable android.os.Looper); + method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(long, float, @NonNull android.location.Criteria, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull String, long, float, @NonNull android.app.PendingIntent); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(long, float, @NonNull android.location.Criteria, @NonNull android.app.PendingIntent); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestSingleUpdate(@NonNull String, @NonNull android.location.LocationListener, @Nullable android.os.Looper); @@ -45013,6 +45022,7 @@ package android.telephony { field public static final int DATA_ROAMING_DISABLE = 0; // 0x0 field public static final int DATA_ROAMING_ENABLE = 1; // 0x1 field public static final int DEFAULT_SUBSCRIPTION_ID = 2147483647; // 0x7fffffff + field public static final String EXTRA_SLOT_INDEX = "android.telephony.extra.SLOT_INDEX"; field public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; field public static final int INVALID_SIM_SLOT_INDEX = -1; // 0xffffffff field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff diff --git a/api/system-current.txt b/api/system-current.txt index 325167a10ea2..279d2c89808e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3432,6 +3432,7 @@ package android.location { method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public boolean isProviderPackage(@NonNull String); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean registerGnssBatchedLocationCallback(long, boolean, @NonNull android.location.BatchedLocationCallback, @Nullable android.os.Handler); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper); + method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void setExtraLocationControllerPackage(@Nullable String); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void setExtraLocationControllerPackageEnabled(boolean); @@ -6180,6 +6181,7 @@ package android.security.keystore { field public static final int ID_TYPE_IMEI = 2; // 0x2 field public static final int ID_TYPE_MEID = 3; // 0x3 field public static final int ID_TYPE_SERIAL = 1; // 0x1 + field public static final int USE_INDIVIDUAL_ATTESTATION = 4; // 0x4 } public class DeviceIdAttestationException extends java.lang.Exception { @@ -8234,6 +8236,7 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping(); method public static long getMaxNumberVerificationTimeoutMillis(); + method @NonNull public String getNetworkCountryIso(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask(); method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState(); method public int getSimApplicationState(); diff --git a/api/test-current.txt b/api/test-current.txt index 51b569f029d0..9b00a42d27a9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -786,7 +786,7 @@ package android.content.res { public final class AssetManager implements java.lang.AutoCloseable { method @NonNull public String[] getApkPaths(); - method @Nullable public java.util.Map<java.lang.String,java.lang.String> getOverlayableMap(String); + method @Nullable public String getOverlayablesToString(String); } public final class Configuration implements java.lang.Comparable<android.content.res.Configuration> android.os.Parcelable { @@ -925,6 +925,10 @@ package android.hardware.camera2 { field public static final int SESSION_OPERATION_MODE_VENDOR_START = 32768; // 0x8000 } + public final class CameraManager { + method public String[] getCameraIdListNoLazy() throws android.hardware.camera2.CameraAccessException; + } + } package android.hardware.display { @@ -1090,6 +1094,7 @@ package android.location { method @NonNull public String[] getIgnoreSettingsWhitelist(); method @NonNull public java.util.List<android.location.LocationRequest> getTestProviderCurrentRequests(String); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper); + method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle); } @@ -2431,6 +2436,7 @@ package android.security.keystore { field public static final int ID_TYPE_IMEI = 2; // 0x2 field public static final int ID_TYPE_MEID = 3; // 0x3 field public static final int ID_TYPE_SERIAL = 1; // 0x1 + field public static final int USE_INDIVIDUAL_ATTESTATION = 4; // 0x4 } public class DeviceIdAttestationException extends java.lang.Exception { @@ -2908,6 +2914,7 @@ package android.telephony { method public int checkCarrierPrivilegesForPackage(String); method public int getCarrierIdListVersion(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag(); + method @NonNull public String getNetworkCountryIso(int); method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile(); method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String); diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index 05ff49045b17..c79b0cab35c6 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -74,6 +74,7 @@ cc_defaults { "src/external/StatsPuller.cpp", "src/external/StatsPullerManager.cpp", "src/external/SubsystemSleepStatePuller.cpp", + "src/external/SurfaceflingerStatsPuller.cpp", "src/external/TrainInfoPuller.cpp", "src/FieldValue.cpp", "src/guardrail/StatsdStats.cpp", @@ -138,6 +139,7 @@ cc_defaults { "libservices", "libstatslog", "libsysutils", + "libtimestats_proto", "libutils", ], } @@ -239,6 +241,7 @@ cc_test { "tests/external/IncidentReportArgs_test.cpp", "tests/external/puller_util_test.cpp", "tests/external/StatsPuller_test.cpp", + "tests/external/SurfaceflingerStatsPuller_test.cpp", "tests/FieldValue_test.cpp", "tests/guardrail/StatsdStats_test.cpp", "tests/indexed_priority_queue_test.cpp", diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp index f69e2d09ad23..7a183a3b1b2e 100644 --- a/cmds/statsd/src/external/StatsPullerManager.cpp +++ b/cmds/statsd/src/external/StatsPullerManager.cpp @@ -17,12 +17,17 @@ #define DEBUG false #include "Log.h" +#include "StatsPullerManager.h" + #include <android/os/IStatsCompanionService.h> #include <android/os/IStatsPullerCallback.h> #include <cutils/log.h> #include <math.h> #include <stdint.h> + #include <algorithm> +#include <iostream> + #include "../StatsService.h" #include "../logd/LogEvent.h" #include "../stats_log_util.h" @@ -32,13 +37,11 @@ #include "ResourceHealthManagerPuller.h" #include "StatsCallbackPuller.h" #include "StatsCompanionServicePuller.h" -#include "StatsPullerManager.h" #include "SubsystemSleepStatePuller.h" +#include "SurfaceflingerStatsPuller.h" #include "TrainInfoPuller.h" #include "statslog.h" -#include <iostream> - using std::make_shared; using std::map; using std::shared_ptr; @@ -269,6 +272,10 @@ std::map<int, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = { // App ops {android::util::APP_OPS, {.puller = new StatsCompanionServicePuller(android::util::APP_OPS)}}, + // SurfaceflingerStatsGlobalInfo + {android::util::SURFACEFLINGER_STATS_GLOBAL_INFO, + {.puller = + new SurfaceflingerStatsPuller(android::util::SURFACEFLINGER_STATS_GLOBAL_INFO)}}, }; StatsPullerManager::StatsPullerManager() : mNextPullTimeNs(NO_ALARM_UPDATE) { diff --git a/cmds/statsd/src/external/SurfaceflingerStatsPuller.cpp b/cmds/statsd/src/external/SurfaceflingerStatsPuller.cpp new file mode 100644 index 000000000000..23b2236f35f2 --- /dev/null +++ b/cmds/statsd/src/external/SurfaceflingerStatsPuller.cpp @@ -0,0 +1,99 @@ +/* + * 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. + */ + +#include "SurfaceflingerStatsPuller.h" + +#include <cutils/compiler.h> + +#include <numeric> + +#include "logd/LogEvent.h" +#include "stats_log_util.h" +#include "statslog.h" + +namespace android { +namespace os { +namespace statsd { + +SurfaceflingerStatsPuller::SurfaceflingerStatsPuller(const int tagId) : StatsPuller(tagId) { +} + +bool SurfaceflingerStatsPuller::PullInternal(std::vector<std::shared_ptr<LogEvent>>* data) { + switch (mTagId) { + case android::util::SURFACEFLINGER_STATS_GLOBAL_INFO: + return pullGlobalInfo(data); + default: + break; + } + + return false; +} + +static int64_t getTotalTime( + const google::protobuf::RepeatedPtrField<surfaceflinger::SFTimeStatsHistogramBucketProto>& + buckets) { + int64_t total = 0; + for (const auto& bucket : buckets) { + if (bucket.time_millis() == 1000) { + continue; + } + + total += bucket.time_millis() * bucket.frame_count(); + } + + return total; +} + +bool SurfaceflingerStatsPuller::pullGlobalInfo(std::vector<std::shared_ptr<LogEvent>>* data) { + std::string protoBytes; + if (CC_UNLIKELY(mStatsProvider)) { + protoBytes = mStatsProvider(); + } else { + std::unique_ptr<FILE, decltype(&pclose)> pipe(popen("dumpsys SurfaceFlinger --timestats -dump --proto", "r"), pclose); + if (!pipe.get()) { + return false; + } + char buf[1024]; + size_t bytesRead = 0; + do { + bytesRead = fread(buf, 1, sizeof(buf), pipe.get()); + protoBytes.append(buf, bytesRead); + } while (bytesRead > 0); + } + surfaceflinger::SFTimeStatsGlobalProto proto; + proto.ParseFromString(protoBytes); + + int64_t totalTime = getTotalTime(proto.present_to_present()); + + data->clear(); + data->reserve(1); + std::shared_ptr<LogEvent> event = + make_shared<LogEvent>(android::util::SURFACEFLINGER_STATS_GLOBAL_INFO, getWallClockNs(), + getElapsedRealtimeNs()); + if (!event->write(proto.total_frames())) return false; + if (!event->write(proto.missed_frames())) return false; + if (!event->write(proto.client_composition_frames())) return false; + if (!event->write(proto.display_on_time())) return false; + if (!event->write(totalTime)) return false; + event->init(); + data->emplace_back(event); + + return true; +} + +} // namespace statsd +} // namespace os +} // namespace android diff --git a/cmds/statsd/src/external/SurfaceflingerStatsPuller.h b/cmds/statsd/src/external/SurfaceflingerStatsPuller.h new file mode 100644 index 000000000000..ed7153edf797 --- /dev/null +++ b/cmds/statsd/src/external/SurfaceflingerStatsPuller.h @@ -0,0 +1,48 @@ +/* + * 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 <timestatsproto/TimeStatsProtoHeader.h> + +#include "StatsPuller.h" + +namespace android { +namespace os { +namespace statsd { + +/** + * Pull metrics from Surfaceflinger + */ +class SurfaceflingerStatsPuller : public StatsPuller { +public: + explicit SurfaceflingerStatsPuller(const int tagId); + + // StatsPuller interface + bool PullInternal(std::vector<std::shared_ptr<LogEvent>>* data) override; + +protected: + // Test-only, for injecting fake data + using StatsProvider = std::function<std::string()>; + StatsProvider mStatsProvider; + +private: + bool pullGlobalInfo(std::vector<std::shared_ptr<LogEvent>>* data); +}; + +} // namespace statsd +} // namespace os +} // namespace android diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto index d9c04f248af0..e45e24fe49d4 100644 --- a/cmds/statsd/src/stats_log.proto +++ b/cmds/statsd/src/stats_log.proto @@ -41,6 +41,15 @@ message DimensionsValueTuple { repeated DimensionsValue dimensions_value = 1; } +message StateValue { + optional int32 atom_id = 1; + + oneof contents { + int64 group_id = 2; + int32 value = 3; + } +} + message EventMetricData { optional int64 elapsed_timestamp_nanos = 1; @@ -66,12 +75,14 @@ message CountBucketInfo { message CountMetricData { optional DimensionsValue dimensions_in_what = 1; - optional DimensionsValue dimensions_in_condition = 2 [deprecated = true]; + repeated StateValue slice_by_state = 6; repeated CountBucketInfo bucket_info = 3; repeated DimensionsValue dimension_leaf_values_in_what = 4; + optional DimensionsValue dimensions_in_condition = 2 [deprecated = true]; + repeated DimensionsValue dimension_leaf_values_in_condition = 5 [deprecated = true]; } diff --git a/cmds/statsd/src/statsd_config.proto b/cmds/statsd/src/statsd_config.proto index 1b7f39806608..c107397b0273 100644 --- a/cmds/statsd/src/statsd_config.proto +++ b/cmds/statsd/src/statsd_config.proto @@ -150,6 +150,24 @@ message Predicate { } } +message StateMap { + message StateGroup { + optional int64 group_id = 1; + + repeated int32 value = 2; + } + + repeated StateGroup group = 1; +} + +message State { + optional int64 id = 1; + + optional int32 atom_id = 2; + + optional StateMap map = 3; +} + message MetricConditionLink { optional int64 condition = 1; @@ -158,6 +176,14 @@ message MetricConditionLink { optional FieldMatcher fields_in_condition = 3; } +message MetricStateLink { + optional int64 state = 1; + + optional FieldMatcher fields_in_what = 2; + + optional FieldMatcher fields_in_state = 3; +} + message FieldFilter { optional bool include_all = 1 [default = false]; optional FieldMatcher fields = 2; @@ -182,11 +208,15 @@ message CountMetric { optional FieldMatcher dimensions_in_what = 4; - optional FieldMatcher dimensions_in_condition = 7 [deprecated = true]; + repeated int64 slice_by_state = 8; optional TimeUnit bucket = 5; repeated MetricConditionLink links = 6; + + repeated MetricStateLink state_link = 9; + + optional FieldMatcher dimensions_in_condition = 7 [deprecated = true]; } message DurationMetric { @@ -438,6 +468,8 @@ message StatsdConfig { optional bool persist_locally = 20 [default = false]; + repeated State state = 21; + // Field number 1000 is reserved for later use. reserved 1000; } diff --git a/cmds/statsd/tests/StatsLogProcessor_test.cpp b/cmds/statsd/tests/StatsLogProcessor_test.cpp index fe25a257aa67..76ee9a6e5996 100644 --- a/cmds/statsd/tests/StatsLogProcessor_test.cpp +++ b/cmds/statsd/tests/StatsLogProcessor_test.cpp @@ -1713,6 +1713,11 @@ TEST(StatsLogProcessorTest, TestActivationsPersistAcrossSystemServerRestart) { EXPECT_EQ(kActive, activation1004->state); EXPECT_EQ(ACTIVATE_IMMEDIATELY, activation1004->activationType); // }}}------------------------------------------------------------------------------ + + // Clear the data stored on disk as a result of the system server death. + vector<uint8_t> buffer; + processor->onDumpReport(cfgKey1, configAddedTimeNs + NS_PER_SEC, false, true, + ADB_DUMP, FAST, &buffer); } #else diff --git a/cmds/statsd/tests/e2e/ConfigTtl_e2e_test.cpp b/cmds/statsd/tests/e2e/ConfigTtl_e2e_test.cpp index b98dc60086ac..325e869e5a9b 100644 --- a/cmds/statsd/tests/e2e/ConfigTtl_e2e_test.cpp +++ b/cmds/statsd/tests/e2e/ConfigTtl_e2e_test.cpp @@ -96,6 +96,11 @@ TEST(ConfigTtlE2eTest, TestCountMetric) { EXPECT_EQ((int64_t)(bucketStartTimeNs + 25 * bucketSizeNs + 2 + 2 * 3600 * NS_PER_SEC), processor->mMetricsManagers.begin()->second->getTtlEndNs()); + + // Clear the data stored on disk as a result of the ttl. + vector<uint8_t> buffer; + processor->onDumpReport(cfgKey, bucketStartTimeNs + 25 * bucketSizeNs + 3, false, true, + ADB_DUMP, FAST, &buffer); } diff --git a/cmds/statsd/tests/external/SurfaceflingerStatsPuller_test.cpp b/cmds/statsd/tests/external/SurfaceflingerStatsPuller_test.cpp new file mode 100644 index 000000000000..5c9636fa99cc --- /dev/null +++ b/cmds/statsd/tests/external/SurfaceflingerStatsPuller_test.cpp @@ -0,0 +1,95 @@ +/* + * 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. + */ + +#undef LOG_TAG +#define LOG_TAG "SurfaceflingerStatsPuller_test" + +#include "src/external/SurfaceflingerStatsPuller.h" + +#include <gtest/gtest.h> +#include <log/log.h> + +#ifdef __ANDROID__ + +namespace android { +namespace os { +namespace statsd { + +class TestableSurfaceflingerStatsPuller : public SurfaceflingerStatsPuller { +public: + TestableSurfaceflingerStatsPuller(const int tagId) : SurfaceflingerStatsPuller(tagId){}; + + void injectStats(const StatsProvider& statsProvider) { + mStatsProvider = statsProvider; + } +}; + +class SurfaceflingerStatsPullerTest : public ::testing::Test { +public: + SurfaceflingerStatsPullerTest() { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + ALOGD("**** Setting up for %s.%s\n", test_info->test_case_name(), test_info->name()); + } + + ~SurfaceflingerStatsPullerTest() { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + ALOGD("**** Tearing down after %s.%s\n", test_info->test_case_name(), test_info->name()); + } +}; + +TEST_F(SurfaceflingerStatsPullerTest, pullGlobalStats) { + surfaceflinger::SFTimeStatsGlobalProto proto; + proto.set_total_frames(1); + proto.set_missed_frames(2); + proto.set_client_composition_frames(2); + proto.set_display_on_time(4); + + auto bucketOne = proto.add_present_to_present(); + bucketOne->set_time_millis(2); + bucketOne->set_frame_count(4); + auto bucketTwo = proto.add_present_to_present(); + bucketTwo->set_time_millis(4); + bucketTwo->set_frame_count(1); + auto bucketThree = proto.add_present_to_present(); + bucketThree->set_time_millis(1000); + bucketThree->set_frame_count(1); + static constexpr int64_t expectedAnimationMillis = 12; + TestableSurfaceflingerStatsPuller puller(android::util::SURFACEFLINGER_STATS_GLOBAL_INFO); + + puller.injectStats([&] { + return proto.SerializeAsString(); + }); + puller.ForceClearCache(); + vector<std::shared_ptr<LogEvent>> outData; + puller.Pull(&outData); + + ASSERT_EQ(1, outData.size()); + EXPECT_EQ(android::util::SURFACEFLINGER_STATS_GLOBAL_INFO, outData[0]->GetTagId()); + EXPECT_EQ(proto.total_frames(), outData[0]->getValues()[0].mValue.long_value); + EXPECT_EQ(proto.missed_frames(), outData[0]->getValues()[1].mValue.long_value); + EXPECT_EQ(proto.client_composition_frames(), outData[0]->getValues()[2].mValue.long_value); + EXPECT_EQ(proto.display_on_time(), outData[0]->getValues()[3].mValue.long_value); + EXPECT_EQ(expectedAnimationMillis, outData[0]->getValues()[4].mValue.long_value); +} + +} // namespace statsd +} // namespace os +} // namespace android +#else +GTEST_LOG_(INFO) << "This test does nothing.\n"; +#endif diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt index a6e1f0ab0cde..e1cf7c1a583b 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-greylist.txt @@ -218,7 +218,6 @@ Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager; Landroid/location/ILocationManager$Stub;->TRANSACTION_getAllProviders:I Landroid/location/INetInitiatedListener$Stub;-><init>()V -Landroid/location/LocationManager$ListenerTransport;-><init>(Landroid/location/LocationManager;Landroid/location/LocationListener;Landroid/os/Looper;)V Landroid/Manifest$permission;->CAPTURE_SECURE_VIDEO_OUTPUT:Ljava/lang/String; Landroid/Manifest$permission;->CAPTURE_VIDEO_OUTPUT:Ljava/lang/String; Landroid/Manifest$permission;->READ_FRAME_BUFFER:Ljava/lang/String; @@ -1150,6 +1149,8 @@ Lcom/android/internal/statusbar/IStatusBar$Stub;->asInterface(Landroid/os/IBinde Lcom/android/internal/statusbar/IStatusBarService$Stub;-><init>()V Lcom/android/internal/statusbar/IStatusBarService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/statusbar/IStatusBarService; Lcom/android/internal/telecom/ITelecomService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telecom/ITelecomService; +Lcom/android/internal/telephony/IIccPhoneBook$Stub$Proxy;->mRemote:Landroid/os/IBinder; +Lcom/android/internal/telephony/IIccPhoneBook$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IIccPhoneBook; Lcom/android/internal/telephony/IMms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IMms; Lcom/android/internal/telephony/IPhoneStateListener$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneStateListener; Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V @@ -1157,6 +1158,7 @@ Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->asInterface(Landroid/os/IBi Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->TRANSACTION_getDeviceId:I Lcom/android/internal/telephony/ISms$Stub;-><init>()V Lcom/android/internal/telephony/ISms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISms; +Lcom/android/internal/telephony/ISub$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/ISub$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISub; Lcom/android/internal/telephony/ITelephony$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->mRemote:Landroid/os/IBinder; @@ -1459,4 +1461,5 @@ Lcom/google/android/mms/util/SqliteWrapper;->insert(Landroid/content/Context;Lan Lcom/google/android/mms/util/SqliteWrapper;->query(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor; Lcom/google/android/mms/util/SqliteWrapper;->requery(Landroid/content/Context;Landroid/database/Cursor;)Z Lcom/google/android/mms/util/SqliteWrapper;->update(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I +Lcom/google/android/mms/pdu/PduParser;->$assertionsDisabled:Z Lcom/google/android/util/AbstractMessageParser$Token$Type;->values()[Lcom/google/android/util/AbstractMessageParser$Token$Type; diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index bf7d6324764f..cf36032e8a05 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1925,11 +1925,15 @@ public class Activity extends ContextThemeWrapper } /** - * Like {@link #isVoiceInteraction}, but only returns true if this is also the root - * of a voice interaction. That is, returns true if this activity was directly + * Like {@link #isVoiceInteraction}, but only returns {@code true} if this is also the root + * of a voice interaction. That is, returns {@code true} if this activity was directly * started by the voice interaction service as the initiation of a voice interaction. * Otherwise, for example if it was started by another activity while under voice - * interaction, returns false. + * interaction, returns {@code false}. + * If the activity {@link android.R.styleable#AndroidManifestActivity_launchMode launchMode} is + * {@code singleTask}, it forces the activity to launch in a new task, separate from the one + * that started it. Therefore, there is no longer a relationship between them, and + * {@link #isVoiceInteractionRoot()} return {@code false} in this case. */ public boolean isVoiceInteractionRoot() { try { @@ -2473,17 +2477,13 @@ public class Activity extends ContextThemeWrapper getAutofillManager().onInvisibleForAutofill(); } - if (isFinishing()) { - if (mAutoFillResetNeeded) { - getAutofillManager().onActivityFinishing(); - } else if (mIntent != null - && mIntent.hasExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)) { - // Activity was launched when user tapped a link in the Autofill Save UI - since - // user launched another activity, the Save UI should not be restored when this - // activity is finished. - getAutofillManager().onPendingSaveUi(AutofillManager.PENDING_UI_OPERATION_CANCEL, - mIntent.getIBinderExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)); - } + if (isFinishing() && !mAutoFillResetNeeded && mIntent != null + && mIntent.hasExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)) { + // Activity was launched when user tapped a link in the Autofill Save UI - since + // user launched another activity, the Save UI should not be restored when this + // activity is finished. + getAutofillManager().onPendingSaveUi(AutofillManager.PENDING_UI_OPERATION_CANCEL, + mIntent.getIBinderExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)); } mEnterAnimationComplete = false; } @@ -2521,6 +2521,10 @@ public class Activity extends ContextThemeWrapper if (DEBUG_LIFECYCLE) Slog.v(TAG, "onDestroy " + this); mCalled = true; + if (isFinishing() && mAutoFillResetNeeded) { + getAutofillManager().onActivityFinishing(); + } + // dismiss any dialogs we are managing. if (mManagedDialogs != null) { final int numDialogs = mManagedDialogs.size(); diff --git a/core/java/android/app/AppCompatCallbacks.java b/core/java/android/app/AppCompatCallbacks.java index 08c97eb284e3..19d158dedd06 100644 --- a/core/java/android/app/AppCompatCallbacks.java +++ b/core/java/android/app/AppCompatCallbacks.java @@ -18,7 +18,6 @@ package android.app; import android.compat.Compatibility; import android.os.Process; -import android.util.Log; import android.util.StatsLog; import com.android.internal.compat.ChangeReporter; @@ -31,8 +30,6 @@ import java.util.Arrays; * @hide */ public final class AppCompatCallbacks extends Compatibility.Callbacks { - private static final String TAG = "Compatibility"; - private final long[] mDisabledChanges; private final ChangeReporter mChangeReporter; @@ -48,7 +45,8 @@ public final class AppCompatCallbacks extends Compatibility.Callbacks { private AppCompatCallbacks(long[] disabledChanges) { mDisabledChanges = Arrays.copyOf(disabledChanges, disabledChanges.length); Arrays.sort(mDisabledChanges); - mChangeReporter = new ChangeReporter(); + mChangeReporter = new ChangeReporter( + StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__SOURCE__APP_PROCESS); } protected void reportChange(long changeId) { @@ -67,10 +65,7 @@ public final class AppCompatCallbacks extends Compatibility.Callbacks { private void reportChange(long changeId, int state) { int uid = Process.myUid(); - //TODO(b/138374585): Implement rate limiting for the logs. - Log.d(TAG, ChangeReporter.createLogString(uid, changeId, state)); - mChangeReporter.reportChange(uid, changeId, - state, /* source */StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__SOURCE__APP_PROCESS); + mChangeReporter.reportChange(uid, changeId, state); } } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 2f03ed484e96..efb9f6bb88f1 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -10511,12 +10511,7 @@ public class Notification implements Parcelable final StandardTemplateParams fillTextsFrom(Builder b) { Bundle extras = b.mN.extras; this.title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE)); - - CharSequence text = extras.getCharSequence(EXTRA_BIG_TEXT); - if (TextUtils.isEmpty(text)) { - text = extras.getCharSequence(EXTRA_TEXT); - } - this.text = b.processLegacyText(text); + this.text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT)); this.summaryText = extras.getCharSequence(EXTRA_SUB_TEXT); return this; } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 64ddfc106dcf..c3c383ce5e55 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2079,7 +2079,8 @@ public class DevicePolicyManager { ID_TYPE_BASE_INFO, ID_TYPE_SERIAL, ID_TYPE_IMEI, - ID_TYPE_MEID + ID_TYPE_MEID, + ID_TYPE_INDIVIDUAL_ATTESTATION }) public @interface AttestationIdType {} @@ -2114,6 +2115,14 @@ public class DevicePolicyManager { public static final int ID_TYPE_MEID = 8; /** + * Specifies that the device should attest using an individual attestation certificate. + * For use with {@link #generateKeyPair}. + * + * @see #generateKeyPair + */ + public static final int ID_TYPE_INDIVIDUAL_ATTESTATION = 16; + + /** * Service-specific error code for {@link #generateKeyPair}: * Indicates the call has failed due to StrongBox unavailability. * @hide @@ -2669,7 +2678,10 @@ public class DevicePolicyManager { * only imposed if the administrator has also requested either {@link #PASSWORD_QUALITY_NUMERIC} * , {@link #PASSWORD_QUALITY_NUMERIC_COMPLEX}, {@link #PASSWORD_QUALITY_ALPHABETIC}, * {@link #PASSWORD_QUALITY_ALPHANUMERIC}, or {@link #PASSWORD_QUALITY_COMPLEX} with - * {@link #setPasswordQuality}. + * {@link #setPasswordQuality}. If an app targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above enforces this constraint without settings + * password quality to one of these values first, this method will throw + * {@link IllegalStateException}. * <p> * On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the * password is always treated as empty. @@ -2684,9 +2696,12 @@ public class DevicePolicyManager { * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param length The new desired minimum password length. A value of 0 means there is no - * restriction. + * restriction. * @throws SecurityException if {@code admin} is not an active administrator or {@code admin} - * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * @throws IllegalStateException if the calling app is targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above and didn't set a sufficient password + * quality requirement prior to calling this method. */ public void setPasswordMinimumLength(@NonNull ComponentName admin, int length) { if (mService != null) { @@ -2738,7 +2753,10 @@ public class DevicePolicyManager { * place immediately. To prompt the user for a new password, use * {@link #ACTION_SET_NEW_PASSWORD} or {@link #ACTION_SET_NEW_PARENT_PROFILE_PASSWORD} after * setting this value. This constraint is only imposed if the administrator has also requested - * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. The default value is 0. + * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. If an app targeting + * SDK level {@link android.os.Build.VERSION_CODES#R} and above enforces this constraint without + * settings password quality to {@link #PASSWORD_QUALITY_COMPLEX} first, this method will throw + * {@link IllegalStateException}. The default value is 0. * <p> * On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the * password is always treated as empty. @@ -2756,6 +2774,9 @@ public class DevicePolicyManager { * A value of 0 means there is no restriction. * @throws SecurityException if {@code admin} is not an active administrator or {@code admin} * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * @throws IllegalStateException if the calling app is targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above and didn't set a sufficient password + * quality requirement prior to calling this method. */ public void setPasswordMinimumUpperCase(@NonNull ComponentName admin, int length) { if (mService != null) { @@ -2814,7 +2835,10 @@ public class DevicePolicyManager { * place immediately. To prompt the user for a new password, use * {@link #ACTION_SET_NEW_PASSWORD} or {@link #ACTION_SET_NEW_PARENT_PROFILE_PASSWORD} after * setting this value. This constraint is only imposed if the administrator has also requested - * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. The default value is 0. + * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. If an app targeting + * SDK level {@link android.os.Build.VERSION_CODES#R} and above enforces this constraint without + * settings password quality to {@link #PASSWORD_QUALITY_COMPLEX} first, this method will throw + * {@link IllegalStateException}. The default value is 0. * <p> * On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the * password is always treated as empty. @@ -2832,6 +2856,9 @@ public class DevicePolicyManager { * A value of 0 means there is no restriction. * @throws SecurityException if {@code admin} is not an active administrator or {@code admin} * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * @throws IllegalStateException if the calling app is targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above and didn't set a sufficient password + * quality requirement prior to calling this method. */ public void setPasswordMinimumLowerCase(@NonNull ComponentName admin, int length) { if (mService != null) { @@ -2890,7 +2917,10 @@ public class DevicePolicyManager { * immediately. To prompt the user for a new password, use {@link #ACTION_SET_NEW_PASSWORD} or * {@link #ACTION_SET_NEW_PARENT_PROFILE_PASSWORD} after setting this value. This constraint is * only imposed if the administrator has also requested {@link #PASSWORD_QUALITY_COMPLEX} with - * {@link #setPasswordQuality}. The default value is 1. + * {@link #setPasswordQuality}. If an app targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above enforces this constraint without settings + * password quality to {@link #PASSWORD_QUALITY_COMPLEX} first, this method will throw + * {@link IllegalStateException}. The default value is 1. * <p> * On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the * password is always treated as empty. @@ -2908,6 +2938,9 @@ public class DevicePolicyManager { * 0 means there is no restriction. * @throws SecurityException if {@code admin} is not an active administrator or {@code admin} * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * @throws IllegalStateException if the calling app is targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above and didn't set a sufficient password + * quality requirement prior to calling this method. */ public void setPasswordMinimumLetters(@NonNull ComponentName admin, int length) { if (mService != null) { @@ -2965,7 +2998,10 @@ public class DevicePolicyManager { * place immediately. To prompt the user for a new password, use * {@link #ACTION_SET_NEW_PASSWORD} or {@link #ACTION_SET_NEW_PARENT_PROFILE_PASSWORD} after * setting this value. This constraint is only imposed if the administrator has also requested - * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. The default value is 1. + * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. If an app targeting + * SDK level {@link android.os.Build.VERSION_CODES#R} and above enforces this constraint without + * settings password quality to {@link #PASSWORD_QUALITY_COMPLEX} first, this method will throw + * {@link IllegalStateException}. The default value is 1. * <p> * On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the * password is always treated as empty. @@ -2983,6 +3019,9 @@ public class DevicePolicyManager { * value of 0 means there is no restriction. * @throws SecurityException if {@code admin} is not an active administrator or {@code admin} * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * @throws IllegalStateException if the calling app is targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above and didn't set a sufficient password + * quality requirement prior to calling this method. */ public void setPasswordMinimumNumeric(@NonNull ComponentName admin, int length) { if (mService != null) { @@ -3040,7 +3079,10 @@ public class DevicePolicyManager { * immediately. To prompt the user for a new password, use {@link #ACTION_SET_NEW_PASSWORD} or * {@link #ACTION_SET_NEW_PARENT_PROFILE_PASSWORD} after setting this value. This constraint is * only imposed if the administrator has also requested {@link #PASSWORD_QUALITY_COMPLEX} with - * {@link #setPasswordQuality}. The default value is 1. + * {@link #setPasswordQuality}. If an app targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above enforces this constraint without settings + * password quality to {@link #PASSWORD_QUALITY_COMPLEX} first, this method will throw + * {@link IllegalStateException}. The default value is 1. * <p> * On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the * password is always treated as empty. @@ -3058,6 +3100,9 @@ public class DevicePolicyManager { * 0 means there is no restriction. * @throws SecurityException if {@code admin} is not an active administrator or {@code admin} * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * @throws IllegalStateException if the calling app is targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above and didn't set a sufficient password + * quality requirement prior to calling this method. */ public void setPasswordMinimumSymbols(@NonNull ComponentName admin, int length) { if (mService != null) { @@ -3114,7 +3159,10 @@ public class DevicePolicyManager { * one, so the change does not take place immediately. To prompt the user for a new password, * use {@link #ACTION_SET_NEW_PASSWORD} or {@link #ACTION_SET_NEW_PARENT_PROFILE_PASSWORD} after * setting this value. This constraint is only imposed if the administrator has also requested - * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. The default value is 0. + * {@link #PASSWORD_QUALITY_COMPLEX} with {@link #setPasswordQuality}. If an app targeting + * SDK level {@link android.os.Build.VERSION_CODES#R} and above enforces this constraint without + * settings password quality to {@link #PASSWORD_QUALITY_COMPLEX} first, this method will throw + * {@link IllegalStateException}. The default value is 0. * <p> * On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the * password is always treated as empty. @@ -3132,6 +3180,9 @@ public class DevicePolicyManager { * 0 means there is no restriction. * @throws SecurityException if {@code admin} is not an active administrator or {@code admin} * does not use {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} + * @throws IllegalStateException if the calling app is targeting SDK level + * {@link android.os.Build.VERSION_CODES#R} and above and didn't set a sufficient password + * quality requirement prior to calling this method. */ public void setPasswordMinimumNonLetter(@NonNull ComponentName admin, int length) { if (mService != null) { @@ -4892,24 +4943,47 @@ public class DevicePolicyManager { * have been given to access the key and certificates associated with this alias will be * revoked. * + * <p>Attestation: to enable attestation, set an attestation challenge in {@code keySpec} via + * {@link KeyGenParameterSpec.Builder#setAttestationChallenge}. By specifying flags to the + * {@code idAttestationFlags} parameter, it is possible to request the device's unique + * identity to be included in the attestation record. + * + * <p>Specific identifiers can be included in the attestation record, and an individual + * attestation certificate can be used to sign the attestation record. To find out if the device + * supports these features, refer to {@link #isDeviceIdAttestationSupported()} and + * {@link #isUniqueDeviceAttestationSupported()}. + * + * <p>Device owner, profile owner and their delegated certificate installer can use + * {@link #ID_TYPE_BASE_INFO} to request inclusion of the general device information + * including manufacturer, model, brand, device and product in the attestation record. + * Only device owner and their delegated certificate installer can use + * {@link #ID_TYPE_SERIAL}, {@link #ID_TYPE_IMEI} and {@link #ID_TYPE_MEID} to request + * unique device identifiers to be attested (the serial number, IMEI and MEID correspondingly), + * if supported by the device (see {@link #isDeviceIdAttestationSupported()}). + * Additionally, device owner and their delegated certificate installer can also request the + * attestation record to be signed using an individual attestation certificate by specifying + * the {@link #ID_TYPE_INDIVIDUAL_ATTESTATION} flag (if supported by the device, see + * {@link #isUniqueDeviceAttestationSupported()}). + * <p> + * If any of {@link #ID_TYPE_SERIAL}, {@link #ID_TYPE_IMEI} and {@link #ID_TYPE_MEID} + * is set, it is implicitly assumed that {@link #ID_TYPE_BASE_INFO} is also set. + * <p> + * Attestation using {@link #ID_TYPE_INDIVIDUAL_ATTESTATION} can only be requested if + * key generation is done in StrongBox. + * * @param admin Which {@link DeviceAdminReceiver} this request is associated with, or * {@code null} if calling from a delegated certificate installer. * @param algorithm The key generation algorithm, see {@link java.security.KeyPairGenerator}. * @param keySpec Specification of the key to generate, see * {@link java.security.KeyPairGenerator}. - * @param idAttestationFlags A bitmask of all the identifiers that should be included in the + * @param idAttestationFlags A bitmask of the identifiers that should be included in the * attestation record ({@code ID_TYPE_BASE_INFO}, {@code ID_TYPE_SERIAL}, - * {@code ID_TYPE_IMEI} and {@code ID_TYPE_MEID}), or {@code 0} if no device - * identification is required in the attestation record. - * Device owner, profile owner and their delegated certificate installer can use - * {@link #ID_TYPE_BASE_INFO} to request inclusion of the general device information - * including manufacturer, model, brand, device and product in the attestation record. - * Only device owner and their delegated certificate installer can use - * {@link #ID_TYPE_SERIAL}, {@link #ID_TYPE_IMEI} and {@link #ID_TYPE_MEID} to request - * unique device identifiers to be attested. + * {@code ID_TYPE_IMEI} and {@code ID_TYPE_MEID}), and + * {@code ID_TYPE_INDIVIDUAL_ATTESTATION} if the attestation record should be signed + * using an individual attestation certificate. * <p> - * If any of {@link #ID_TYPE_SERIAL}, {@link #ID_TYPE_IMEI} and {@link #ID_TYPE_MEID} - * is set, it is implicitly assumed that {@link #ID_TYPE_BASE_INFO} is also set. + * {@code 0} should be passed in if no device identification is required in the + * attestation record and the batch attestation certificate should be used. * <p> * If any flag is specified, then an attestation challenge must be included in the * {@code keySpec}. @@ -5051,7 +5125,8 @@ public class DevicePolicyManager { /** * Returns {@code true} if the device supports attestation of device identifiers in addition - * to key attestation. + * to key attestation. See + * {@link #generateKeyPair(ComponentName, String, KeyGenParameterSpec, int)} * @return {@code true} if Device ID attestation is supported. */ public boolean isDeviceIdAttestationSupported() { @@ -5060,6 +5135,20 @@ public class DevicePolicyManager { } /** + * Returns {@code true} if the StrongBox Keymaster implementation on the device was provisioned + * with an individual attestation certificate and can sign attestation records using it (as + * attestation using an individual attestation certificate is a feature only Keymaster + * implementations with StrongBox security level can implement). + * For use prior to calling + * {@link #generateKeyPair(ComponentName, String, KeyGenParameterSpec, int)}. + * @return {@code true} if individual attestation is supported. + */ + public boolean isUniqueDeviceAttestationSupported() { + PackageManager pm = mContext.getPackageManager(); + return pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_UNIQUE_ATTESTATION); + } + + /** * Called by a device or profile owner, or delegated certificate installer, to associate * certificates with a key pair that was generated using {@link #generateKeyPair}, and * set whether the key is available for the user to choose in the certificate selection diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 3418b7be42d6..72204daf01ef 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -10004,7 +10004,10 @@ public class Intent implements Parcelable, Cloneable { if (!Objects.equals(this.mData, other.mData)) return false; if (!Objects.equals(this.mType, other.mType)) return false; if (!Objects.equals(this.mIdentifier, other.mIdentifier)) return false; - if (!Objects.equals(this.mPackage, other.mPackage)) return false; + if (!(this.hasPackageEquivalentComponent() && other.hasPackageEquivalentComponent()) + && !Objects.equals(this.mPackage, other.mPackage)) { + return false; + } if (!Objects.equals(this.mComponent, other.mComponent)) return false; if (!Objects.equals(this.mCategories, other.mCategories)) return false; @@ -10012,6 +10015,15 @@ public class Intent implements Parcelable, Cloneable { } /** + * Return {@code true} if the component name is not null and is in the same package that this + * intent limited to. otherwise return {@code false}. + */ + private boolean hasPackageEquivalentComponent() { + return mComponent != null + && (mPackage == null || mPackage.equals(mComponent.getPackageName())); + } + + /** * Generate hash code that matches semantics of filterEquals(). * * @return Returns the hash value of the action, data, type, class, and diff --git a/core/java/android/content/pm/AndroidTelephonyCommonUpdater.java b/core/java/android/content/pm/AndroidTelephonyCommonUpdater.java deleted file mode 100644 index 1a720d50f2ce..000000000000 --- a/core/java/android/content/pm/AndroidTelephonyCommonUpdater.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.content.pm; - -import static android.content.pm.SharedLibraryNames.ANDROID_TELEPHONY_COMMON; - - -import com.android.internal.compat.IPlatformCompat; -import android.compat.annotation.ChangeId; -import android.compat.annotation.EnabledAfter; -import android.content.pm.PackageParser.Package; - -import android.os.Build.VERSION_CODES; -import android.os.IBinder; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; - -/** - * Updates a package to ensure that - * <ul> - * <li> if apps have target SDK < R, then telephony-common library is included by default to - * their class path. Even without <uses-library>.</li> - * <li> if apps with target SDK level >= R && have special permission (or Phone UID): - * apply <uses-library> on telephony-common should work.</li> - * <li> Otherwise not allow to use the lib. - * See {@link PackageSharedLibraryUpdater#removeLibrary(Package, String)}.</li> - * </ul> - * - * @hide - */ -@VisibleForTesting -public class AndroidTelephonyCommonUpdater extends PackageSharedLibraryUpdater { - - private static final String TAG = AndroidTelephonyCommonUpdater.class.getSimpleName(); - /** - * Restrict telephony-common lib for apps having target SDK >= R - */ - @ChangeId - @EnabledAfter(targetSdkVersion = VERSION_CODES.Q) - static final long RESTRICT_TELEPHONY_COMMON_CHANGE_ID = 139318877L; - - private static boolean apkTargetsApiLevelLessThanROrCurrent(Package pkg) { - boolean shouldRestrict = false; - try { - IBinder b = ServiceManager.getService("platform_compat"); - IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(b); - shouldRestrict = platformCompat.isChangeEnabled(RESTRICT_TELEPHONY_COMMON_CHANGE_ID, - pkg.applicationInfo); - } catch (RemoteException ex) { - Log.e(TAG, ex.getMessage()); - } - // TODO(b/139318877): remove version check for CUR_DEVELOPEMENT after clean up work. - return !shouldRestrict - || pkg.applicationInfo.targetSdkVersion == VERSION_CODES.CUR_DEVELOPMENT; - } - - @Override - public void updatePackage(Package pkg) { - // for apps with targetSDKVersion < R include the library for backward compatibility. - if (apkTargetsApiLevelLessThanROrCurrent(pkg)) { - prefixRequiredLibrary(pkg, ANDROID_TELEPHONY_COMMON); - } else if (pkg.mSharedUserId == null || !pkg.mSharedUserId.equals("android.uid.phone")) { - // if apps target >= R - removeLibrary(pkg, ANDROID_TELEPHONY_COMMON); - } - } -} diff --git a/core/java/android/content/pm/PackageBackwardCompatibility.java b/core/java/android/content/pm/PackageBackwardCompatibility.java index 797ba64b5d1f..4331bd4ac4d4 100644 --- a/core/java/android/content/pm/PackageBackwardCompatibility.java +++ b/core/java/android/content/pm/PackageBackwardCompatibility.java @@ -51,8 +51,6 @@ public class PackageBackwardCompatibility extends PackageSharedLibraryUpdater { packageUpdaters.add(new AndroidHidlUpdater()); - packageUpdaters.add(new AndroidTelephonyCommonUpdater()); - // Add this before adding AndroidTestBaseUpdater so that android.test.base comes before // android.test.mock. packageUpdaters.add(new AndroidTestRunnerSplitUpdater()); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 6d88fea9c4b9..fafb56d20ba0 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2849,6 +2849,17 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: + * The device supports device-unique Keystore attestations. Only available on devices that + * also support {@link #FEATURE_STRONGBOX_KEYSTORE}, and can only be used by device owner + * apps (see {@link android.app.admin.DevicePolicyManager#generateKeyPair}). + * @hide + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_DEVICE_UNIQUE_ATTESTATION = + "android.hardware.device_unique_attestation"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: * The device has a Keymaster implementation that supports Device ID attestation. * * @see DevicePolicyManager#isDeviceIdAttestationSupported diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java index 3e4649f786e5..f28b85ccbedc 100644 --- a/core/java/android/content/pm/PackageManagerInternal.java +++ b/core/java/android/content/pm/PackageManagerInternal.java @@ -308,6 +308,17 @@ public abstract class PackageManagerInternal { public abstract String getNameForUid(int uid); /** + * Marks a package as installed (or not installed) for a given user. + * + * @param pkg the package whose installation is to be set + * @param userId the user for whom to set it + * @param installed the new installed state + * @return true if the installed state changed as a result + */ + public abstract boolean setInstalled(PackageParser.Package pkg, + @UserIdInt int userId, boolean installed); + + /** * Request to perform the second phase of ephemeral resolution. * @param responseObj The response of the first phase of ephemeral resolution * @param origIntent The original intent that triggered ephemeral resolution diff --git a/core/java/android/content/pm/SharedLibraryNames.java b/core/java/android/content/pm/SharedLibraryNames.java index 4c66fc007856..a607a9ff682b 100644 --- a/core/java/android/content/pm/SharedLibraryNames.java +++ b/core/java/android/content/pm/SharedLibraryNames.java @@ -33,6 +33,4 @@ public class SharedLibraryNames { static final String ANDROID_TEST_RUNNER = "android.test.runner"; public static final String ORG_APACHE_HTTP_LEGACY = "org.apache.http.legacy"; - - public static final String ANDROID_TELEPHONY_COMMON = "telephony-common"; } diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java index e65d761cb77e..df652f190d04 100644 --- a/core/java/android/content/pm/UserInfo.java +++ b/core/java/android/content/pm/UserInfo.java @@ -126,6 +126,13 @@ public class UserInfo implements Parcelable { 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. + */ + public static final int PROFILE_FLAGS_MASK = FLAG_MANAGED_PROFILE; + + /** * @hide */ @IntDef(flag = true, prefix = "FLAG_", value = { diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 2420a6109155..567e26b4c2f6 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -1376,7 +1376,6 @@ public final class AssetManager implements AutoCloseable { /** * @hide */ - @TestApi @GuardedBy("this") public @Nullable Map<String, String> getOverlayableMap(String packageName) { synchronized (this) { @@ -1385,6 +1384,18 @@ public final class AssetManager implements AutoCloseable { } } + /** + * @hide + */ + @TestApi + @GuardedBy("this") + public @Nullable String getOverlayablesToString(String packageName) { + synchronized (this) { + ensureValidLocked(); + return nativeGetOverlayablesToString(mObject, packageName); + } + } + @GuardedBy("this") private void incRefsLocked(long id) { if (DEBUG_REFS) { @@ -1504,6 +1515,8 @@ public final class AssetManager implements AutoCloseable { private static native String[] nativeCreateIdmapsForStaticOverlaysTargetingAndroid(); private static native @Nullable Map nativeGetOverlayableMap(long ptr, @NonNull String packageName); + private static native @Nullable String nativeGetOverlayablesToString(long ptr, + @NonNull String packageName); // Global debug native methods. /** diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index c8276b25c52d..fc90096e5add 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemService; +import android.annotation.TestApi; import android.content.Context; import android.hardware.CameraInfo; import android.hardware.CameraStatus; @@ -47,6 +48,7 @@ import android.view.WindowManager; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; +import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; @@ -109,6 +111,21 @@ public final class CameraManager { } /** + * Similar to getCameraIdList(). However, getCamerIdListNoLazy() necessarily communicates with + * cameraserver in order to get the list of camera ids. This is to faciliate testing since some + * camera ids may go 'offline' without callbacks from cameraserver because of changes in + * SYSTEM_CAMERA permissions (though this is not a changeable permission, tests may call + * adopt(drop)ShellPermissionIdentity() and effectively change their permissions). This call + * affects the camera ids returned by getCameraIdList() as well. Tests which do adopt shell + * permission identity should not mix getCameraIdList() and getCameraListNoLazyCalls(). + */ + /** @hide */ + @TestApi + public String[] getCameraIdListNoLazy() throws CameraAccessException { + return CameraManagerGlobal.get().getCameraIdListNoLazy(); + } + + /** * Register a callback to be notified about camera device availability. * * <p>Registering the same callback again will replace the handler with the @@ -995,35 +1012,27 @@ public final class CameraManager { // Camera service is now down, leave mCameraService as null } } - - /** - * Get a list of all camera IDs that are at least PRESENT; ignore devices that are - * NOT_PRESENT or ENUMERATING, since they cannot be used by anyone. - */ - public String[] getCameraIdList() { + private String[] extractCameraIdListLocked() { String[] cameraIds = null; - synchronized(mLock) { - // Try to make sure we have an up-to-date list of camera devices. - connectCameraServiceLocked(); - - int idCount = 0; - for (int i = 0; i < mDeviceStatus.size(); i++) { - int status = mDeviceStatus.valueAt(i); - if (status == ICameraServiceListener.STATUS_NOT_PRESENT || - status == ICameraServiceListener.STATUS_ENUMERATING) continue; - idCount++; - } - cameraIds = new String[idCount]; - idCount = 0; - for (int i = 0; i < mDeviceStatus.size(); i++) { - int status = mDeviceStatus.valueAt(i); - if (status == ICameraServiceListener.STATUS_NOT_PRESENT || - status == ICameraServiceListener.STATUS_ENUMERATING) continue; - cameraIds[idCount] = mDeviceStatus.keyAt(i); - idCount++; - } + int idCount = 0; + for (int i = 0; i < mDeviceStatus.size(); i++) { + int status = mDeviceStatus.valueAt(i); + if (status == ICameraServiceListener.STATUS_NOT_PRESENT + || status == ICameraServiceListener.STATUS_ENUMERATING) continue; + idCount++; } - + cameraIds = new String[idCount]; + idCount = 0; + for (int i = 0; i < mDeviceStatus.size(); i++) { + int status = mDeviceStatus.valueAt(i); + if (status == ICameraServiceListener.STATUS_NOT_PRESENT + || status == ICameraServiceListener.STATUS_ENUMERATING) continue; + cameraIds[idCount] = mDeviceStatus.keyAt(i); + idCount++; + } + return cameraIds; + } + private static void sortCameraIds(String[] cameraIds) { // The sort logic must match the logic in // libcameraservice/common/CameraProviderManager.cpp::getAPI1CompatibleCameraDeviceIds Arrays.sort(cameraIds, new Comparator<String>() { @@ -1054,6 +1063,89 @@ public final class CameraManager { return s1.compareTo(s2); } }}); + + } + + public static boolean cameraStatusesContains(CameraStatus[] cameraStatuses, String id) { + for (CameraStatus c : cameraStatuses) { + if (c.cameraId.equals(id)) { + return true; + } + } + return false; + } + + public String[] getCameraIdListNoLazy() { + CameraStatus[] cameraStatuses; + ICameraServiceListener.Stub testListener = new ICameraServiceListener.Stub() { + @Override + public void onStatusChanged(int status, String id) throws RemoteException { + } + @Override + public void onTorchStatusChanged(int status, String id) throws RemoteException { + } + @Override + public void onCameraAccessPrioritiesChanged() { + }}; + + String[] cameraIds = null; + synchronized (mLock) { + connectCameraServiceLocked(); + try { + // The purpose of the addListener, removeListener pair here is to get a fresh + // list of camera ids from cameraserver. We do this since for in test processes, + // changes can happen w.r.t non-changeable permissions (eg: SYSTEM_CAMERA + // permissions can be effectively changed by calling + // adopt(drop)ShellPermissionIdentity()). + // Camera devices, which have their discovery affected by these permission + // changes, will not have clients get callbacks informing them about these + // devices going offline (in real world scenarios, these permissions aren't + // changeable). Future calls to getCameraIdList() will reflect the changes in + // the camera id list after getCameraIdListNoLazy() is called. + cameraStatuses = mCameraService.addListener(testListener); + mCameraService.removeListener(testListener); + for (CameraStatus c : cameraStatuses) { + onStatusChangedLocked(c.status, c.cameraId); + } + Set<String> deviceCameraIds = mDeviceStatus.keySet(); + ArrayList<String> deviceIdsToRemove = new ArrayList<String>(); + for (String deviceCameraId : deviceCameraIds) { + // Its possible that a device id was removed without a callback notifying + // us. This may happen in case a process 'drops' system camera permissions + // (even though the permission isn't a changeable one, tests may call + // adoptShellPermissionIdentity() and then dropShellPermissionIdentity(). + if (!cameraStatusesContains(cameraStatuses, deviceCameraId)) { + deviceIdsToRemove.add(deviceCameraId); + } + } + for (String id : deviceIdsToRemove) { + onStatusChangedLocked(ICameraServiceListener.STATUS_NOT_PRESENT, id); + } + } catch (ServiceSpecificException e) { + // Unexpected failure + throw new IllegalStateException("Failed to register a camera service listener", + e); + } catch (RemoteException e) { + // Camera service is now down, leave mCameraService as null + } + cameraIds = extractCameraIdListLocked(); + } + sortCameraIds(cameraIds); + return cameraIds; + } + + /** + * Get a list of all camera IDs that are at least PRESENT; ignore devices that are + * NOT_PRESENT or ENUMERATING, since they cannot be used by anyone. + */ + public String[] getCameraIdList() { + String[] cameraIds = null; + synchronized (mLock) { + // Try to make sure we have an up-to-date list of camera devices. + connectCameraServiceLocked(); + cameraIds = extractCameraIdListLocked(); + } + sortCameraIds(cameraIds); return cameraIds; } diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index a809b28c9204..2cf2a6514e77 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -85,6 +85,9 @@ public final class MacAddress implements Parcelable { private static final long OUI_MASK = MacAddress.fromString("ff:ff:ff:0:0:0").mAddr; private static final long NIC_MASK = MacAddress.fromString("0:0:0:ff:ff:ff").mAddr; private static final MacAddress BASE_GOOGLE_MAC = MacAddress.fromString("da:a1:19:0:0:0"); + /** Default wifi MAC address used for a special purpose **/ + private static final MacAddress DEFAULT_MAC_ADDRESS = + MacAddress.fromString(WifiInfo.DEFAULT_MAC_ADDRESS); // Internal representation of the MAC address as a single 8 byte long. // The encoding scheme sets the two most significant bytes to 0. The 6 bytes of the @@ -361,16 +364,7 @@ public final class MacAddress implements Parcelable { * @hide */ public static @NonNull MacAddress createRandomUnicastAddress() { - SecureRandom r = new SecureRandom(); - long addr = r.nextLong() & VALID_LONG_MASK; - addr |= LOCALLY_ASSIGNED_MASK; - addr &= ~MULTICAST_MASK; - MacAddress mac = new MacAddress(addr); - // WifiInfo.DEFAULT_MAC_ADDRESS is being used for another purpose, so do not use it here. - if (mac.toString().equals(WifiInfo.DEFAULT_MAC_ADDRESS)) { - return createRandomUnicastAddress(); - } - return mac; + return createRandomUnicastAddress(null, new SecureRandom()); } /** @@ -380,18 +374,23 @@ public final class MacAddress implements Parcelable { * The locally assigned bit is always set to 1. The multicast bit is always set to 0. * * @param base a base MacAddress whose OUI is used for generating the random address. + * If base == null then the OUI will also be randomized. * @param r a standard Java Random object used for generating the random address. * @return a random locally assigned MacAddress. * * @hide */ public static @NonNull MacAddress createRandomUnicastAddress(MacAddress base, Random r) { - long addr = (base.mAddr & OUI_MASK) | (NIC_MASK & r.nextLong()); + long addr; + if (base == null) { + addr = r.nextLong() & VALID_LONG_MASK; + } else { + addr = (base.mAddr & OUI_MASK) | (NIC_MASK & r.nextLong()); + } addr |= LOCALLY_ASSIGNED_MASK; addr &= ~MULTICAST_MASK; MacAddress mac = new MacAddress(addr); - // WifiInfo.DEFAULT_MAC_ADDRESS is being used for another purpose, so do not use it here. - if (mac.toString().equals(WifiInfo.DEFAULT_MAC_ADDRESS)) { + if (mac.equals(DEFAULT_MAC_ADDRESS)) { return createRandomUnicastAddress(base, r); } return mac; diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java index b6af82948da3..d4abf28d2e63 100644 --- a/core/java/android/os/SystemProperties.java +++ b/core/java/android/os/SystemProperties.java @@ -39,6 +39,13 @@ import java.util.HashMap; * Gives access to the system properties store. The system properties * store contains a list of string key-value pairs. * + * <p>Use this class only for the system properties that are local. e.g., within + * an app, a partition, or a module. For system properties used across the + * boundaries, formally define them in <code>*.sysprop</code> files and use the + * auto-generated methods. For more information, see <a href= + * "https://source.android.com/devices/architecture/sysprops-apis">Implementing + * System Properties as APIs</a>.</p> + * * {@hide} */ @SystemApi diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index eaf9929c56d0..9a3a7cea42dd 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -576,6 +576,8 @@ public class ZygoteProcess { argsForZygote.add("--mount-external-installer"); } else if (mountExternal == Zygote.MOUNT_EXTERNAL_LEGACY) { argsForZygote.add("--mount-external-legacy"); + } else if (mountExternal == Zygote.MOUNT_EXTERNAL_PASS_THROUGH) { + argsForZygote.add("--mount-external-pass-through"); } argsForZygote.add("--target-sdk-version=" + targetSdkVersion); diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 5b9205d16898..351462f8d68e 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -153,6 +153,11 @@ public class StorageManager { public static final String PROP_ISOLATED_STORAGE = "persist.sys.isolated_storage"; /** {@hide} */ public static final String PROP_ISOLATED_STORAGE_SNAPSHOT = "sys.isolated_storage_snapshot"; + /** {@hide} */ + public static final String PROP_FUSE = "persist.sys.fuse"; + /** {@hide} */ + public static final String PROP_FUSE_SNAPSHOT = "sys.fuse_snapshot"; + /** {@hide} */ public static final String UUID_PRIVATE_INTERNAL = null; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8b20f0bec7be..3c26df3c560b 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7631,6 +7631,19 @@ public final class Settings { "face_unlock_always_require_confirmation"; /** + * Whether or not a user should re enroll their face. + * + * Face unlock re enroll. + * 0 = No re enrollment. + * 1 = Re enrollment is suggested. + * 2 = Re enrollment is required after a set time period. + * 3 = Re enrollment is required immediately. + * + * @hide + */ + public static final String FACE_UNLOCK_RE_ENROLL = "face_unlock_re_enroll"; + + /** * Whether or not debugging is enabled. * @hide */ @@ -7881,14 +7894,6 @@ public final class Settings { public static final String DEVICE_PAIRED = "device_paired"; /** - * Integer state indicating whether package verifier is enabled. - * TODO(b/34259924): Remove this setting. - * - * @hide - */ - public static final String PACKAGE_VERIFIER_STATE = "package_verifier_state"; - - /** * Specifies additional package name for broadcasting the CMAS messages. * @hide */ diff --git a/core/java/android/service/textclassifier/TextClassifierService.java b/core/java/android/service/textclassifier/TextClassifierService.java index 5143f1820c2d..2470d197c3fc 100644 --- a/core/java/android/service/textclassifier/TextClassifierService.java +++ b/core/java/android/service/textclassifier/TextClassifierService.java @@ -58,8 +58,8 @@ import java.util.concurrent.Executors; * Abstract base class for the TextClassifier service. * * <p>A TextClassifier service provides text classification related features for the system. - * The system's default TextClassifierService is configured in - * {@code config_defaultTextClassifierService}. If this config has no value, a + * The system's default TextClassifierService provider is configured in + * {@code config_defaultTextClassifierPackage}. If this config has no value, a * {@link android.view.textclassifier.TextClassifierImpl} is loaded in the calling app's process. * * <p>See: {@link TextClassifier}. diff --git a/core/java/android/view/CompositionSamplingListener.java b/core/java/android/view/CompositionSamplingListener.java index 368445cde72c..677a559cd3b0 100644 --- a/core/java/android/view/CompositionSamplingListener.java +++ b/core/java/android/view/CompositionSamplingListener.java @@ -28,7 +28,7 @@ import java.util.concurrent.Executor; */ public abstract class CompositionSamplingListener { - private final long mNativeListener; + private long mNativeListener; private final Executor mExecutor; public CompositionSamplingListener(Executor executor) { @@ -36,13 +36,19 @@ public abstract class CompositionSamplingListener { mNativeListener = nativeCreate(this); } + public void destroy() { + if (mNativeListener == 0) { + return; + } + unregister(this); + nativeDestroy(mNativeListener); + mNativeListener = 0; + } + @Override protected void finalize() throws Throwable { try { - if (mNativeListener != 0) { - unregister(this); - nativeDestroy(mNativeListener); - } + destroy(); } finally { super.finalize(); } @@ -58,6 +64,9 @@ public abstract class CompositionSamplingListener { */ public static void register(CompositionSamplingListener listener, int displayId, SurfaceControl stopLayer, Rect samplingArea) { + if (listener.mNativeListener == 0) { + return; + } Preconditions.checkArgument(displayId == Display.DEFAULT_DISPLAY, "default display only for now"); long nativeStopLayerObject = stopLayer != null ? stopLayer.mNativeObject : 0; @@ -69,6 +78,9 @@ public abstract class CompositionSamplingListener { * Unregisters a sampling listener. */ public static void unregister(CompositionSamplingListener listener) { + if (listener.mNativeListener == 0) { + return; + } nativeUnregister(listener.mNativeListener); } diff --git a/core/java/android/view/IPinnedStackListener.aidl b/core/java/android/view/IPinnedStackListener.aidl index 806d81e39cca..f4bee575f811 100644 --- a/core/java/android/view/IPinnedStackListener.aidl +++ b/core/java/android/view/IPinnedStackListener.aidl @@ -55,14 +55,6 @@ oneway interface IPinnedStackListener { void onImeVisibilityChanged(boolean imeVisible, int imeHeight); /** - * Called when window manager decides to adjust the pinned stack bounds because of the shelf, or - * when the listener is first registered to allow the listener to synchronized its state with - * the controller. This call will always be followed by a onMovementBoundsChanged() call - * with fromShelfAdjustment set to {@code true}. - */ - void onShelfVisibilityChanged(boolean shelfVisible, int shelfHeight); - - /** * Called when window manager decides to adjust the minimized state, or when the listener * is first registered to allow the listener to synchronized its state with the controller. */ diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 1c3294858db8..49e8800a36c6 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -326,12 +326,6 @@ interface IWindowManager oneway void setPipVisibility(boolean visible); /** - * Called by System UI to notify of changes to the visibility and height of the shelf. - */ - @UnsupportedAppUsage - void setShelfHeight(boolean visible, int shelfHeight); - - /** * Called by System UI to enable or disable haptic feedback on the navigation bar buttons. */ @UnsupportedAppUsage diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 262b9e50ad00..06ff568202d5 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -675,6 +675,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall mTmpTransaction.remove(mBackgroundControl); mBackgroundControl = null; } + mSurface.release(); mTmpTransaction.apply(); } } @@ -962,7 +963,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall } finally { mIsCreating = false; if (mSurfaceControl != null && !mSurfaceCreated) { - mSurface.release(); releaseSurfaces(); } } @@ -1128,11 +1128,12 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall return; } - if (frameNumber > 0) { - final ViewRootImpl viewRoot = getViewRootImpl(); - - mRtTransaction.deferTransactionUntilSurface(mSurfaceControl, viewRoot.mSurface, - frameNumber); + final ViewRootImpl viewRoot = getViewRootImpl(); + if (frameNumber > 0 && viewRoot != null) { + if (viewRoot.mSurface.isValid()) { + mRtTransaction.deferTransactionUntilSurface(mSurfaceControl, viewRoot.mSurface, + frameNumber); + } } mRtTransaction.hide(mSurfaceControl); @@ -1143,6 +1144,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall mRtTransaction.remove(mBackgroundControl); mSurfaceControl = null; mBackgroundControl = null; + mSurface.release(); } mRtHandlingPositionUpdates = false; } diff --git a/core/java/android/view/accessibility/AccessibilityNodeProvider.java b/core/java/android/view/accessibility/AccessibilityNodeProvider.java index 4b25378755f1..f4c7b96b8edc 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeProvider.java +++ b/core/java/android/view/accessibility/AccessibilityNodeProvider.java @@ -44,28 +44,126 @@ import java.util.List; * View itself. Similarly the returned instance is responsible for performing accessibility * actions on any virtual view or the root view itself. For example: * </p> - * <pre> - * getAccessibilityNodeProvider( - * if (mAccessibilityNodeProvider == null) { - * mAccessibilityNodeProvider = new AccessibilityNodeProvider() { - * public boolean performAction(int action, int virtualDescendantId) { - * // Implementation. - * return false; + * <div> + * <div class="ds-selector-tabs"><section><h3 id="kotlin">Kotlin</h3> + * <pre class="prettyprint lang-kotlin"> + * // "view" is the View instance on which this class performs accessibility functions. + * class MyCalendarViewAccessibilityDelegate( + * private var view: MyCalendarView) : AccessibilityDelegate() { + * override fun getAccessibilityNodeProvider(host: View): AccessibilityNodeProvider { + * return object : AccessibilityNodeProvider() { + * override fun createAccessibilityNodeInfo(virtualViewId: Int): + * AccessibilityNodeInfo? { + * when (virtualViewId) { + * <var>host-view-id</var> -> { + * val node = AccessibilityNodeInfo.obtain(view) + * node.addChild(view, <var>child-view-id</var>) + * // Set other attributes like screenReaderFocusable + * // and contentDescription. + * return node + * } + * <var>child-view-id</var> -> { + * val node = AccessibilityNodeInfo + * .obtain(view, virtualViewId) + * node.setParent(view) + * node.addAction(ACTION_SCROLL_UP) + * node.addAction(ACTION_SCROLL_DOWN) + * // Set other attributes like focusable and visibleToUser. + * node.setBoundsInScreen( + * Rect(<var>coords-of-edges-relative-to-screen</var>)) + * return node + * } + * else -> return null * } + * } * - * public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String text, - * int virtualDescendantId) { - * // Implementation. - * return null; + * override fun performAction( + * virtualViewId: Int, + * action: Int, + * arguments: Bundle + * ): Boolean { + * if (virtualViewId == <var>host-view-id</var>) { + * return view.performAccessibilityAction(action, arguments) * } + * when (action) { + * ACTION_SCROLL_UP.id -> { + * // Implement logic in a separate method. + * navigateToPreviousMonth() * - * public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualDescendantId) { - * // Implementation. - * return null; + * return true + * } + * ACTION_SCROLL_DOWN.id -> + * // Implement logic in a separate method. + * navigateToNextMonth() + * + * return true + * else -> return false * } - * }); - * return mAccessibilityNodeProvider; + * } + * } + * } + * } * </pre> + * </section><section><h3 id="java">Java</h3> + * <pre class="prettyprint lang-java"> + * final class MyCalendarViewAccessibilityDelegate extends AccessibilityDelegate { + * // The View instance on which this class performs accessibility functions. + * private final MyCalendarView view; + * + * MyCalendarViewAccessibilityDelegate(MyCalendarView view) { + * this.view = view; + * } + * + * @Override + * public AccessibilityNodeProvider getAccessibilityNodeProvider(View host) { + * return new AccessibilityNodeProvider() { + * @Override + * @Nullable + * public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) { + * if (virtualViewId == <var>host-view-id</var>) { + * AccessibilityNodeInfo node = AccessibilityNodeInfo.obtain(view); + * node.addChild(view, <var>child-view-id</var>); + * // Set other attributes like screenReaderFocusable and contentDescription. + * return node; + * } else if (virtualViewId == <var>child-view-id</var>) { + * AccessibilityNodeInfo node = + * AccessibilityNodeInfo.obtain(view, virtualViewId); + * node.setParent(view); + * node.addAction(ACTION_SCROLL_UP); + * node.addAction(ACTION_SCROLL_DOWN); + * // Set other attributes like focusable and visibleToUser. + * node.setBoundsInScreen( + * new Rect(<var>coordinates-of-edges-relative-to-screen</var>)); + * return node; + * } else { + * return null; + * } + * } + * + * @Override + * public boolean performAction(int virtualViewId, int action, Bundle arguments) { + * if (virtualViewId == <var>host-view-id</var>) { + * return view.performAccessibilityAction(action, arguments); + * } + * + * if (action == ACTION_SCROLL_UP.getId()) { + * // Implement logic in a separate method. + * navigateToPreviousMonth(); + * + * return true; + * } else if (action == ACTION_SCROLL_DOWN.getId()) { + * // Implement logic in a separate method. + * navigateToNextMonth(); + * + * return true; + * } else { + * return false; + * } + * } + * }; + * } + * } + * </pre></section></div></div> */ public abstract class AccessibilityNodeProvider { diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java index 80de6fc65f90..562cc4ffeeaa 100644 --- a/core/java/android/widget/SimpleMonthView.java +++ b/core/java/android/widget/SimpleMonthView.java @@ -1103,6 +1103,7 @@ class SimpleMonthView extends View { } node.setEnabled(isDayEnabled); + node.setClickable(true); if (virtualViewId == mActivatedDay) { // TODO: This should use activated once that's supported. diff --git a/core/java/com/android/internal/compat/ChangeReporter.java b/core/java/com/android/internal/compat/ChangeReporter.java index 1ce071bd005a..5ea970d4c746 100644 --- a/core/java/com/android/internal/compat/ChangeReporter.java +++ b/core/java/com/android/internal/compat/ChangeReporter.java @@ -16,14 +16,89 @@ package com.android.internal.compat; +import android.util.Log; +import android.util.Slog; import android.util.StatsLog; +import com.android.internal.annotations.GuardedBy; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + /** * A helper class to report changes to stats log. * * @hide */ public final class ChangeReporter { + private static final String TAG = "CompatibilityChangeReporter"; + private int mSource; + + private final class ChangeReport { + int mUid; + long mChangeId; + int mState; + + ChangeReport(int uid, long changeId, int state) { + mUid = uid; + mChangeId = changeId; + mState = state; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ChangeReport that = (ChangeReport) o; + return mUid == that.mUid + && mChangeId == that.mChangeId + && mState == that.mState; + } + + @Override + public int hashCode() { + return Objects.hash(mUid, mChangeId, mState); + } + } + + @GuardedBy("mReportedChanges") + private Set<ChangeReport> mReportedChanges = new HashSet<>(); + + public ChangeReporter(int source) { + mSource = source; + } + + /** + * Report the change to stats log. + * + * @param uid affected by the change + * @param changeId the reported change id + * @param state of the reported change - enabled/disabled/only logged + */ + public void reportChange(int uid, long changeId, int state) { + debugLog(uid, changeId, state); + ChangeReport report = new ChangeReport(uid, changeId, state); + synchronized (mReportedChanges) { + if (!mReportedChanges.contains(report)) { + StatsLog.write(StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED, uid, changeId, + state, mSource); + mReportedChanges.add(report); + } + } + } + + private void debugLog(int uid, long changeId, int state) { + //TODO(b/138374585): Implement rate limiting for the logs. + String message = String.format("Compat change id reported: %d; UID %d; state: %s", changeId, + uid, stateToString(state)); + if (mSource == StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__SOURCE__SYSTEM_SERVER) { + Slog.d(TAG, message); + } else { + Log.d(TAG, message); + } + + } /** * Transforms StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__STATE enum to a string. @@ -43,31 +118,4 @@ public final class ChangeReporter { return "UNKNOWN"; } } - - /** - * Constructs and returns a string to be logged to logcat when a change is reported. - * - * @param uid affected by the change - * @param changeId the reported change id - * @param state of the reported change - enabled/disabled/only logged - * @return string to log - */ - public static String createLogString(int uid, long changeId, int state) { - return String.format("Compat change id reported: %d; UID %d; state: %s", changeId, uid, - stateToString(state)); - } - - /** - * Report the change to stats log. - * - * @param uid affected by the change - * @param changeId the reported change id - * @param state of the reported change - enabled/disabled/only logged - * @param source of the logging - app process or system server - */ - public void reportChange(int uid, long changeId, int state, int source) { - //TODO(b/138374585): Implement rate limiting for stats log. - StatsLog.write(StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED, uid, changeId, - state, source); - } } diff --git a/core/java/com/android/internal/compat/IPlatformCompat.aidl b/core/java/com/android/internal/compat/IPlatformCompat.aidl index 9049c3aea7ec..e415b41459ab 100644 --- a/core/java/com/android/internal/compat/IPlatformCompat.aidl +++ b/core/java/com/android/internal/compat/IPlatformCompat.aidl @@ -33,15 +33,30 @@ interface IPlatformCompat * Reports that a compatibility change is affecting an app process now. * * <p>Note: for changes that are gated using {@link #isChangeEnabled(long, ApplicationInfo)}, - * you do not need to call this API directly. The change will be reported for you in the case - * that {@link #isChangeEnabled(long, ApplicationInfo)} returns {@code true}. + * you do not need to call this API directly. The change will be reported for you. * * @param changeId The ID of the compatibility change taking effect. - * @param appInfo Representing the affected app. + * @param appInfo Representing the affected app. */ void reportChange(long changeId, in ApplicationInfo appInfo); /** + * Reports that a compatibility change is affecting an app process now. + * + * <p>Same as {@link #reportChange(long, ApplicationInfo)}, except it receives a package name + * instead of an {@link ApplicationInfo} + * object, and finds an app info object based on the package name. Returns {@code true} if + * there is no installed package by that name. + * + * <p>Note: for changes that are gated using {@link #isChangeEnabled(long, String)}, + * you do not need to call this API directly. The change will be reported for you. + * + * @param changeId The ID of the compatibility change taking effect. + * @param packageName The package name of the app in question. + */ + void reportChangeByPackageName(long changeId, in String packageName); + + /** * Query if a given compatibility change is enabled for an app process. This method should * be called when implementing functionality on behalf of the affected app. * @@ -49,13 +64,35 @@ interface IPlatformCompat * change, resulting in differing behaviour compared to earlier releases. If this method returns * {@code false}, the calling code should behave as it did in earlier releases. * - * <p>When this method returns {@code true}, it will also report the change as - * {@link #reportChange(long, ApplicationInfo)} would, so there is no need to call that method - * directly. + * <p>It will also report the change as {@link #reportChange(long, ApplicationInfo)} would, so + * there is no need to call that method directly. * * @param changeId The ID of the compatibility change in question. - * @param appInfo Representing the app in question. + * @param appInfo Representing the app in question. * @return {@code true} if the change is enabled for the current app. */ boolean isChangeEnabled(long changeId, in ApplicationInfo appInfo); + + /** + * Query if a given compatibility change is enabled for an app process. This method should + * be called when implementing functionality on behalf of the affected app. + * + * <p>Same as {@link #isChangeEnabled(long, ApplicationInfo)}, except it receives a package name + * instead of an {@link ApplicationInfo} + * object, and finds an app info object based on the package name. Returns {@code true} if + * there is no installed package by that name. + * + * <p>If this method returns {@code true}, the calling code should implement the compatibility + * change, resulting in differing behaviour compared to earlier releases. If this method + * returns + * {@code false}, the calling code should behave as it did in earlier releases. + * + * <p>It will also report the change as {@link #reportChange(long, String)} would, so there is + * no need to call that method directly. + * + * @param changeId The ID of the compatibility change in question. + * @param packageName The package name of the app in question. + * @return {@code true} if the change is enabled for the current app. + */ + boolean isChangeEnabledByPackageName(long changeId, in String packageName); }
\ No newline at end of file diff --git a/core/java/com/android/internal/infra/ServiceConnector.java b/core/java/com/android/internal/infra/ServiceConnector.java index d6862f0188ce..98d679eb776b 100644 --- a/core/java/com/android/internal/infra/ServiceConnector.java +++ b/core/java/com/android/internal/infra/ServiceConnector.java @@ -32,6 +32,7 @@ import android.text.TextUtils; import android.util.DebugUtils; import android.util.Log; +import com.android.internal.util.Preconditions; import com.android.internal.util.function.pooled.PooledLambda; import java.io.PrintWriter; @@ -351,7 +352,7 @@ public interface ServiceConnector<I extends IInterface> { @Override public <R> CompletionAwareJob<I, R> postForResult(@NonNull Job<I, R> job) { CompletionAwareJob<I, R> task = new CompletionAwareJob<>(); - task.mDelegate = job; + task.mDelegate = Preconditions.checkNotNull(job); enqueue(task); return task; } @@ -359,7 +360,7 @@ public interface ServiceConnector<I extends IInterface> { @Override public <R> AndroidFuture<R> postAsync(@NonNull Job<I, CompletableFuture<R>> job) { CompletionAwareJob<I, R> task = new CompletionAwareJob<>(); - task.mDelegate = (Job) job; + task.mDelegate = Preconditions.checkNotNull((Job) job); task.mAsync = true; enqueue(task); return task; diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 1de2e7272f4d..d6caa0930243 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -192,6 +192,15 @@ public class RuntimeInit { } } + /** + * Common initialization that (unlike {@link #commonInit()} should happen prior to + * the Zygote fork. + */ + public static void preForkInit() { + if (DEBUG) Slog.d(TAG, "Entered preForkInit."); + RuntimeInit.enableDdms(); + } + @UnsupportedAppUsage protected static final void commonInit() { if (DEBUG) Slog.d(TAG, "Entered RuntimeInit!"); @@ -324,7 +333,7 @@ public class RuntimeInit { @UnsupportedAppUsage public static final void main(String[] argv) { - enableDdms(); + preForkInit(); if (argv.length == 2 && argv[1].equals("application")) { if (DEBUG) Slog.d(TAG, "RuntimeInit: Starting application"); redirectLogStreams(); @@ -418,7 +427,7 @@ public class RuntimeInit { /** * Enable DDMS. */ - static final void enableDdms() { + private static void enableDdms() { // Register handlers for DDM messages. android.ddm.DdmRegister.registerHandlers(); } diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 9d4cdc73b452..3ce3838a212e 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -135,6 +135,9 @@ public final class Zygote { /** Read-write external storage should be mounted instead of package sandbox */ public static final int MOUNT_EXTERNAL_FULL = IVold.REMOUNT_MODE_FULL; + /** The lower file system should be bind mounted directly on external storage */ + public static final int MOUNT_EXTERNAL_PASS_THROUGH = IVold.REMOUNT_MODE_PASS_THROUGH; + /** Number of bytes sent to the Zygote over USAP pipes or the pool event FD */ static final int USAP_MANAGEMENT_MESSAGE_BYTES = 8; diff --git a/core/java/com/android/internal/os/ZygoteArguments.java b/core/java/com/android/internal/os/ZygoteArguments.java index abc416061cc8..a23e659db49a 100644 --- a/core/java/com/android/internal/os/ZygoteArguments.java +++ b/core/java/com/android/internal/os/ZygoteArguments.java @@ -362,6 +362,8 @@ class ZygoteArguments { mMountExternal = Zygote.MOUNT_EXTERNAL_INSTALLER; } else if (arg.equals("--mount-external-legacy")) { mMountExternal = Zygote.MOUNT_EXTERNAL_LEGACY; + } else if (arg.equals("--mount-external-pass-through")) { + mMountExternal = Zygote.MOUNT_EXTERNAL_PASS_THROUGH; } else if (arg.equals("--query-abi-list")) { mAbiListQuery = true; } else if (arg.equals("--get-pid")) { diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 3be1a1aefe57..158700b2a449 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -847,7 +847,7 @@ public class ZygoteInit { TimingsTraceLog bootTimingsTraceLog = new TimingsTraceLog(bootTimeTag, Trace.TRACE_TAG_DALVIK); bootTimingsTraceLog.traceBegin("ZygoteInit"); - RuntimeInit.enableDdms(); + RuntimeInit.preForkInit(); boolean startSystemServer = false; String zygoteSocketName = "zygote"; diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index 7cd3e95c6499..697825dcefd7 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -35,6 +35,7 @@ import android.util.Slog; import android.util.SparseArray; import android.util.Xml; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.XmlUtils; import libcore.io.IoUtils; @@ -50,6 +51,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Set; /** * Loads global system configuration info. @@ -209,6 +211,10 @@ public class SystemConfig { private final ArraySet<String> mBugreportWhitelistedPackages = new ArraySet<>(); + // Map of packagesNames to userTypes. Stored temporarily until cleared by UserManagerService(). + private ArrayMap<String, Set<String>> mPackageToUserTypeWhitelist = new ArrayMap<>(); + private ArrayMap<String, Set<String>> mPackageToUserTypeBlacklist = new ArrayMap<>(); + public static SystemConfig getInstance() { if (!isSystemProcess()) { Slog.wtf(TAG, "SystemConfig is being accessed by a process other than " @@ -359,7 +365,48 @@ public class SystemConfig { return mBugreportWhitelistedPackages; } + /** + * Gets map of packagesNames to userTypes, dictating on which user types each package should be + * initially installed, and then removes this map from SystemConfig. + * Called by UserManagerService when it is constructed. + */ + public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeWhitelist() { + ArrayMap<String, Set<String>> r = mPackageToUserTypeWhitelist; + mPackageToUserTypeWhitelist = new ArrayMap<>(0); + return r; + } + + /** + * Gets map of packagesNames to userTypes, dictating on which user types each package should NOT + * be initially installed, even if they are whitelisted, and then removes this map from + * SystemConfig. + * Called by UserManagerService when it is constructed. + */ + public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeBlacklist() { + ArrayMap<String, Set<String>> r = mPackageToUserTypeBlacklist; + mPackageToUserTypeBlacklist = new ArrayMap<>(0); + return r; + } + + /** + * Only use for testing. Do NOT use in production code. + * @param readPermissions false to create an empty SystemConfig; true to read the permissions. + */ + @VisibleForTesting + protected SystemConfig(boolean readPermissions) { + if (readPermissions) { + Slog.w(TAG, "Constructing a test SystemConfig"); + readAllPermissions(); + } else { + Slog.w(TAG, "Constructing an empty test SystemConfig"); + } + } + SystemConfig() { + readAllPermissions(); + } + + private void readAllPermissions() { // Read configuration from system readPermissions(Environment.buildPath( Environment.getRootDirectory(), "etc", "sysconfig"), ALLOW_ALL); @@ -419,7 +466,8 @@ public class SystemConfig { Environment.getSystemExtDirectory(), "etc", "permissions"), ALLOW_ALL); } - void readPermissions(File libraryDir, int permissionFlag) { + @VisibleForTesting + public void readPermissions(File libraryDir, int permissionFlag) { // Read permissions from given directory. if (!libraryDir.exists() || !libraryDir.isDirectory()) { if (permissionFlag == ALLOW_ALL) { @@ -954,6 +1002,11 @@ public class SystemConfig { } XmlUtils.skipCurrentTag(parser); } break; + case "install-in-user-type": { + // NB: We allow any directory permission to declare install-in-user-type. + readInstallInUserType(parser, + mPackageToUserTypeWhitelist, mPackageToUserTypeBlacklist); + } break; default: { Slog.w(TAG, "Tag " + name + " is unknown in " + permFile + " at " + parser.getPositionDescription()); @@ -1091,6 +1144,53 @@ public class SystemConfig { } } + private void readInstallInUserType(XmlPullParser parser, + Map<String, Set<String>> doInstallMap, + Map<String, Set<String>> nonInstallMap) + throws IOException, XmlPullParserException { + final String packageName = parser.getAttributeValue(null, "package"); + if (TextUtils.isEmpty(packageName)) { + Slog.w(TAG, "package is required for <install-in-user-type> in " + + parser.getPositionDescription()); + return; + } + + Set<String> userTypesYes = doInstallMap.get(packageName); + Set<String> userTypesNo = nonInstallMap.get(packageName); + final int depth = parser.getDepth(); + while (XmlUtils.nextElementWithin(parser, depth)) { + final String name = parser.getName(); + if ("install-in".equals(name)) { + final String userType = parser.getAttributeValue(null, "user-type"); + if (TextUtils.isEmpty(userType)) { + Slog.w(TAG, "user-type is required for <install-in-user-type> in " + + parser.getPositionDescription()); + continue; + } + if (userTypesYes == null) { + userTypesYes = new ArraySet<>(); + doInstallMap.put(packageName, userTypesYes); + } + userTypesYes.add(userType); + } else if ("do-not-install-in".equals(name)) { + final String userType = parser.getAttributeValue(null, "user-type"); + if (TextUtils.isEmpty(userType)) { + Slog.w(TAG, "user-type is required for <install-in-user-type> in " + + parser.getPositionDescription()); + continue; + } + if (userTypesNo == null) { + userTypesNo = new ArraySet<>(); + nonInstallMap.put(packageName, userTypesNo); + } + userTypesNo.add(userType); + } else { + Slog.w(TAG, "unrecognized tag in <install-in-user-type> in " + + parser.getPositionDescription()); + } + } + } + void readOemPermissions(XmlPullParser parser) throws IOException, XmlPullParserException { final String packageName = parser.getAttributeValue(null, "package"); if (TextUtils.isEmpty(packageName)) { diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 5a0f16e589ce..e3b8560ae749 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -54,6 +54,8 @@ cc_library_shared { whole_static_libs: ["libandroid_graphics"], + export_static_lib_headers: ["libandroid_graphics"], + shared_libs: [ "libbase", "libcutils", @@ -337,7 +339,9 @@ cc_library_static { cppflags: ["-Wno-conversion-null"], srcs: [ + "android/graphics/apex/android_bitmap.cpp", "android/graphics/apex/android_region.cpp", + "android/graphics/apex/android_paint.cpp", "android_graphics_Canvas.cpp", "android_graphics_ColorSpace.cpp", @@ -390,7 +394,6 @@ cc_library_static { ], export_include_dirs: [ - ".", "android/graphics/apex/include", ], diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 49b9eba76b1a..d46fe8d3388a 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -696,26 +696,32 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p // Read if we are using the profile configuration, do this at the start since the last ART args // take precedence. property_get("dalvik.vm.profilebootclasspath", propBuf, ""); - std::string profile_boot_class_path = propBuf; + std::string profile_boot_class_path_flag = propBuf; // Empty means the property is unset and we should default to the phenotype property. // The possible values are {"true", "false", ""} - if (profile_boot_class_path.empty()) { - profile_boot_class_path = server_configurable_flags::GetServerConfigurableFlag( + if (profile_boot_class_path_flag.empty()) { + profile_boot_class_path_flag = server_configurable_flags::GetServerConfigurableFlag( RUNTIME_NATIVE_BOOT_NAMESPACE, PROFILE_BOOT_CLASS_PATH, /*default_value=*/ ""); } - if (profile_boot_class_path == "true") { + const bool profile_boot_class_path = (profile_boot_class_path_flag == "true"); + if (profile_boot_class_path) { + addOption("-Xcompiler-option"); + addOption("--count-hotness-in-compiled-code"); addOption("-Xps-profile-boot-class-path"); addOption("-Xps-profile-aot-code"); addOption("-Xjitsaveprofilinginfo"); } - std::string use_apex_image = + std::string use_apex_image_flag = server_configurable_flags::GetServerConfigurableFlag(RUNTIME_NATIVE_BOOT_NAMESPACE, ENABLE_APEX_IMAGE, /*default_value=*/ ""); - if (use_apex_image == "true") { + // Use the APEX boot image for boot class path profiling to get JIT samples on BCP methods. + // Also use the APEX boot image if it's explicitly enabled via configuration flag. + const bool use_apex_image = profile_boot_class_path || (use_apex_image_flag == "true"); + if (use_apex_image) { addOption(kApexImageOption); ALOGI("Using Apex boot image: '%s'\n", kApexImageOption); } else if (parseRuntimeOption("dalvik.vm.boot-image", bootImageBuf, "-Ximage:")) { @@ -1169,6 +1175,12 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options return; } + const char* i18nRootDir = getenv("ANDROID_I18N_ROOT"); + if (i18nRootDir == NULL) { + LOG_FATAL("No runtime directory specified with ANDROID_I18N_ROOT environment variable."); + return; + } + const char* tzdataRootDir = getenv("ANDROID_TZDATA_ROOT"); if (tzdataRootDir == NULL) { LOG_FATAL("No tz data directory specified with ANDROID_TZDATA_ROOT environment variable."); diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 18a1b43d3f5f..89c12f88594d 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -265,6 +265,20 @@ void imageInfo(JNIEnv* env, jobject bitmap, AndroidBitmapInfo* info) { info->format = ANDROID_BITMAP_FORMAT_NONE; break; } + switch (imageInfo.alphaType()) { + case kUnknown_SkAlphaType: + LOG_ALWAYS_FATAL("Bitmap has no alpha type"); + break; + case kOpaque_SkAlphaType: + info->flags |= ANDROID_BITMAP_FLAGS_ALPHA_OPAQUE; + break; + case kPremul_SkAlphaType: + info->flags |= ANDROID_BITMAP_FLAGS_ALPHA_PREMUL; + break; + case kUnpremul_SkAlphaType: + info->flags |= ANDROID_BITMAP_FLAGS_ALPHA_UNPREMUL; + break; + } } void* lockPixels(JNIEnv* env, jobject bitmap) { diff --git a/core/jni/android/graphics/Bitmap.h b/core/jni/android/graphics/Bitmap.h index 06e31a1518ca..59adbb207a0c 100644 --- a/core/jni/android/graphics/Bitmap.h +++ b/core/jni/android/graphics/Bitmap.h @@ -39,8 +39,6 @@ jobject createBitmap(JNIEnv* env, Bitmap* bitmap, jobject ninePatchInsets = nullptr, int density = -1); -void toSkBitmap(jlong bitmapHandle, SkBitmap* outBitmap); - Bitmap& toBitmap(JNIEnv* env, jobject bitmap); Bitmap& toBitmap(jlong bitmapHandle); diff --git a/core/jni/android/graphics/apex/TypeCast.h b/core/jni/android/graphics/apex/TypeCast.h new file mode 100644 index 000000000000..96721d007951 --- /dev/null +++ b/core/jni/android/graphics/apex/TypeCast.h @@ -0,0 +1,70 @@ +/* + * 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 ANDROID_GRAPHICS_TYPECAST_H +#define ANDROID_GRAPHICS_TYPECAST_H + +struct ABitmap; +struct ACanvas; +struct APaint; + +namespace android { + + class Bitmap; + class Canvas; + class Paint; + + class TypeCast { + public: + static inline Bitmap& toBitmapRef(const ABitmap* bitmap) { + return const_cast<Bitmap&>(reinterpret_cast<const Bitmap&>(*bitmap)); + } + + static inline Bitmap* toBitmap(ABitmap* bitmap) { + return reinterpret_cast<Bitmap*>(bitmap); + } + + static inline ABitmap* toABitmap(Bitmap* bitmap) { + return reinterpret_cast<ABitmap*>(bitmap); + } + + static inline Canvas* toCanvas(ACanvas* canvas) { + return reinterpret_cast<Canvas*>(canvas); + } + + static inline ACanvas* toACanvas(Canvas* canvas) { + return reinterpret_cast<ACanvas *>(canvas); + } + + static inline const Paint& toPaintRef(const APaint* paint) { + return reinterpret_cast<const Paint&>(*paint); + } + + static inline const Paint* toPaint(const APaint* paint) { + return reinterpret_cast<const Paint*>(paint); + } + + static inline Paint* toPaint(APaint* paint) { + return reinterpret_cast<Paint*>(paint); + } + + static inline APaint* toAPaint(Paint* paint) { + return reinterpret_cast<APaint*>(paint); + } + }; +}; // namespace android + +#endif // ANDROID_GRAPHICS_TYPECAST_H diff --git a/core/jni/android/graphics/apex/android_bitmap.cpp b/core/jni/android/graphics/apex/android_bitmap.cpp new file mode 100644 index 000000000000..96cc5db8a5a4 --- /dev/null +++ b/core/jni/android/graphics/apex/android_bitmap.cpp @@ -0,0 +1,106 @@ +/* + * 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/graphics/bitmap.h" +#include "Bitmap.h" +#include "TypeCast.h" + +#include <hwui/Bitmap.h> + +using namespace android; + +ABitmap* ABitmap_acquireBitmapFromJava(JNIEnv* env, jobject bitmapObj) { + Bitmap& bitmap = android::bitmap::toBitmap(env, bitmapObj); + bitmap.ref(); + return TypeCast::toABitmap(&bitmap); +} + +void ABitmap_acquireRef(ABitmap* bitmap) { + SkSafeRef(TypeCast::toBitmap(bitmap)); +} + +void ABitmap_releaseRef(ABitmap* bitmap) { + SkSafeUnref(TypeCast::toBitmap(bitmap)); +} + +static AndroidBitmapFormat getFormat(Bitmap* bitmap) { + switch (bitmap->colorType()) { + case kN32_SkColorType: + return ANDROID_BITMAP_FORMAT_RGBA_8888; + case kRGB_565_SkColorType: + return ANDROID_BITMAP_FORMAT_RGB_565; + case kARGB_4444_SkColorType: + return ANDROID_BITMAP_FORMAT_RGBA_4444; + case kAlpha_8_SkColorType: + return ANDROID_BITMAP_FORMAT_A_8; + case kRGBA_F16_SkColorType: + return ANDROID_BITMAP_FORMAT_RGBA_F16; + default: + return ANDROID_BITMAP_FORMAT_NONE; + } +} + +static SkColorType getColorType(AndroidBitmapFormat format) { + switch (format) { + case ANDROID_BITMAP_FORMAT_RGBA_8888: + return kN32_SkColorType; + case ANDROID_BITMAP_FORMAT_RGB_565: + return kRGB_565_SkColorType; + case ANDROID_BITMAP_FORMAT_RGBA_4444: + return kARGB_4444_SkColorType; + case ANDROID_BITMAP_FORMAT_A_8: + return kAlpha_8_SkColorType; + case ANDROID_BITMAP_FORMAT_RGBA_F16: + return kRGBA_F16_SkColorType; + default: + return kUnknown_SkColorType; + } +} + +ABitmap* ABitmap_copy(ABitmap* srcBitmapHandle, AndroidBitmapFormat dstFormat) { + SkColorType dstColorType = getColorType(dstFormat); + if (srcBitmapHandle && dstColorType != kUnknown_SkColorType) { + SkBitmap srcBitmap; + TypeCast::toBitmap(srcBitmapHandle)->getSkBitmap(&srcBitmap); + + sk_sp<Bitmap> dstBitmap = + Bitmap::allocateHeapBitmap(srcBitmap.info().makeColorType(dstColorType)); + if (dstBitmap && srcBitmap.readPixels(dstBitmap->info(), dstBitmap->pixels(), + dstBitmap->rowBytes(), 0, 0)) { + return TypeCast::toABitmap(dstBitmap.release()); + } + } + return nullptr; +} + +AndroidBitmapInfo ABitmap_getInfo(ABitmap* bitmapHandle) { + Bitmap* bitmap = TypeCast::toBitmap(bitmapHandle); + + AndroidBitmapInfo info; + info.width = bitmap->width(); + info.height = bitmap->height(); + info.stride = bitmap->rowBytes(); + info.format = getFormat(bitmap); + return info; +} + +void* ABitmap_getPixels(ABitmap* bitmapHandle) { + Bitmap* bitmap = TypeCast::toBitmap(bitmapHandle); + if (bitmap->isHardware()) { + return nullptr; + } + return bitmap->pixels(); +} diff --git a/core/jni/android/graphics/apex/android_canvas.cpp b/core/jni/android/graphics/apex/android_canvas.cpp index 7a4495f4f259..527a745426e3 100644 --- a/core/jni/android/graphics/apex/android_canvas.cpp +++ b/core/jni/android/graphics/apex/android_canvas.cpp @@ -16,6 +16,7 @@ #include "android/graphics/canvas.h" +#include "TypeCast.h" #include "GraphicsJNI.h" #include <hwui/Canvas.h> @@ -25,14 +26,6 @@ using namespace android; -static inline Canvas* toCanvas(ACanvas* aCanvas) { - return reinterpret_cast<Canvas*>(aCanvas); -} - -static inline ACanvas* toACanvas(Canvas* canvas) { - return reinterpret_cast<ACanvas*>(canvas); -} - bool ACanvas_isSupportedPixelFormat(int32_t bufferFormat) { ANativeWindow_Buffer buffer { 0, 0, 0, bufferFormat, nullptr, {0} }; const SkColorType colorType = uirenderer::ANativeWindowToImageInfo(buffer, nullptr).colorType(); @@ -40,11 +33,11 @@ bool ACanvas_isSupportedPixelFormat(int32_t bufferFormat) { } ACanvas* ACanvas_getNativeHandleFromJava(JNIEnv* env, jobject canvasObj) { - return toACanvas(GraphicsJNI::getNativeCanvas(env, canvasObj)); + return TypeCast::toACanvas(GraphicsJNI::getNativeCanvas(env, canvasObj)); } -void ACanvas_setBuffer(ACanvas* canvas, const ANativeWindow_Buffer* buffer, - int32_t /*android_dataspace_t*/ dataspace) { +static SkBitmap convert(const ANativeWindow_Buffer* buffer, + int32_t /*android_dataspace_t*/ dataspace) { SkBitmap bitmap; if (buffer != nullptr && buffer->width > 0 && buffer->height > 0) { sk_sp<SkColorSpace> cs(uirenderer::DataSpaceToColorSpace((android_dataspace)dataspace)); @@ -53,18 +46,44 @@ void ACanvas_setBuffer(ACanvas* canvas, const ANativeWindow_Buffer* buffer, bitmap.setInfo(imageInfo, rowBytes); bitmap.setPixels(buffer->bits); } + return bitmap; +} - toCanvas(canvas)->setBitmap(bitmap); +ACanvas* ACanvas_createCanvas(const ANativeWindow_Buffer* buffer, + int32_t /*android_dataspace_t*/ dataspace) { + return TypeCast::toACanvas(Canvas::create_canvas(convert(buffer, dataspace))); } -void ACanvas_clipRect(ACanvas* canvas, const ARect& clipRect, bool /*doAA*/) { +void ACanvas_destroyCanvas(ACanvas* canvas) { + delete TypeCast::toCanvas(canvas); +} + +void ACanvas_setBuffer(ACanvas* canvas, const ANativeWindow_Buffer* buffer, + int32_t /*android_dataspace_t*/ dataspace) { + + + TypeCast::toCanvas(canvas)->setBitmap(convert(buffer, dataspace)); +} + +void ACanvas_clipRect(ACanvas* canvas, const ARect* clipRect, bool /*doAA*/) { //TODO update Canvas to take antialias param - toCanvas(canvas)->clipRect(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom, - SkClipOp::kIntersect); + TypeCast::toCanvas(canvas)->clipRect(clipRect->left, clipRect->top, clipRect->right, + clipRect->bottom, SkClipOp::kIntersect); } -void ACanvas_clipOutRect(ACanvas* canvas, const ARect& clipRect, bool /*doAA*/) { +void ACanvas_clipOutRect(ACanvas* canvas, const ARect* clipRect, bool /*doAA*/) { //TODO update Canvas to take antialias param - toCanvas(canvas)->clipRect(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom, - SkClipOp::kDifference); + TypeCast::toCanvas(canvas)->clipRect(clipRect->left, clipRect->top, clipRect->right, + clipRect->bottom, SkClipOp::kDifference); +} + +void ACanvas_drawRect(ACanvas* canvas, const ARect* rect, const APaint* paint) { + TypeCast::toCanvas(canvas)->drawRect(rect->left, rect->top, rect->right, rect->bottom, + TypeCast::toPaintRef(paint)); +} + +void ACanvas_drawBitmap(ACanvas* canvas, const ABitmap* bitmap, float left, float top, + const APaint* paint) { + TypeCast::toCanvas(canvas)->drawBitmap(TypeCast::toBitmapRef(bitmap), left, top, + TypeCast::toPaint(paint)); } diff --git a/core/jni/android/graphics/apex/android_paint.cpp b/core/jni/android/graphics/apex/android_paint.cpp new file mode 100644 index 000000000000..70bd085343ce --- /dev/null +++ b/core/jni/android/graphics/apex/android_paint.cpp @@ -0,0 +1,47 @@ +/* + * 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/graphics/paint.h" + +#include "TypeCast.h" + +#include <hwui/Paint.h> + +using namespace android; + + +APaint* APaint_createPaint() { + return TypeCast::toAPaint(new Paint()); +} + +void APaint_destroyPaint(APaint* paint) { + delete TypeCast::toPaint(paint); +} + +static SkBlendMode convertBlendMode(ABlendMode blendMode) { + switch (blendMode) { + case ABLEND_MODE_CLEAR: + return SkBlendMode::kClear; + case ABLEND_MODE_SRC_OVER: + return SkBlendMode::kSrcOver; + case ABLEND_MODE_SRC: + return SkBlendMode::kSrc; + } +} + +void APaint_setBlendMode(APaint* paint, ABlendMode blendMode) { + TypeCast::toPaint(paint)->setBlendMode(convertBlendMode(blendMode)); +} diff --git a/core/jni/android/graphics/apex/include/android/graphics/bitmap.h b/core/jni/android/graphics/apex/include/android/graphics/bitmap.h new file mode 100644 index 000000000000..bfa4c8df407f --- /dev/null +++ b/core/jni/android/graphics/apex/include/android/graphics/bitmap.h @@ -0,0 +1,102 @@ +/* + * 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 ANDROID_GRAPHICS_BITMAP_H +#define ANDROID_GRAPHICS_BITMAP_H + +#include <android/bitmap.h> +#include <jni.h> +#include <sys/cdefs.h> + +__BEGIN_DECLS + +/** + * Opaque handle for a native graphics bitmap. + */ +typedef struct ABitmap ABitmap; + +ABitmap* ABitmap_acquireBitmapFromJava(JNIEnv* env, jobject bitmapObj); + +ABitmap* ABitmap_copy(ABitmap* srcBitmap, AndroidBitmapFormat dstFormat); + +void ABitmap_acquireRef(ABitmap* bitmap); +void ABitmap_releaseRef(ABitmap* bitmap); + +AndroidBitmapInfo ABitmap_getInfo(ABitmap* bitmap); + +void* ABitmap_getPixels(ABitmap* bitmap); + +__END_DECLS + +#ifdef __cplusplus +namespace android { +namespace graphics { + class Bitmap { + public: + Bitmap() : mBitmap(nullptr) {} + Bitmap(JNIEnv* env, jobject bitmapObj) : + mBitmap(ABitmap_acquireBitmapFromJava(env, bitmapObj)) {} + Bitmap(const Bitmap& src) : mBitmap(src.mBitmap) { ABitmap_acquireRef(src.mBitmap); } + ~Bitmap() { ABitmap_releaseRef(mBitmap); } + + // copy operator + Bitmap& operator=(const Bitmap& other) { + if (&other != this) { + ABitmap_releaseRef(mBitmap); + mBitmap = other.mBitmap; + ABitmap_acquireRef(mBitmap); + } + return *this; + } + + // move operator + Bitmap& operator=(Bitmap&& other) { + if (&other != this) { + ABitmap_releaseRef(mBitmap); + mBitmap = other.mBitmap; + other.mBitmap = nullptr; + } + return *this; + } + + Bitmap copy(AndroidBitmapFormat dstFormat) const { + return Bitmap(ABitmap_copy(mBitmap, dstFormat)); + } + + bool isValid() const { return mBitmap != nullptr; } + bool isEmpty() const { + AndroidBitmapInfo info = getInfo(); + return info.width <= 0 || info.height <= 0; + } + void reset() { + ABitmap_releaseRef(mBitmap); + mBitmap = nullptr; + } + + const ABitmap* get() const { return mBitmap; } + + AndroidBitmapInfo getInfo() const { return ABitmap_getInfo(mBitmap); } + void* getPixels() const { return ABitmap_getPixels(mBitmap); } + private: + // takes ownership of the provided ABitmap + Bitmap(ABitmap* bitmap) : mBitmap(bitmap) {} + + ABitmap* mBitmap; + }; +}; // namespace graphics +}; // namespace android +#endif // __cplusplus + +#endif // ANDROID_GRAPHICS_BITMAP_H
\ No newline at end of file diff --git a/core/jni/android/graphics/apex/include/android/graphics/canvas.h b/core/jni/android/graphics/apex/include/android/graphics/canvas.h index c35a7d69b836..190aba4565f8 100644 --- a/core/jni/android/graphics/apex/include/android/graphics/canvas.h +++ b/core/jni/android/graphics/apex/include/android/graphics/canvas.h @@ -16,6 +16,8 @@ #ifndef ANDROID_GRAPHICS_CANVAS_H #define ANDROID_GRAPHICS_CANVAS_H +#include <android/graphics/bitmap.h> +#include <android/graphics/paint.h> #include <android/native_window.h> #include <android/rect.h> #include <jni.h> @@ -23,8 +25,8 @@ __BEGIN_DECLS /** -* Opaque handle for a native graphics canvas. -*/ + * Opaque handle for a native graphics canvas. + */ typedef struct ACanvas ACanvas; // One of AHardwareBuffer_Format. @@ -33,34 +35,104 @@ bool ACanvas_isSupportedPixelFormat(int32_t bufferFormat); /** * Returns a native handle to a Java android.graphics.Canvas * - * @param env - * @param canvas * @return ACanvas* that is only valid for the life of the jobject. */ ACanvas* ACanvas_getNativeHandleFromJava(JNIEnv* env, jobject canvas); /** + * Creates a canvas that wraps the buffer + * + * @param buffer required + */ +ACanvas* ACanvas_createCanvas(const ANativeWindow_Buffer* buffer, + int32_t /*android_dataspace_t*/ dataspace); + +void ACanvas_destroyCanvas(ACanvas* canvas); + +/** * Updates the canvas to render into the pixels in the provided buffer * - * @param canvas * @param buffer The buffer that will provide the backing store for this canvas. The buffer must * remain valid until the this method is called again with either another active * buffer or nullptr. If nullptr is given the canvas will release the previous buffer * and set an empty backing store. - * @param dataspace */ void ACanvas_setBuffer(ACanvas* canvas, const ANativeWindow_Buffer* buffer, int32_t /*android_dataspace_t*/ dataspace); /** * Clips operations on the canvas to the intersection of the current clip and the provided clipRect. + * + * @param clipRect required */ -void ACanvas_clipRect(ACanvas* canvas, const ARect& clipRect, bool doAntiAlias = false); +void ACanvas_clipRect(ACanvas* canvas, const ARect* clipRect, bool doAntiAlias = false); /** * Clips operations on the canvas to the difference of the current clip and the provided clipRect. + * + * @param clipRect required + */ +void ACanvas_clipOutRect(ACanvas* canvas, const ARect* clipRect, bool doAntiAlias = false); + +/** + * + * @param rect required + * @param paint required + */ +void ACanvas_drawRect(ACanvas* canvas, const ARect* rect, const APaint* paint); + +/** + * + * @param bitmap required + * @param left + * @param top + * @param paint */ -void ACanvas_clipOutRect(ACanvas* canvas, const ARect& clipRect, bool doAntiAlias = false); +void ACanvas_drawBitmap(ACanvas* canvas, const ABitmap* bitmap, float left, float top, + const APaint* paint); __END_DECLS + +#ifdef __cplusplus +namespace android { +namespace graphics { + class Canvas { + public: + Canvas(JNIEnv* env, jobject canvasObj) : + mCanvas(ACanvas_getNativeHandleFromJava(env, canvasObj)), + mOwnedPtr(false) {} + Canvas(const ANativeWindow_Buffer& buffer, int32_t /*android_dataspace_t*/ dataspace) : + mCanvas(ACanvas_createCanvas(&buffer, dataspace)), + mOwnedPtr(true) {} + ~Canvas() { + if (mOwnedPtr) { + ACanvas_destroyCanvas(mCanvas); + } + } + + void setBuffer(const ANativeWindow_Buffer* buffer, + int32_t /*android_dataspace_t*/ dataspace) { + ACanvas_setBuffer(mCanvas, buffer, dataspace); + } + + void clipRect(const ARect& clipRect, bool doAntiAlias = false) { + ACanvas_clipRect(mCanvas, &clipRect, doAntiAlias); + } + + void drawRect(const ARect& rect, const Paint& paint) { + ACanvas_drawRect(mCanvas, &rect, &paint.get()); + } + void drawBitmap(const Bitmap& bitmap, float left, float top, const Paint* paint) { + const APaint* aPaint = (paint) ? &paint->get() : nullptr; + ACanvas_drawBitmap(mCanvas, bitmap.get(), left, top, aPaint); + } + + private: + ACanvas* mCanvas; + const bool mOwnedPtr; + }; +}; // namespace graphics +}; // namespace android +#endif // __cplusplus + #endif // ANDROID_GRAPHICS_CANVAS_H
\ No newline at end of file diff --git a/core/jni/android/graphics/apex/include/android/graphics/paint.h b/core/jni/android/graphics/apex/include/android/graphics/paint.h new file mode 100644 index 000000000000..5895e006bf93 --- /dev/null +++ b/core/jni/android/graphics/apex/include/android/graphics/paint.h @@ -0,0 +1,66 @@ +/* + * 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 ANDROID_GRAPHICS_PAINT_H +#define ANDROID_GRAPHICS_PAINT_H + +#include <sys/cdefs.h> + +__BEGIN_DECLS + +/** + * Opaque handle for a native graphics canvas. + */ +typedef struct APaint APaint; + +/** Bitmap pixel format. */ +enum ABlendMode { + /** replaces destination with zero: fully transparent */ + ABLEND_MODE_CLEAR = 0, + /** source over destination */ + ABLEND_MODE_SRC_OVER = 1, + /** replaces destination **/ + ABLEND_MODE_SRC = 2, +}; + +APaint* APaint_createPaint(); + +void APaint_destroyPaint(APaint* paint); + +void APaint_setBlendMode(APaint* paint, ABlendMode blendMode); + +__END_DECLS + +#ifdef __cplusplus +namespace android { +namespace graphics { + class Paint { + public: + Paint() : mPaint(APaint_createPaint()) {} + ~Paint() { APaint_destroyPaint(mPaint); } + + void setBlendMode(ABlendMode blendMode) { APaint_setBlendMode(mPaint, blendMode); } + + const APaint& get() const { return *mPaint; } + + private: + APaint* mPaint; + }; +}; // namespace graphics +}; // namespace android +#endif // __cplusplus + + +#endif // ANDROID_GRAPHICS_PAINT_H
\ No newline at end of file diff --git a/core/jni/android/opengl/util.cpp b/core/jni/android/opengl/util.cpp index 58c5871aba28..82601baee914 100644 --- a/core/jni/android/opengl/util.cpp +++ b/core/jni/android/opengl/util.cpp @@ -24,15 +24,13 @@ #include <assert.h> #include <dlfcn.h> +#include <android/graphics/bitmap.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> #include <GLES3/gl3.h> #include <ETC1/etc1.h> -#include <SkBitmap.h> - #include "core_jni_helpers.h" -#include "android/graphics/Bitmap.h" #undef LOG_TAG #define LOG_TAG "OpenGLUtil" @@ -628,31 +626,27 @@ void util_multiplyMV(JNIEnv *env, jclass clazz, // The internal format is no longer the same as pixel format, per Table 2 in // https://www.khronos.org/registry/OpenGL-Refpages/es3.1/html/glTexImage2D.xhtml -static int checkInternalFormat(SkColorType colorType, int internalformat, - int type) +static bool checkInternalFormat(int32_t bitmapFormat, int internalformat, int type) { - switch(colorType) { - case kN32_SkColorType: - return (type == GL_UNSIGNED_BYTE && - internalformat == GL_RGBA) || - (type == GL_UNSIGNED_BYTE && - internalformat == GL_SRGB8_ALPHA8) ? 0 : -1; - case kAlpha_8_SkColorType: - return (type == GL_UNSIGNED_BYTE && - internalformat == GL_ALPHA) ? 0 : -1; - case kARGB_4444_SkColorType: - return (type == GL_UNSIGNED_SHORT_4_4_4_4 && - internalformat == GL_RGBA) ? 0 : -1; - case kRGB_565_SkColorType: - return (type == GL_UNSIGNED_SHORT_5_6_5 && - internalformat == GL_RGB) ? 0 : -1; - case kRGBA_F16_SkColorType: - return (type == GL_HALF_FLOAT && - internalformat == GL_RGBA16F) ? 0 : -1; + if (internalformat == GL_PALETTE8_RGBA8_OES) { + return false; + } + switch(bitmapFormat) { + case ANDROID_BITMAP_FORMAT_RGBA_8888: + return (type == GL_UNSIGNED_BYTE && internalformat == GL_RGBA) || + (type == GL_UNSIGNED_BYTE && internalformat == GL_SRGB8_ALPHA8); + case ANDROID_BITMAP_FORMAT_A_8: + return (type == GL_UNSIGNED_BYTE && internalformat == GL_ALPHA); + case ANDROID_BITMAP_FORMAT_RGBA_4444: + return (type == GL_UNSIGNED_SHORT_4_4_4_4 && internalformat == GL_RGBA); + case ANDROID_BITMAP_FORMAT_RGB_565: + return (type == GL_UNSIGNED_SHORT_5_6_5 && internalformat == GL_RGB); + case ANDROID_BITMAP_FORMAT_RGBA_F16: + return (type == GL_HALF_FLOAT && internalformat == GL_RGBA16F); default: break; } - return -1; + return false; } // The internal format is no longer the same as pixel format, per Table 2 in @@ -670,107 +664,92 @@ static int getPixelFormatFromInternalFormat(uint32_t internalFormat) { } } -static int getInternalFormat(SkColorType colorType) -{ - switch(colorType) { - case kAlpha_8_SkColorType: +static int getInternalFormat(int32_t bitmapFormat) { + switch(bitmapFormat) { + case ANDROID_BITMAP_FORMAT_A_8: return GL_ALPHA; - case kARGB_4444_SkColorType: + case ANDROID_BITMAP_FORMAT_RGBA_4444: return GL_RGBA; - case kN32_SkColorType: + case ANDROID_BITMAP_FORMAT_RGBA_8888: return GL_RGBA; - case kRGB_565_SkColorType: + case ANDROID_BITMAP_FORMAT_RGB_565: return GL_RGB; - case kRGBA_F16_SkColorType: + case ANDROID_BITMAP_FORMAT_RGBA_F16: return GL_RGBA16F; default: return -1; } } -static int getType(SkColorType colorType) -{ - switch(colorType) { - case kAlpha_8_SkColorType: +static int getType(int32_t bitmapFormat) { + switch(bitmapFormat) { + case ANDROID_BITMAP_FORMAT_A_8: return GL_UNSIGNED_BYTE; - case kARGB_4444_SkColorType: + case ANDROID_BITMAP_FORMAT_RGBA_4444: return GL_UNSIGNED_SHORT_4_4_4_4; - case kN32_SkColorType: + case ANDROID_BITMAP_FORMAT_RGBA_8888: return GL_UNSIGNED_BYTE; - case kRGB_565_SkColorType: + case ANDROID_BITMAP_FORMAT_RGB_565: return GL_UNSIGNED_SHORT_5_6_5; - case kRGBA_F16_SkColorType: + case ANDROID_BITMAP_FORMAT_RGBA_F16: return GL_HALF_FLOAT; default: return -1; } } -static jint util_getInternalFormat(JNIEnv *env, jclass clazz, - jlong bitmapPtr) +static jint util_getInternalFormat(JNIEnv *env, jclass clazz, jobject bitmapObj) { - SkBitmap nativeBitmap; - bitmap::toSkBitmap(bitmapPtr, &nativeBitmap); - return getInternalFormat(nativeBitmap.colorType()); + graphics::Bitmap bitmap(env, bitmapObj); + return getInternalFormat(bitmap.getInfo().format); } -static jint util_getType(JNIEnv *env, jclass clazz, - jlong bitmapPtr) +static jint util_getType(JNIEnv *env, jclass clazz, jobject bitmapObj) { - SkBitmap nativeBitmap; - bitmap::toSkBitmap(bitmapPtr, &nativeBitmap); - return getType(nativeBitmap.colorType()); + graphics::Bitmap bitmap(env, bitmapObj); + return getType(bitmap.getInfo().format); } -static jint util_texImage2D(JNIEnv *env, jclass clazz, - jint target, jint level, jint internalformat, - jlong bitmapPtr, jint type, jint border) +static jint util_texImage2D(JNIEnv *env, jclass clazz, jint target, jint level, + jint internalformat, jobject bitmapObj, jint type, jint border) { - SkBitmap bitmap; - bitmap::toSkBitmap(bitmapPtr, &bitmap); - SkColorType colorType = bitmap.colorType(); + graphics::Bitmap bitmap(env, bitmapObj); + AndroidBitmapInfo bitmapInfo = bitmap.getInfo(); + if (internalformat < 0) { - internalformat = getInternalFormat(colorType); + internalformat = getInternalFormat(bitmapInfo.format); } if (type < 0) { - type = getType(colorType); - } - int err = checkInternalFormat(colorType, internalformat, type); - if (err) - return err; - const int w = bitmap.width(); - const int h = bitmap.height(); - const void* p = bitmap.getPixels(); - if (internalformat == GL_PALETTE8_RGBA8_OES) { - err = -1; - } else { - glTexImage2D(target, level, internalformat, w, h, border, - getPixelFormatFromInternalFormat(internalformat), type, p); + type = getType(bitmapInfo.format); } - return err; + + if (checkInternalFormat(bitmapInfo.format, internalformat, type)) { + glTexImage2D(target, level, internalformat, bitmapInfo.width, bitmapInfo.height, border, + getPixelFormatFromInternalFormat(internalformat), type, bitmap.getPixels()); + return 0; + } + return -1; } -static jint util_texSubImage2D(JNIEnv *env, jclass clazz, - jint target, jint level, jint xoffset, jint yoffset, - jlong bitmapPtr, jint format, jint type) +static jint util_texSubImage2D(JNIEnv *env, jclass clazz, jint target, jint level, + jint xoffset, jint yoffset, jobject bitmapObj, jint format, jint type) { - SkBitmap bitmap; - bitmap::toSkBitmap(bitmapPtr, &bitmap); - SkColorType colorType = bitmap.colorType(); - int internalFormat = getInternalFormat(colorType); + graphics::Bitmap bitmap(env, bitmapObj); + AndroidBitmapInfo bitmapInfo = bitmap.getInfo(); + + int internalFormat = getInternalFormat(bitmapInfo.format); if (format < 0) { format = getPixelFormatFromInternalFormat(internalFormat); if (format == GL_PALETTE8_RGBA8_OES) return -1; // glCompressedTexSubImage2D() not supported } - int err = checkInternalFormat(colorType, internalFormat, type); - if (err) - return err; - const int w = bitmap.width(); - const int h = bitmap.height(); - const void* p = bitmap.getPixels(); - glTexSubImage2D(target, level, xoffset, yoffset, w, h, format, type, p); - return 0; + + if (checkInternalFormat(bitmapInfo.format, internalFormat, type)) { + glTexSubImage2D(target, level, xoffset, yoffset, bitmapInfo.width, bitmapInfo.height, + format, type, bitmap.getPixels()); + return 0; + } + return -1; } /* @@ -1036,10 +1015,10 @@ static const JNINativeMethod gVisibilityMethods[] = { }; static const JNINativeMethod gUtilsMethods[] = { - { "native_getInternalFormat", "(J)I", (void*) util_getInternalFormat }, - { "native_getType", "(J)I", (void*) util_getType }, - { "native_texImage2D", "(IIIJII)I", (void*)util_texImage2D }, - { "native_texSubImage2D", "(IIIIJII)I", (void*)util_texSubImage2D }, + { "native_getInternalFormat", "(Landroid/graphics/Bitmap;)I", (void*) util_getInternalFormat }, + { "native_getType", "(Landroid/graphics/Bitmap;)I", (void*) util_getType }, + { "native_texImage2D", "(IIILandroid/graphics/Bitmap;II)I", (void*)util_texImage2D }, + { "native_texSubImage2D", "(IIIILandroid/graphics/Bitmap;II)I", (void*)util_texSubImage2D }, }; static const JNINativeMethod gEtc1Methods[] = { diff --git a/core/jni/android_graphics_GraphicBuffer.cpp b/core/jni/android_graphics_GraphicBuffer.cpp index 43d22eb7df0e..b6d50898a057 100644 --- a/core/jni/android_graphics_GraphicBuffer.cpp +++ b/core/jni/android_graphics_GraphicBuffer.cpp @@ -178,9 +178,9 @@ static jboolean android_graphics_GraphicBuffer_lockCanvas(JNIEnv* env, jobject, nativeBuffer.format = AHardwareBuffer_convertFromPixelFormat(buffer->getPixelFormat()); nativeBuffer.bits = bits; - ACanvas* canvas = ACanvas_getNativeHandleFromJava(env, canvasObj); - ACanvas_setBuffer(canvas, &nativeBuffer, ADATASPACE_UNKNOWN); - ACanvas_clipRect(canvas, {rect.left, rect.top, rect.right, rect.bottom}); + graphics::Canvas canvas(env, canvasObj); + canvas.setBuffer(&nativeBuffer, ADATASPACE_UNKNOWN); + canvas.clipRect({rect.left, rect.top, rect.right, rect.bottom}); if (dirtyRect) { INVOKEV(dirtyRect, gRectClassInfo.set, @@ -193,8 +193,8 @@ static jboolean android_graphics_GraphicBuffer_lockCanvas(JNIEnv* env, jobject, static jboolean android_graphics_GraphicBuffer_unlockCanvasAndPost(JNIEnv* env, jobject, jlong wrapperHandle, jobject canvasObj) { // release the buffer from the canvas - ACanvas* canvas = ACanvas_getNativeHandleFromJava(env, canvasObj); - ACanvas_setBuffer(canvas, nullptr, ADATASPACE_UNKNOWN); + graphics::Canvas canvas(env, canvasObj); + canvas.setBuffer(nullptr, ADATASPACE_UNKNOWN); GraphicBufferWrapper* wrapper = reinterpret_cast<GraphicBufferWrapper*>(wrapperHandle); diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 9c52a6433360..f2a4f4fd203c 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -257,6 +257,8 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) which_heap = HEAP_NATIVE; } else if (base::StartsWith(name, "[anon:libc_malloc]")) { which_heap = HEAP_NATIVE; + } else if (base::StartsWith(name, "[anon:scudo:")) { + which_heap = HEAP_NATIVE; } else if (base::StartsWith(name, "[stack")) { which_heap = HEAP_STACK; } else if (base::StartsWith(name, "[anon:stack_and_tls:")) { diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index bf4ffc7e42e0..daf33f61105c 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -352,7 +352,7 @@ static Guarded<AssetManager2>& AssetManagerFromLong(jlong ptr) { } static jobject NativeGetOverlayableMap(JNIEnv* env, jclass /*clazz*/, jlong ptr, - jstring package_name) { + jstring package_name) { ScopedLock<AssetManager2> assetmanager(AssetManagerFromLong(ptr)); const ScopedUtfChars package_name_utf8(env, package_name); CHECK(package_name_utf8.c_str() != nullptr); @@ -397,6 +397,21 @@ static jobject NativeGetOverlayableMap(JNIEnv* env, jclass /*clazz*/, jlong ptr, return array_map; } +static jstring NativeGetOverlayablesToString(JNIEnv* env, jclass /*clazz*/, jlong ptr, + jstring package_name) { + ScopedLock<AssetManager2> assetmanager(AssetManagerFromLong(ptr)); + const ScopedUtfChars package_name_utf8(env, package_name); + CHECK(package_name_utf8.c_str() != nullptr); + const std::string std_package_name(package_name_utf8.c_str()); + + std::string result; + if (!assetmanager->GetOverlayablesToString(std_package_name, &result)) { + return nullptr; + } + + return env->NewStringUTF(result.c_str()); +} + #ifdef __ANDROID__ // Layoutlib does not support parcel static jobject ReturnParcelFileDescriptor(JNIEnv* env, std::unique_ptr<Asset> asset, jlongArray out_offsets) { @@ -1608,6 +1623,8 @@ static const JNINativeMethod gAssetManagerMethods[] = { (void*)NativeCreateIdmapsForStaticOverlaysTargetingAndroid}, {"nativeGetOverlayableMap", "(JLjava/lang/String;)Ljava/util/Map;", (void*)NativeGetOverlayableMap}, + {"nativeGetOverlayablesToString", "(JLjava/lang/String;)Ljava/lang/String;", + (void*)NativeGetOverlayablesToString}, // Global management/debug methods. {"getGlobalAssetCount", "()I", (void*)NativeGetGlobalAssetCount}, diff --git a/core/jni/android_view_PointerIcon.cpp b/core/jni/android_view_PointerIcon.cpp index 4f79790dec51..ed2ce506ab23 100644 --- a/core/jni/android_view_PointerIcon.cpp +++ b/core/jni/android_view_PointerIcon.cpp @@ -23,7 +23,7 @@ #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> #include <utils/Log.h> -#include <android/graphics/GraphicsJNI.h> +#include <android/graphics/bitmap.h> #include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" @@ -88,7 +88,7 @@ status_t android_view_PointerIcon_getLoadedIcon(JNIEnv* env, jobject pointerIcon ScopedLocalRef<jobject> bitmapObj( env, env->GetObjectField(pointerIconObj, gPointerIconClassInfo.mBitmap)); if (bitmapObj.get()) { - GraphicsJNI::getSkBitmap(env, bitmapObj.get(), &(outPointerIcon->bitmap)); + outPointerIcon->bitmap = graphics::Bitmap(env, bitmapObj.get()); } ScopedLocalRef<jobjectArray> bitmapFramesObj(env, reinterpret_cast<jobjectArray>( @@ -100,7 +100,7 @@ status_t android_view_PointerIcon_getLoadedIcon(JNIEnv* env, jobject pointerIcon outPointerIcon->bitmapFrames.resize(size); for (jsize i = 0; i < size; ++i) { ScopedLocalRef<jobject> bitmapObj(env, env->GetObjectArrayElement(bitmapFramesObj.get(), i)); - GraphicsJNI::getSkBitmap(env, bitmapObj.get(), &(outPointerIcon->bitmapFrames[i])); + outPointerIcon->bitmapFrames[i] = graphics::Bitmap(env, bitmapObj.get()); } } diff --git a/core/jni/android_view_PointerIcon.h b/core/jni/android_view_PointerIcon.h index 00bdfb4bf04e..908948ea2aa4 100644 --- a/core/jni/android_view_PointerIcon.h +++ b/core/jni/android_view_PointerIcon.h @@ -21,8 +21,8 @@ #include <vector> +#include <android/graphics/bitmap.h> #include <utils/Errors.h> -#include <SkBitmap.h> namespace android { @@ -68,10 +68,10 @@ struct PointerIcon { } int32_t style; - SkBitmap bitmap; + graphics::Bitmap bitmap; float hotSpotX; float hotSpotY; - std::vector<SkBitmap> bitmapFrames; + std::vector<graphics::Bitmap> bitmapFrames; int32_t durationPerFrame; inline bool isNullIcon() { diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 4c2e91f986d0..058a4c8ee2f9 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -237,12 +237,11 @@ static jlong nativeLockCanvas(JNIEnv* env, jclass clazz, return 0; } - ACanvas* canvas = ACanvas_getNativeHandleFromJava(env, canvasObj); - ACanvas_setBuffer(canvas, &buffer, static_cast<int32_t>(surface->getBuffersDataSpace())); + graphics::Canvas canvas(env, canvasObj); + canvas.setBuffer(&buffer, static_cast<int32_t>(surface->getBuffersDataSpace())); if (dirtyRectPtr) { - ACanvas_clipRect(canvas, {dirtyRect.left, dirtyRect.top, - dirtyRect.right, dirtyRect.bottom}); + canvas.clipRect({dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom}); } if (dirtyRectObj) { @@ -268,8 +267,8 @@ static void nativeUnlockCanvasAndPost(JNIEnv* env, jclass clazz, } // detach the canvas from the surface - ACanvas* canvas = ACanvas_getNativeHandleFromJava(env, canvasObj); - ACanvas_setBuffer(canvas, nullptr, ADATASPACE_UNKNOWN); + graphics::Canvas canvas(env, canvasObj); + canvas.setBuffer(nullptr, ADATASPACE_UNKNOWN); // unlock surface status_t err = surface->unlockAndPost(); diff --git a/core/jni/android_view_TextureLayer.cpp b/core/jni/android_view_TextureLayer.cpp index 1ccb6a8f610c..8a3f54039d05 100644 --- a/core/jni/android_view_TextureLayer.cpp +++ b/core/jni/android_view_TextureLayer.cpp @@ -26,10 +26,7 @@ #include <gui/GLConsumer.h> #include <hwui/Paint.h> -#include <SkBitmap.h> -#include <SkCanvas.h> #include <SkMatrix.h> -#include <SkBlendMode.h> #include <DeferredLayerUpdater.h> #include <Rect.h> diff --git a/core/jni/android_view_TextureView.cpp b/core/jni/android_view_TextureView.cpp index 1f69c8bbbe5d..391f515af115 100644 --- a/core/jni/android_view_TextureView.cpp +++ b/core/jni/android_view_TextureView.cpp @@ -124,9 +124,9 @@ static jboolean android_view_TextureView_lockCanvas(JNIEnv* env, jobject, int32_t status = native_window_lock(window.get(), &outBuffer, &rect); if (status) return JNI_FALSE; - ACanvas* canvas = ACanvas_getNativeHandleFromJava(env, canvasObj); - ACanvas_setBuffer(canvas, &outBuffer, ANativeWindow_getBuffersDataSpace(window.get())); - ACanvas_clipRect(canvas, {rect.left, rect.top, rect.right, rect.bottom}); + graphics::Canvas canvas(env, canvasObj); + canvas.setBuffer(&outBuffer, ANativeWindow_getBuffersDataSpace(window.get())); + canvas.clipRect({rect.left, rect.top, rect.right, rect.bottom}); if (dirtyRect) { INVOKEV(dirtyRect, gRectClassInfo.set, @@ -140,8 +140,8 @@ static void android_view_TextureView_unlockCanvasAndPost(JNIEnv* env, jobject, jlong nativeWindow, jobject canvasObj) { // release the buffer from the canvas - ACanvas* canvas = ACanvas_getNativeHandleFromJava(env, canvasObj); - ACanvas_setBuffer(canvas, nullptr, ADATASPACE_UNKNOWN); + graphics::Canvas canvas(env, canvasObj); + canvas.setBuffer(nullptr, ADATASPACE_UNKNOWN); if (nativeWindow) { sp<ANativeWindow> window((ANativeWindow*) nativeWindow); diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index d42a48a1f899..3516dce5d5ed 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -74,7 +74,6 @@ #include <android-base/strings.h> #include <android-base/unique_fd.h> #include <bionic/malloc.h> -#include <cutils/ashmem.h> #include <cutils/fs.h> #include <cutils/multiuser.h> #include <cutils/sockets.h> @@ -303,7 +302,8 @@ enum MountExternalKind { MOUNT_EXTERNAL_LEGACY = 4, MOUNT_EXTERNAL_INSTALLER = 5, MOUNT_EXTERNAL_FULL = 6, - MOUNT_EXTERNAL_COUNT = 7 + MOUNT_EXTERNAL_PASS_THROUGH = 7, + MOUNT_EXTERNAL_COUNT = 8 }; // The order of entries here must be kept in sync with MountExternalKind enum values. @@ -708,15 +708,14 @@ static void MountEmulatedStorage(uid_t uid, jint mount_mode, const userid_t user_id = multiuser_get_user_id(uid); const std::string user_source = StringPrintf("/mnt/user/%d", user_id); + const std::string pass_through_source = StringPrintf("/mnt/pass_through/%d", user_id); bool isFuse = GetBoolProperty(kPropFuse, false); CreateDir(user_source, 0751, AID_ROOT, AID_ROOT, fail_fn); if (isFuse) { - // TODO(b/135341433): Bind mount the appropriate storage view for the app given its permissions - // media and media_location permission access. This should prevent the kernel from incorrectly - // sharing a cache across permission buckets - BindMount(user_source, "/storage", fail_fn); + BindMount(mount_mode == MOUNT_EXTERNAL_PASS_THROUGH ? pass_through_source : user_source, + "/storage", fail_fn); } else { const std::string& storage_source = ExternalStorageViews[mount_mode]; BindMount(storage_source, "/storage", fail_fn); @@ -1657,11 +1656,6 @@ static void com_android_internal_os_Zygote_nativeInitNativeState(JNIEnv* env, jc if (!SetTaskProfiles(0, {})) { ZygoteFailure(env, "zygote", nullptr, "Zygote SetTaskProfiles failed"); } - - /* - * ashmem initialization to avoid dlopen overhead - */ - ashmem_init(); } /** diff --git a/core/proto/android/server/protolog.proto b/core/proto/android/server/protolog.proto index 7c98d318570b..3512c0aea4a5 100644 --- a/core/proto/android/server/protolog.proto +++ b/core/proto/android/server/protolog.proto @@ -23,7 +23,7 @@ option java_multiple_files = true; /* represents a single log entry */ message ProtoLogMessage { /* log statement identifier, created from message string and log level. */ - optional fixed32 message_hash = 1; + optional sfixed32 message_hash = 1; /* log time, relative to the elapsed system time clock. */ optional fixed64 elapsed_realtime_nanos = 2; /* string parameters passed to the log call. */ diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 1d590ea2f896..7a0d0cbe6095 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2552,6 +2552,19 @@ android:label="@string/permlab_readSyncStats" android:protectionLevel="normal" /> + <!-- ==================================================== --> + <!-- Permissions related to accessibility --> + <!-- ==================================================== --> + <eat-comment /> + + <!-- Allows applications to define the accessibility shortcut target. + <p>Protection level: normal + --> + <permission android:name="android.permission.ACCESSIBILITY_SHORTCUT_TARGET" + android:description="@string/permdesc_accessibilityShortcutTarget" + android:label="@string/permlab_accessibilityShortcutTarget" + android:protectionLevel="normal" /> + <!-- ============================================ --> <!-- Permissions for low-level system interaction --> <!-- ============================================ --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 5fd53de9abc4..e3337b7f9ae5 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2527,6 +2527,16 @@ will be locked. --> <bool name="config_multiuserDelayUserDataLocking">false</bool> + <!-- Whether to only install system packages on a user if they're whitelisted for that user + type. These are flags and can be freely combined. + 0 (0b000) - disable whitelist (install all system packages; no logging) + 1 (0b001) - enforce (only install system packages if they are whitelisted) + 2 (0b010) - log (log when a non-whitelisted package is run) + 4 (0b100) - treat any package not mentioned in the whitelist file as implicitly whitelisted + Note: This list must be kept current with PACKAGE_WHITELIST_MODE_PROP in + frameworks/base/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java --> + <integer name="config_userTypePackageWhitelistMode">5</integer> <!-- 0b101 --> + <!-- Whether UI for multi user should be shown --> <bool name="config_enableMultiUserUI">false</bool> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d2989d9a8ab6..b53a399f0c8a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1745,6 +1745,11 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_startViewPermissionUsage">Allows the holder to start the permission usage for an app. Should never be needed for normal apps.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] --> + <string name="permlab_accessibilityShortcutTarget">accessibility shortcut target</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] --> + <string name="permdesc_accessibilityShortcutTarget">Allows an app to define the accessibility shortcut target.</string> + <!-- Policy administration --> <!-- Title of policy access to limiting the user's password choices --> @@ -3629,6 +3634,11 @@ <!-- Message of notification shown when Test Harness Mode is enabled. [CHAR LIMIT=NONE] --> <string name="test_harness_mode_notification_message">Perform a factory reset to disable Test Harness Mode.</string> + <!-- Title of notification shown when serial console is enabled. [CHAR LIMIT=NONE] --> + <string name="console_running_notification_title">Serial console enabled</string> + <!-- Message of notification shown when serial console is enabled. [CHAR LIMIT=NONE] --> + <string name="console_running_notification_message">Performance is impacted. To disable, check bootloader.</string> + <!-- Title of notification shown when contaminant is detected on the USB port. [CHAR LIMIT=NONE] --> <string name="usb_contaminant_detected_title">Liquid or debris in USB port</string> <!-- Message of notification shown when contaminant is detected on the USB port. [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 761e02fe5dad..3d0a3b309720 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -511,6 +511,7 @@ <java-symbol type="integer" name="config_multiuserMaximumUsers" /> <java-symbol type="integer" name="config_multiuserMaxRunningUsers" /> <java-symbol type="bool" name="config_multiuserDelayUserDataLocking" /> + <java-symbol type="integer" name="config_userTypePackageWhitelistMode"/> <java-symbol type="integer" name="config_safe_media_volume_index" /> <java-symbol type="integer" name="config_safe_media_volume_usb_mB" /> <java-symbol type="integer" name="config_mobile_mtu" /> @@ -2093,6 +2094,8 @@ <java-symbol type="string" name="adb_active_notification_title" /> <java-symbol type="string" name="test_harness_mode_notification_title" /> <java-symbol type="string" name="test_harness_mode_notification_message" /> + <java-symbol type="string" name="console_running_notification_title" /> + <java-symbol type="string" name="console_running_notification_message" /> <java-symbol type="string" name="taking_remote_bugreport_notification_title" /> <java-symbol type="string" name="share_remote_bugreport_notification_title" /> <java-symbol type="string" name="sharing_remote_bugreport_notification_title" /> diff --git a/core/tests/coretests/src/android/content/pm/AndroidTelephonyCommonUpdaterTest.java b/core/tests/coretests/src/android/content/pm/AndroidTelephonyCommonUpdaterTest.java deleted file mode 100644 index 8ab9ddbee6d8..000000000000 --- a/core/tests/coretests/src/android/content/pm/AndroidTelephonyCommonUpdaterTest.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.content.pm; - -import static android.content.pm.PackageBuilder.builder; -import static android.content.pm.SharedLibraryNames.ANDROID_HIDL_BASE; -import static android.content.pm.SharedLibraryNames.ANDROID_HIDL_MANAGER; -import static android.content.pm.SharedLibraryNames.ANDROID_TELEPHONY_COMMON; - -import android.os.Build; -import androidx.test.filters.SmallTest; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** - * Test for {@link AndroidHidlUpdater} - */ -@SmallTest -@RunWith(JUnit4.class) -public class AndroidTelephonyCommonUpdaterTest extends PackageSharedLibraryUpdaterTest { - - private static final String OTHER_LIBRARY = "other.library"; - private static final String PHONE_UID = "android.uid.phone"; - - @Test - public void targeted_at_Q() { - PackageBuilder before = builder() - .targetSdkVersion(Build.VERSION_CODES.Q); - - PackageBuilder after = builder().targetSdkVersion(Build.VERSION_CODES.Q) - .requiredLibraries(ANDROID_TELEPHONY_COMMON); - - // Should add telephony-common libraries - checkBackwardsCompatibility(before, after); - } - - @Test - public void targeted_at_Q_phoneUID() { - PackageBuilder before = builder().setSharedUid(PHONE_UID) - .targetSdkVersion(Build.VERSION_CODES.Q); - - // Should add telephony-common libraries - PackageBuilder after = builder().setSharedUid(PHONE_UID) - .targetSdkVersion(Build.VERSION_CODES.Q) - .requiredLibraries(ANDROID_TELEPHONY_COMMON); - - checkBackwardsCompatibility(before, after); - } - - @Test - public void targeted_at_Q_not_empty_usesLibraries() { - PackageBuilder before = builder() - .targetSdkVersion(Build.VERSION_CODES.Q) - .requiredLibraries(OTHER_LIBRARY); - - // no change - checkBackwardsCompatibility(before, before); - } - - @Test - public void targeted_at_Q_not_empty_usesLibraries_phoneUID() { - PackageBuilder before = builder().setSharedUid(PHONE_UID) - .targetSdkVersion(Build.VERSION_CODES.Q) - .requiredLibraries(OTHER_LIBRARY); - - // The telephony-common jars should be added at the start of the list because it - // is not on the bootclasspath and the package targets pre-R. - PackageBuilder after = builder().setSharedUid(PHONE_UID) - .targetSdkVersion(Build.VERSION_CODES.Q) - .requiredLibraries(ANDROID_TELEPHONY_COMMON, OTHER_LIBRARY); - - checkBackwardsCompatibility(before, after); - } - - @Test - public void targeted_at_R_in_usesLibraries() { - PackageBuilder before = builder() - .targetSdkVersion(Build.VERSION_CODES.Q + 1) - .requiredLibraries(ANDROID_TELEPHONY_COMMON); - - PackageBuilder after = builder() - .targetSdkVersion(Build.VERSION_CODES.Q + 1); - - // Libraries are removed because they are not available for apps target >= R and not run - // on phone-uid - checkBackwardsCompatibility(before, after); - } - - @Test - public void targeted_at_Q_in_usesLibraries() { - PackageBuilder before = builder().asSystemApp() - .targetSdkVersion(Build.VERSION_CODES.Q) - .requiredLibraries(ANDROID_TELEPHONY_COMMON); - - // No change is required because the package explicitly requests the telephony libraries - // and is targeted at the current version so does not need backwards compatibility. - checkBackwardsCompatibility(before, before); - } - - - @Test - public void targeted_at_R_in_usesOptionalLibraries() { - PackageBuilder before = builder().targetSdkVersion(Build.VERSION_CODES.Q + 1) - .optionalLibraries(ANDROID_TELEPHONY_COMMON); - - // Dependency is removed, it is not available. - PackageBuilder after = builder().targetSdkVersion(Build.VERSION_CODES.Q + 1); - - // Libraries are removed because they are not available for apps targeting Q+ - checkBackwardsCompatibility(before, after); - } - - @Test - public void targeted_at_R() { - PackageBuilder before = builder() - .targetSdkVersion(Build.VERSION_CODES.Q + 1); - - // no change - checkBackwardsCompatibility(before, before); - } - - private void checkBackwardsCompatibility(PackageBuilder before, PackageBuilder after) { - checkBackwardsCompatibility(before, after, AndroidTelephonyCommonUpdater::new); - } -} diff --git a/core/tests/coretests/src/android/content/pm/PackageBuilder.java b/core/tests/coretests/src/android/content/pm/PackageBuilder.java index f3a56e2814e4..f7544af43461 100644 --- a/core/tests/coretests/src/android/content/pm/PackageBuilder.java +++ b/core/tests/coretests/src/android/content/pm/PackageBuilder.java @@ -37,8 +37,6 @@ class PackageBuilder { private ArrayList<String> mOptionalLibraries; - private String mSharedUid; - public static PackageBuilder builder() { return new PackageBuilder(); } @@ -49,7 +47,6 @@ class PackageBuilder { pkg.applicationInfo.flags = mFlags; pkg.usesLibraries = mRequiredLibraries; pkg.usesOptionalLibraries = mOptionalLibraries; - pkg.mSharedUserId = mSharedUid; return pkg; } @@ -58,11 +55,6 @@ class PackageBuilder { return this; } - PackageBuilder setSharedUid(String uid) { - this.mSharedUid = uid; - return this; - } - PackageBuilder asSystemApp() { this.mFlags |= ApplicationInfo.FLAG_SYSTEM; return this; diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 7e167c9bfb79..befa63760a49 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -22,6 +22,12 @@ prebuilt_etc { } prebuilt_etc { + name: "preinstalled-packages-platform.xml", + sub_dir: "sysconfig", + src: "preinstalled-packages-platform.xml", +} + +prebuilt_etc { name: "hiddenapi-package-whitelist.xml", sub_dir: "sysconfig", src: "hiddenapi-package-whitelist.xml", diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 2ab7845a0981..dceb243972e2 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -229,8 +229,6 @@ <library name="android.hidl.manager-V1.0-java" file="/system/framework/android.hidl.manager-V1.0-java.jar" dependency="android.hidl.base-V1.0-java" /> - <library name="telephony-common" - file="/system/framework/telephony-common.jar" /> <!-- These are the standard packages that are white-listed to always have internet access while in power save mode, even if they aren't in the foreground. --> diff --git a/data/etc/preinstalled-packages-platform.xml b/data/etc/preinstalled-packages-platform.xml new file mode 100644 index 000000000000..ccd8b5bb5347 --- /dev/null +++ b/data/etc/preinstalled-packages-platform.xml @@ -0,0 +1,90 @@ +<?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. +--> + +<!-- +This XML file declares which system packages should be initially installed for new users based on +the type of user. All system packages on the device should ideally have an entry in an xml file +(keys by its manifest name). + +Main user-types (every user will be at least one of these types) are: + SYSTEM (user 0) + FULL (any non-profile human user) + PROFILE (profile human user) + +Additional optional types are: GUEST, RESTRICTED, MANAGED_PROFILE, EPHEMERAL, DEMO + +The meaning of each of these user types is delineated by flags in +frameworks/base/core/java/android/content/pm/UserInfo.java. +See frameworks/base/services/core/java/com/android/server/pm/UserSystemPackageInstaller#getFlagsFromUserTypes + +The following three examples should cover most normal cases: + +1. For a system package to be pre-installed only in user 0: + + <install-in-user-type package="com.android.example"> + <install-in user-type="SYSTEM"> + </install-in-user-type> + + +2. For a system package to be pre-installed on all human users (e.g. a web browser), i.e. to be +installed on any user of type type FULL or PROFILE (since this covers all human users): + + <install-in-user-type package="com.android.example"> + <install-in user-type="FULL"> + <install-in user-type="PROFILE"> + </install-in-user-type> + + +3. For a system package to be pre-installed on all human users except for profile users (e.g. a +wallpaper app, since profiles cannot display wallpaper): + + <install-in-user-type package="com.android.example"> + <install-in user-type="FULL"> + </install-in-user-type> + + +Some system packages truly are required to be on all users, regardless of type, in which case use: + <install-in-user-type package="com.android.example"> + <install-in user-type="SYSTEM"> + <install-in user-type="FULL"> + <install-in user-type="PROFILE"> + </install-in-user-type> + +More fine-grained options are also available (see below). Additionally, packages can blacklist +user types. Blacklists override any whitelisting (in any file). +E.g. + <install-in-user-type package="com.android.example"> + <install-in user-type="FULL" /> + <do-not-install-in user-type="GUEST" /> + </install-in-user-type> + +If a user is of type FULL and GUEST, this package will NOT be installed, because the +'do-not-install-in' takes precedence over 'install-in'. + +The way that a device treats system packages that do not have any entry (for any user type) at all +is determined by the config resource value config_userTypePackageWhitelistMode. +See frameworks/base/core/res/res/values/config.xml#config_userTypePackageWhitelistMode. + +Changes to the whitelist during system updates can result in installing new system packages +to pre-existing users, but cannot uninstall system packages from pre-existing users. +--> +<config> + <install-in-user-type package="com.android.providers.settings"> + <install-in user-type="SYSTEM" /> + <install-in user-type="FULL" /> + <install-in user-type="PROFILE" /> + </install-in-user-type> +</config> diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 261891fb3bbc..2dfb777592fd 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -1,10 +1,11 @@ { "version": "1.0.0", "messages": { - "485522692": { + "676824470": { "message": "Test completed successfully: %b %d %o %x %e %g %f %% %s.", "level": "ERROR", - "group": "TEST_GROUP" + "group": "TEST_GROUP", + "at": "com\/android\/server\/wm\/ProtoLogGroup.java" } }, "groups": { diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java index bd497c1e4efa..94499ce24ed0 100644 --- a/keystore/java/android/security/keystore/AttestationUtils.java +++ b/keystore/java/android/security/keystore/AttestationUtils.java @@ -74,6 +74,13 @@ public abstract class AttestationUtils { public static final int ID_TYPE_MEID = 3; /** + * Specifies that the device should attest its MEIDs. For use with {@link #attestDeviceIds}. + * + * @see #attestDeviceIds + */ + public static final int USE_INDIVIDUAL_ATTESTATION = 4; + + /** * Creates an array of X509Certificates from the provided KeymasterCertificateChain. * * @hide Only called by the DevicePolicyManager. @@ -196,6 +203,13 @@ public abstract class AttestationUtils { meid.getBytes(StandardCharsets.UTF_8)); break; } + case USE_INDIVIDUAL_ATTESTATION: { + //TODO: Add the Keymaster tag for requesting the use of individual + //attestation certificate, which should be + //KeymasterDefs.KM_TAG_DEVICE_UNIQUE_ATTESTATION + attestArgs.addBoolean(720); + break; + } default: throw new IllegalArgumentException("Unknown device ID type " + idType); } diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index 01caf011f644..eec49df79630 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -224,6 +224,62 @@ const std::unordered_map<std::string, std::string>* return &loaded_package->GetOverlayableMap(); } +bool AssetManager2::GetOverlayablesToString(const android::StringPiece& package_name, + std::string* out) const { + uint8_t package_id = 0U; + for (const auto& apk_assets : apk_assets_) { + const LoadedArsc* loaded_arsc = apk_assets->GetLoadedArsc(); + if (loaded_arsc == nullptr) { + continue; + } + + const auto& loaded_packages = loaded_arsc->GetPackages(); + if (loaded_packages.empty()) { + continue; + } + + const auto& loaded_package = loaded_packages[0]; + if (loaded_package->GetPackageName() == package_name) { + package_id = GetAssignedPackageId(loaded_package.get()); + break; + } + } + + if (package_id == 0U) { + ANDROID_LOG(ERROR) << base::StringPrintf("No package with name '%s", package_name.data()); + return false; + } + + const size_t idx = package_ids_[package_id]; + if (idx == 0xff) { + return false; + } + + std::string output; + for (const ConfiguredPackage& package : package_groups_[idx].packages_) { + const LoadedPackage* loaded_package = package.loaded_package_; + for (auto it = loaded_package->begin(); it != loaded_package->end(); it++) { + const OverlayableInfo* info = loaded_package->GetOverlayableInfo(*it); + if (info != nullptr) { + ResourceName res_name; + if (!GetResourceName(*it, &res_name)) { + ANDROID_LOG(ERROR) << base::StringPrintf( + "Unable to retrieve name of overlayable resource 0x%08x", *it); + return false; + } + + const std::string name = ToFormattedResourceString(&res_name); + output.append(base::StringPrintf( + "resource='%s' overlayable='%s' actor='%s' policy='0x%08x'\n", + name.c_str(), info->name.c_str(), info->actor.c_str(), info->policy_flags)); + } + } + } + + *out = std::move(output); + return true; +} + void AssetManager2::SetConfiguration(const ResTable_config& configuration) { const int diff = configuration_.diff(configuration); configuration_ = configuration; @@ -1073,7 +1129,7 @@ void AssetManager2::InvalidateCaches(uint32_t diff) { } } -uint8_t AssetManager2::GetAssignedPackageId(const LoadedPackage* package) { +uint8_t AssetManager2::GetAssignedPackageId(const LoadedPackage* package) const { for (auto& package_group : package_groups_) { for (auto& package2 : package_group.packages_) { if (package2.loaded_package_ == package) { diff --git a/libs/androidfw/include/androidfw/AssetManager2.h b/libs/androidfw/include/androidfw/AssetManager2.h index 1e2b36cb1703..de46081a6aa3 100644 --- a/libs/androidfw/include/androidfw/AssetManager2.h +++ b/libs/androidfw/include/androidfw/AssetManager2.h @@ -124,6 +124,10 @@ class AssetManager2 { // This may be nullptr if the APK represented by `cookie` has no resource table. const DynamicRefTable* GetDynamicRefTableForCookie(ApkAssetsCookie cookie) const; + // Returns a string representation of the overlayable API of a package. + bool GetOverlayablesToString(const android::StringPiece& package_name, + std::string* out) const; + const std::unordered_map<std::string, std::string>* GetOverlayableMapForPackage(uint32_t package_id) const; @@ -308,7 +312,7 @@ class AssetManager2 { const ResolvedBag* GetBag(uint32_t resid, std::vector<uint32_t>& child_resids); // Retrieve the assigned package id of the package if loaded into this AssetManager - uint8_t GetAssignedPackageId(const LoadedPackage* package); + uint8_t GetAssignedPackageId(const LoadedPackage* package) const; // The ordered list of ApkAssets to search. These are not owned by the AssetManager, and must // have a longer lifetime. diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp index 40c8e46e4d84..15910241518d 100644 --- a/libs/androidfw/tests/AssetManager2_test.cpp +++ b/libs/androidfw/tests/AssetManager2_test.cpp @@ -707,7 +707,7 @@ TEST_F(AssetManager2Test, GetLastPathAfterDisablingReturnsEmpty) { EXPECT_EQ("", resultDisabled); } -TEST_F(AssetManager2Test, GetOverlayableMap) { +TEST_F(AssetManager2Test, GetOverlayablesToString) { ResTable_config desired_config; memset(&desired_config, 0, sizeof(desired_config)); @@ -721,6 +721,12 @@ TEST_F(AssetManager2Test, GetOverlayableMap) { ASSERT_EQ(2, map->size()); ASSERT_EQ(map->at("OverlayableResources1"), "overlay://theme"); ASSERT_EQ(map->at("OverlayableResources2"), "overlay://com.android.overlayable"); + + std::string api; + ASSERT_TRUE(assetmanager.GetOverlayablesToString("com.android.overlayable", &api)); + ASSERT_EQ(api.find("not_overlayable"), std::string::npos); + ASSERT_NE(api.find("resource='com.android.overlayable:string/overlayable2' overlayable='OverlayableResources1' actor='overlay://theme' policy='0x0000000a'\n"), + std::string::npos); } } // namespace android diff --git a/libs/input/Android.bp b/libs/input/Android.bp index 16f2917f8df8..6bb896fd7b29 100644 --- a/libs/input/Android.bp +++ b/libs/input/Android.bp @@ -20,11 +20,11 @@ cc_library_shared { ], shared_libs: [ + "libandroid_runtime", "libbinder", "libcutils", "liblog", "libutils", - "libhwui", "libgui", "libui", "libinput", diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp index abf083789c23..e4348f2a9b21 100644 --- a/libs/input/PointerController.cpp +++ b/libs/input/PointerController.cpp @@ -24,12 +24,6 @@ #include <log/log.h> -#include <SkBitmap.h> -#include <SkCanvas.h> -#include <SkColor.h> -#include <SkPaint.h> -#include <SkBlendMode.h> - namespace android { // --- WeakLooperCallback --- diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp index fd386e9f7a8a..804644c230b9 100644 --- a/libs/input/SpriteController.cpp +++ b/libs/input/SpriteController.cpp @@ -23,11 +23,9 @@ #include <utils/String8.h> #include <gui/Surface.h> -#include <SkBitmap.h> -#include <SkCanvas.h> -#include <SkColor.h> -#include <SkPaint.h> - +#include <android/graphics/bitmap.h> +#include <android/graphics/canvas.h> +#include <android/graphics/paint.h> #include <android/native_window.h> namespace android { @@ -132,8 +130,8 @@ void SpriteController::doUpdateSprites() { SpriteUpdate& update = updates.editItemAt(i); if (update.state.surfaceControl == NULL && update.state.wantSurfaceVisible()) { - update.state.surfaceWidth = update.state.icon.bitmap.width(); - update.state.surfaceHeight = update.state.icon.bitmap.height(); + update.state.surfaceWidth = update.state.icon.bitmap.getInfo().width; + update.state.surfaceHeight = update.state.icon.bitmap.getInfo().height; update.state.surfaceDrawn = false; update.state.surfaceVisible = false; update.state.surfaceControl = obtainSurface( @@ -154,8 +152,8 @@ void SpriteController::doUpdateSprites() { } if (update.state.wantSurfaceVisible()) { - int32_t desiredWidth = update.state.icon.bitmap.width(); - int32_t desiredHeight = update.state.icon.bitmap.height(); + int32_t desiredWidth = update.state.icon.bitmap.getInfo().width; + int32_t desiredHeight = update.state.icon.bitmap.getInfo().height; if (update.state.surfaceWidth < desiredWidth || update.state.surfaceHeight < desiredHeight) { needApplyTransaction = true; @@ -201,26 +199,22 @@ void SpriteController::doUpdateSprites() { if (status) { ALOGE("Error %d locking sprite surface before drawing.", status); } else { - SkBitmap surfaceBitmap; - ssize_t bpr = outBuffer.stride * bytesPerPixel(outBuffer.format); - surfaceBitmap.installPixels(SkImageInfo::MakeN32Premul(outBuffer.width, outBuffer.height), - outBuffer.bits, bpr); + graphics::Paint paint; + paint.setBlendMode(ABLEND_MODE_SRC); - SkCanvas surfaceCanvas(surfaceBitmap); + graphics::Canvas canvas(outBuffer, (int32_t) surface->getBuffersDataSpace()); + canvas.drawBitmap(update.state.icon.bitmap, 0, 0, &paint); - SkPaint paint; - paint.setBlendMode(SkBlendMode::kSrc); - surfaceCanvas.drawBitmap(update.state.icon.bitmap, 0, 0, &paint); + const int iconWidth = update.state.icon.bitmap.getInfo().width; + const int iconHeight = update.state.icon.bitmap.getInfo().height; - if (outBuffer.width > update.state.icon.bitmap.width()) { - paint.setColor(0); // transparent fill color - surfaceCanvas.drawRect(SkRect::MakeLTRB(update.state.icon.bitmap.width(), 0, - outBuffer.width, update.state.icon.bitmap.height()), paint); + if (outBuffer.width > iconWidth) { + paint.setBlendMode(ABLEND_MODE_CLEAR); // clear to transparent + canvas.drawRect({iconWidth, 0, outBuffer.width, iconHeight}, paint); } - if (outBuffer.height > update.state.icon.bitmap.height()) { - paint.setColor(0); // transparent fill color - surfaceCanvas.drawRect(SkRect::MakeLTRB(0, update.state.icon.bitmap.height(), - outBuffer.width, outBuffer.height), paint); + if (outBuffer.height > iconHeight) { + paint.setBlendMode(ABLEND_MODE_CLEAR); // clear to transparent + canvas.drawRect({0, iconHeight, outBuffer.width, outBuffer.height}, paint); } status = surface->unlockAndPost(); @@ -398,12 +392,7 @@ void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) { uint32_t dirty; if (icon.isValid()) { - SkBitmap* bitmapCopy = &mLocked.state.icon.bitmap; - if (bitmapCopy->tryAllocPixels(icon.bitmap.info().makeColorType(kN32_SkColorType))) { - icon.bitmap.readPixels(bitmapCopy->info(), bitmapCopy->getPixels(), - bitmapCopy->rowBytes(), 0, 0); - } - + mLocked.state.icon.bitmap = icon.bitmap.copy(ANDROID_BITMAP_FORMAT_RGBA_8888); if (!mLocked.state.icon.isValid() || mLocked.state.icon.hotSpotX != icon.hotSpotX || mLocked.state.icon.hotSpotY != icon.hotSpotY) { diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h index 79a904f5fe65..2513544d4bdf 100644 --- a/libs/input/SpriteController.h +++ b/libs/input/SpriteController.h @@ -20,10 +20,9 @@ #include <utils/RefBase.h> #include <utils/Looper.h> +#include <android/graphics/bitmap.h> #include <gui/SurfaceComposerClient.h> -#include <SkBitmap.h> - namespace android { /* @@ -56,21 +55,16 @@ struct SpriteTransformationMatrix { */ struct SpriteIcon { inline SpriteIcon() : style(0), hotSpotX(0), hotSpotY(0) { } - inline SpriteIcon(const SkBitmap& bitmap, int32_t style, float hotSpotX, float hotSpotY) : + inline SpriteIcon(const graphics::Bitmap& bitmap, int32_t style, float hotSpotX, float hotSpotY) : bitmap(bitmap), style(style), hotSpotX(hotSpotX), hotSpotY(hotSpotY) { } - SkBitmap bitmap; + graphics::Bitmap bitmap; int32_t style; float hotSpotX; float hotSpotY; inline SpriteIcon copy() const { - SkBitmap bitmapCopy; - if (bitmapCopy.tryAllocPixels(bitmap.info().makeColorType(kN32_SkColorType))) { - bitmap.readPixels(bitmapCopy.info(), bitmapCopy.getPixels(), bitmapCopy.rowBytes(), - 0, 0); - } - return SpriteIcon(bitmapCopy, style, hotSpotX, hotSpotY); + return SpriteIcon(bitmap.copy(ANDROID_BITMAP_FORMAT_RGBA_8888), style, hotSpotX, hotSpotY); } inline void reset() { @@ -81,7 +75,7 @@ struct SpriteIcon { } inline bool isValid() const { - return !bitmap.isNull() && !bitmap.empty(); + return bitmap.isValid() && !bitmap.isEmpty(); } }; @@ -183,7 +177,7 @@ private: * This structure is designed so that it can be copied during updates so that * surfaces can be resized and redrawn without blocking the client by holding a lock * on the sprites for a long time. - * Note that the SkBitmap holds a reference to a shared (and immutable) pixel ref. */ + * Note that the SpriteIcon holds a reference to a shared (and immutable) bitmap. */ struct SpriteState { inline SpriteState() : dirty(0), visible(false), diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp index e83b2a78d180..b1e3d6fe845a 100644 --- a/libs/input/tests/Android.bp +++ b/libs/input/tests/Android.bp @@ -18,9 +18,9 @@ cc_test { "PointerController_test.cpp", ], shared_libs: [ + "libandroid_runtime", "libinputservice", "libgui", - "libhwui", "libutils", ], static_libs: [ diff --git a/location/java/android/location/AbstractListenerManager.java b/location/java/android/location/AbstractListenerManager.java new file mode 100644 index 000000000000..c41023e31065 --- /dev/null +++ b/location/java/android/location/AbstractListenerManager.java @@ -0,0 +1,139 @@ +/* + * 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 android.location; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.os.Binder; +import android.os.Handler; +import android.os.HandlerExecutor; +import android.os.RemoteException; +import android.util.ArrayMap; + +import com.android.internal.annotations.GuardedBy; +import com.android.internal.util.Preconditions; + +import java.util.concurrent.Executor; +import java.util.function.Consumer; + +/** + * A base class to manage listeners that have a 1:N -> source:listener relationship. + * + * @hide + */ +abstract class AbstractListenerManager<T> { + + private static class Registration<T> { + private final Executor mExecutor; + @Nullable private volatile T mListener; + + private Registration(Executor executor, T listener) { + Preconditions.checkArgument(listener != null); + Preconditions.checkArgument(executor != null); + mExecutor = executor; + mListener = listener; + } + + private void unregister() { + mListener = null; + } + + private void execute(Consumer<T> operation) { + mExecutor.execute(() -> { + T listener = mListener; + if (listener == null) { + return; + } + + // we may be under the binder identity if a direct executor is used + long identity = Binder.clearCallingIdentity(); + try { + operation.accept(listener); + } finally { + Binder.restoreCallingIdentity(identity); + } + }); + } + } + + @GuardedBy("mListeners") + private final ArrayMap<Object, Registration<T>> mListeners = new ArrayMap<>(); + + public boolean addListener(@NonNull T listener, @NonNull Handler handler) + throws RemoteException { + return addInternal(listener, handler); + } + + public boolean addListener(@NonNull T listener, @NonNull Executor executor) + throws RemoteException { + return addInternal(listener, executor); + } + + protected final boolean addInternal(Object listener, Handler handler) throws RemoteException { + return addInternal(listener, new HandlerExecutor(handler)); + } + + protected final boolean addInternal(Object listener, Executor executor) throws RemoteException { + return addInternal(listener, new Registration<>(executor, convertKey(listener))); + } + + private boolean addInternal(Object key, Registration<T> registration) throws RemoteException { + Preconditions.checkNotNull(key); + Preconditions.checkNotNull(registration); + + synchronized (mListeners) { + if (mListeners.isEmpty() && !registerService()) { + return false; + } + Registration<T> oldRegistration = mListeners.put(key, registration); + if (oldRegistration != null) { + oldRegistration.unregister(); + } + return true; + } + } + + public void removeListener(Object listener) throws RemoteException { + synchronized (mListeners) { + Registration<T> oldRegistration = mListeners.remove(listener); + if (oldRegistration == null) { + return; + } + oldRegistration.unregister(); + + if (mListeners.isEmpty()) { + unregisterService(); + } + } + } + + @SuppressWarnings("unchecked") + protected T convertKey(@NonNull Object listener) { + return (T) listener; + } + + protected abstract boolean registerService() throws RemoteException; + protected abstract void unregisterService() throws RemoteException; + + protected void execute(Consumer<T> operation) { + synchronized (mListeners) { + for (Registration<T> registration : mListeners.values()) { + registration.execute(operation); + } + } + } +} diff --git a/location/java/android/location/BatchedLocationCallbackTransport.java b/location/java/android/location/BatchedLocationCallbackTransport.java deleted file mode 100644 index e00f855e9302..000000000000 --- a/location/java/android/location/BatchedLocationCallbackTransport.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package android.location; - -import android.content.Context; -import android.os.RemoteException; - -import java.util.List; - -/** - * A handler class to manage transport callbacks for {@link BatchedLocationCallback}. - * - * @hide - */ -class BatchedLocationCallbackTransport - extends LocalListenerHelper<BatchedLocationCallback> { - private final ILocationManager mLocationManager; - - private final IBatchedLocationCallback mCallbackTransport = new CallbackTransport(); - - public BatchedLocationCallbackTransport(Context context, ILocationManager locationManager) { - super(context, "BatchedLocationCallbackTransport"); - mLocationManager = locationManager; - } - - @Override - protected boolean registerWithServer() throws RemoteException { - return mLocationManager.addGnssBatchingCallback( - mCallbackTransport, - getContext().getPackageName()); - } - - @Override - protected void unregisterFromServer() throws RemoteException { - mLocationManager.removeGnssBatchingCallback(); - } - - private class CallbackTransport extends IBatchedLocationCallback.Stub { - @Override - public void onLocationBatch(final List<Location> locations) { - ListenerOperation<BatchedLocationCallback> operation = - new ListenerOperation<BatchedLocationCallback>() { - @Override - public void execute(BatchedLocationCallback callback) - throws RemoteException { - callback.onLocationBatch(locations); - } - }; - foreach(operation); - } - } -} diff --git a/location/java/android/location/GnssMeasurementCallbackTransport.java b/location/java/android/location/GnssMeasurementCallbackTransport.java deleted file mode 100644 index 8cb8c0b78da1..000000000000 --- a/location/java/android/location/GnssMeasurementCallbackTransport.java +++ /dev/null @@ -1,97 +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 android.location; - -import android.content.Context; -import android.os.RemoteException; - -import com.android.internal.util.Preconditions; - -/** - * A handler class to manage transport callbacks for {@link GnssMeasurementsEvent.Callback}. - * - * @hide - */ -class GnssMeasurementCallbackTransport - extends LocalListenerHelper<GnssMeasurementsEvent.Callback> { - private static final String TAG = "GnssMeasCbTransport"; - private final ILocationManager mLocationManager; - - private final IGnssMeasurementsListener mListenerTransport = new ListenerTransport(); - - public GnssMeasurementCallbackTransport(Context context, ILocationManager locationManager) { - super(context, TAG); - mLocationManager = locationManager; - } - - @Override - protected boolean registerWithServer() throws RemoteException { - return mLocationManager.addGnssMeasurementsListener( - mListenerTransport, - getContext().getPackageName()); - } - - @Override - protected void unregisterFromServer() throws RemoteException { - mLocationManager.removeGnssMeasurementsListener(mListenerTransport); - } - - /** - * Injects GNSS measurement corrections into the GNSS chipset. - * - * @param measurementCorrections a {@link GnssMeasurementCorrections} object with the GNSS - * measurement corrections to be injected into the GNSS chipset. - */ - protected void injectGnssMeasurementCorrections( - GnssMeasurementCorrections measurementCorrections) throws RemoteException { - Preconditions.checkNotNull(measurementCorrections); - mLocationManager.injectGnssMeasurementCorrections( - measurementCorrections, getContext().getPackageName()); - } - - protected long getGnssCapabilities() throws RemoteException { - return mLocationManager.getGnssCapabilities(getContext().getPackageName()); - } - - private class ListenerTransport extends IGnssMeasurementsListener.Stub { - @Override - public void onGnssMeasurementsReceived(final GnssMeasurementsEvent event) { - ListenerOperation<GnssMeasurementsEvent.Callback> operation = - new ListenerOperation<GnssMeasurementsEvent.Callback>() { - @Override - public void execute(GnssMeasurementsEvent.Callback callback) - throws RemoteException { - callback.onGnssMeasurementsReceived(event); - } - }; - foreach(operation); - } - - @Override - public void onStatusChanged(final int status) { - ListenerOperation<GnssMeasurementsEvent.Callback> operation = - new ListenerOperation<GnssMeasurementsEvent.Callback>() { - @Override - public void execute(GnssMeasurementsEvent.Callback callback) - throws RemoteException { - callback.onStatusChanged(status); - } - }; - foreach(operation); - } - } -} diff --git a/location/java/android/location/GnssNavigationMessageCallbackTransport.java b/location/java/android/location/GnssNavigationMessageCallbackTransport.java deleted file mode 100644 index 1eafd02e52be..000000000000 --- a/location/java/android/location/GnssNavigationMessageCallbackTransport.java +++ /dev/null @@ -1,79 +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 android.location; - -import android.content.Context; -import android.os.RemoteException; - -/** - * A handler class to manage transport callback for {@link GnssNavigationMessage.Callback}. - * - * @hide - */ -class GnssNavigationMessageCallbackTransport - extends LocalListenerHelper<GnssNavigationMessage.Callback> { - private final ILocationManager mLocationManager; - - private final IGnssNavigationMessageListener mListenerTransport = new ListenerTransport(); - - public GnssNavigationMessageCallbackTransport( - Context context, - ILocationManager locationManager) { - super(context, "GnssNavigationMessageCallbackTransport"); - mLocationManager = locationManager; - } - - @Override - protected boolean registerWithServer() throws RemoteException { - return mLocationManager.addGnssNavigationMessageListener( - mListenerTransport, - getContext().getPackageName()); - } - - @Override - protected void unregisterFromServer() throws RemoteException { - mLocationManager.removeGnssNavigationMessageListener(mListenerTransport); - } - - private class ListenerTransport extends IGnssNavigationMessageListener.Stub { - @Override - public void onGnssNavigationMessageReceived(final GnssNavigationMessage event) { - ListenerOperation<GnssNavigationMessage.Callback> operation = - new ListenerOperation<GnssNavigationMessage.Callback>() { - @Override - public void execute(GnssNavigationMessage.Callback callback) - throws RemoteException { - callback.onGnssNavigationMessageReceived(event); - } - }; - foreach(operation); - } - - @Override - public void onStatusChanged(final int status) { - ListenerOperation<GnssNavigationMessage.Callback> operation = - new ListenerOperation<GnssNavigationMessage.Callback>() { - @Override - public void execute(GnssNavigationMessage.Callback callback) - throws RemoteException { - callback.onStatusChanged(status); - } - }; - foreach(operation); - } - } -} diff --git a/location/java/android/location/LocalListenerHelper.java b/location/java/android/location/LocalListenerHelper.java deleted file mode 100644 index 592d01d2fed6..000000000000 --- a/location/java/android/location/LocalListenerHelper.java +++ /dev/null @@ -1,134 +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 android.location; - -import android.annotation.NonNull; -import android.content.Context; -import android.os.Handler; -import android.os.RemoteException; -import android.util.Log; - -import com.android.internal.util.Preconditions; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -/** - * A base handler class to manage transport and local listeners. - * - * @hide - */ -abstract class LocalListenerHelper<TListener> { - private final HashMap<TListener, Handler> mListeners = new HashMap<>(); - - private final String mTag; - private final Context mContext; - - protected LocalListenerHelper(Context context, String name) { - Preconditions.checkNotNull(name); - mContext = context; - mTag = name; - } - - /** - * Adds a {@param listener} to the list of listeners on which callbacks will be executed. The - * execution will happen on the {@param handler} thread or alternatively in the callback thread - * if a {@code null} handler value is passed. - */ - public boolean add(@NonNull TListener listener, Handler handler) { - Preconditions.checkNotNull(listener); - synchronized (mListeners) { - // we need to register with the service first, because we need to find out if the - // service will actually support the request before we attempt anything - if (mListeners.isEmpty()) { - boolean registeredWithService; - try { - registeredWithService = registerWithServer(); - } catch (RemoteException e) { - Log.e(mTag, "Error handling first listener.", e); - return false; - } - if (!registeredWithService) { - Log.e(mTag, "Unable to register listener transport."); - return false; - } - } - if (mListeners.containsKey(listener)) { - return true; - } - mListeners.put(listener, handler); - return true; - } - } - - public void remove(@NonNull TListener listener) { - Preconditions.checkNotNull(listener); - synchronized (mListeners) { - boolean removed = mListeners.containsKey(listener); - mListeners.remove(listener); - boolean isLastRemoved = removed && mListeners.isEmpty(); - if (isLastRemoved) { - try { - unregisterFromServer(); - } catch (RemoteException e) { - Log.v(mTag, "Error handling last listener removal", e); - } - } - } - } - - protected abstract boolean registerWithServer() throws RemoteException; - protected abstract void unregisterFromServer() throws RemoteException; - - protected interface ListenerOperation<TListener> { - void execute(TListener listener) throws RemoteException; - } - - protected Context getContext() { - return mContext; - } - - private void executeOperation(ListenerOperation<TListener> operation, TListener listener) { - try { - operation.execute(listener); - } catch (RemoteException e) { - Log.e(mTag, "Error in monitored listener.", e); - // don't return, give a fair chance to all listeners to receive the event - } - } - - protected void foreach(final ListenerOperation<TListener> operation) { - Collection<Map.Entry<TListener, Handler>> listeners; - synchronized (mListeners) { - listeners = new ArrayList<>(mListeners.entrySet()); - } - for (final Map.Entry<TListener, Handler> listener : listeners) { - if (listener.getValue() == null) { - executeOperation(operation, listener.getKey()); - } else { - listener.getValue().post(new Runnable() { - @Override - public void run() { - executeOperation(operation, listener.getKey()); - } - }); - } - } - } -} diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 5be4770440dc..6b47d1dff781 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -22,6 +22,7 @@ import static android.Manifest.permission.LOCATION_HARDWARE; import static android.Manifest.permission.WRITE_SECURE_SETTINGS; import android.Manifest; +import android.annotation.CallbackExecutor; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresFeature; @@ -33,13 +34,13 @@ import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageManager; +import android.os.Binder; import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.Looper; -import android.os.Message; import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; @@ -47,47 +48,32 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.Log; +import com.android.internal.annotations.GuardedBy; import com.android.internal.location.ProviderProperties; import com.android.internal.util.Preconditions; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.Executor; +import java.util.concurrent.RejectedExecutionException; /** - * This class provides access to the system location services. These - * services allow applications to obtain periodic updates of the - * device's geographical location, or to fire an application-specified - * {@link Intent} when the device enters the proximity of a given - * geographical location. + * This class provides access to the system location services. These services allow applications to + * obtain periodic updates of the device's geographical location, or to be notified when the device + * enters the proximity of a given geographical location. * - * <p class="note">Unless noted, all Location API methods require - * the {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} or - * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permissions. - * If your application only has the coarse permission then it will not have - * access to the GPS or passive location providers. Other providers will still - * return location results, but the update rate will be throttled and the exact - * location will be obfuscated to a coarse level of accuracy. + * <p class="note">Unless noted, all Location API methods require the {@link + * android.Manifest.permission#ACCESS_COARSE_LOCATION} or {@link + * android.Manifest.permission#ACCESS_FINE_LOCATION} permissions. If your application only has the + * coarse permission then it will not have access to fine location providers. Other providers will + * still return location results, but the exact location will be obfuscated to a coarse level of + * accuracy. */ +@SuppressWarnings({"deprecation", "DeprecatedIsStillUsed"}) @SystemService(Context.LOCATION_SERVICE) @RequiresFeature(PackageManager.FEATURE_LOCATION) public class LocationManager { - private static final String TAG = "LocationManager"; - private final Context mContext; - @UnsupportedAppUsage - private final ILocationManager mService; - private final GnssMeasurementCallbackTransport mGnssMeasurementCallbackTransport; - private final GnssNavigationMessageCallbackTransport mGnssNavigationMessageCallbackTransport; - private final BatchedLocationCallbackTransport mBatchedLocationCallbackTransport; - private final ArrayMap<GnssStatus.Callback, GnssStatusListenerTransport> mGnssStatusListeners = - new ArrayMap<>(); - private final ArrayMap<OnNmeaMessageListener, GnssStatusListenerTransport> mGnssNmeaListeners = - new ArrayMap<>(); - private final ArrayMap<GpsStatus.Listener, GnssStatusListenerTransport> mGpsStatusListeners = - new ArrayMap<>(); - // volatile + GnssStatus final-fields pattern to avoid a partially published object - private volatile GnssStatus mGnssStatus; - private int mTimeToFirstFix; + private static final String TAG = "LocationManager"; /** * Name of the network location provider. @@ -238,262 +224,440 @@ public class LocationManager { public static final String METADATA_SETTINGS_FOOTER_STRING = "com.android.settings.location.FOOTER_STRING"; - // Map from LocationListeners to their associated ListenerTransport objects - private final ArrayMap<LocationListener, ListenerTransport> mListeners = new ArrayMap<>(); + private final Context mContext; - private class ListenerTransport extends ILocationListener.Stub { - private static final int TYPE_LOCATION_CHANGED = 1; - private static final int TYPE_STATUS_CHANGED = 2; - private static final int TYPE_PROVIDER_ENABLED = 3; - private static final int TYPE_PROVIDER_DISABLED = 4; + @UnsupportedAppUsage + private final ILocationManager mService; - private LocationListener mListener; - private final Handler mListenerHandler; + @GuardedBy("mListeners") + private final ArrayMap<LocationListener, LocationListenerTransport> mListeners = + new ArrayMap<>(); - ListenerTransport(LocationListener listener, Looper looper) { - mListener = listener; + @GuardedBy("mBatchedLocationCallbackManager") + private final BatchedLocationCallbackManager mBatchedLocationCallbackManager = + new BatchedLocationCallbackManager(); + private final GnssStatusListenerManager + mGnssStatusListenerManager = new GnssStatusListenerManager(); + private final GnssMeasurementsListenerManager mGnssMeasurementsListenerManager = + new GnssMeasurementsListenerManager(); + private final GnssNavigationMessageListenerManager mGnssNavigationMessageListenerTransport = + new GnssNavigationMessageListenerManager(); - if (looper == null) { - mListenerHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - _handleMessage(msg); - } - }; - } else { - mListenerHandler = new Handler(looper) { - @Override - public void handleMessage(Message msg) { - _handleMessage(msg); - } - }; - } - } + /** + * @hide + */ + public LocationManager(@NonNull Context context, @NonNull ILocationManager service) { + mService = service; + mContext = context; + } - @Override - public void onLocationChanged(Location location) { - Message msg = Message.obtain(); - msg.what = TYPE_LOCATION_CHANGED; - msg.obj = location; - sendCallbackMessage(msg); + /** + * @hide + */ + @TestApi + public @NonNull String[] getBackgroundThrottlingWhitelist() { + try { + return mService.getBackgroundThrottlingWhitelist(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - @Override - public void onStatusChanged(String provider, int status, Bundle extras) { - Message msg = Message.obtain(); - msg.what = TYPE_STATUS_CHANGED; - Bundle b = new Bundle(); - b.putString("provider", provider); - b.putInt("status", status); - if (extras != null) { - b.putBundle("extras", extras); - } - msg.obj = b; - sendCallbackMessage(msg); + /** + * @hide + */ + @TestApi + public @NonNull String[] getIgnoreSettingsWhitelist() { + try { + return mService.getIgnoreSettingsWhitelist(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - @Override - public void onProviderEnabled(String provider) { - Message msg = Message.obtain(); - msg.what = TYPE_PROVIDER_ENABLED; - msg.obj = provider; - sendCallbackMessage(msg); + /** + * Returns the extra location controller package on the device. + * + * @hide + */ + @SystemApi + public @Nullable String getExtraLocationControllerPackage() { + try { + return mService.getExtraLocationControllerPackage(); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + return null; } + } - @Override - public void onProviderDisabled(String provider) { - Message msg = Message.obtain(); - msg.what = TYPE_PROVIDER_DISABLED; - msg.obj = provider; - sendCallbackMessage(msg); + /** + * Set the extra location controller package for location services on the device. + * + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) + public void setExtraLocationControllerPackage(@Nullable String packageName) { + try { + mService.setExtraLocationControllerPackage(packageName); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); } + } - private void sendCallbackMessage(Message msg) { - if (!mListenerHandler.sendMessage(msg)) { - locationCallbackFinished(); - } + /** + * Set whether the extra location controller package is currently enabled on the device. + * + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) + public void setExtraLocationControllerPackageEnabled(boolean enabled) { + try { + mService.setExtraLocationControllerPackageEnabled(enabled); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); } + } - private void _handleMessage(Message msg) { - switch (msg.what) { - case TYPE_LOCATION_CHANGED: - Location location = new Location((Location) msg.obj); - mListener.onLocationChanged(location); - break; - case TYPE_STATUS_CHANGED: - Bundle b = (Bundle) msg.obj; - String provider = b.getString("provider"); - int status = b.getInt("status"); - Bundle extras = b.getBundle("extras"); - mListener.onStatusChanged(provider, status, extras); - break; - case TYPE_PROVIDER_ENABLED: - mListener.onProviderEnabled((String) msg.obj); - break; - case TYPE_PROVIDER_DISABLED: - mListener.onProviderDisabled((String) msg.obj); - break; - } - locationCallbackFinished(); + /** + * Returns whether extra location controller package is currently enabled on the device. + * + * @hide + */ + @SystemApi + public boolean isExtraLocationControllerPackageEnabled() { + try { + return mService.isExtraLocationControllerPackageEnabled(); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + return false; } + } - private void locationCallbackFinished() { - try { - mService.locationCallbackFinished(this); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + /** + * Set the extra location controller package for location services on the device. + * + * @removed + * @deprecated Use {@link #setExtraLocationControllerPackage} instead. + * @hide + */ + @Deprecated + @SystemApi + @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) + public void setLocationControllerExtraPackage(String packageName) { + try { + mService.setExtraLocationControllerPackage(packageName); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); } } /** + * Set whether the extra location controller package is currently enabled on the device. + * + * @removed + * @deprecated Use {@link #setExtraLocationControllerPackageEnabled} instead. * @hide */ - @TestApi - public @NonNull String[] getBackgroundThrottlingWhitelist() { + @SystemApi + @Deprecated + @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) + public void setLocationControllerExtraPackageEnabled(boolean enabled) { try { - return mService.getBackgroundThrottlingWhitelist(); + mService.setExtraLocationControllerPackageEnabled(enabled); } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + e.rethrowFromSystemServer(); } } /** + * Returns the current enabled/disabled state of location. To listen for changes, see + * {@link #MODE_CHANGED_ACTION}. + * + * @return true if location is enabled and false if location is disabled. + */ + public boolean isLocationEnabled() { + return isLocationEnabledForUser(Process.myUserHandle()); + } + + /** + * Returns the current enabled/disabled state of location. + * + * @param userHandle the user to query + * @return true if location is enabled and false if location is disabled. + * * @hide */ - @TestApi - public @NonNull String[] getIgnoreSettingsWhitelist() { + @SystemApi + public boolean isLocationEnabledForUser(@NonNull UserHandle userHandle) { try { - return mService.getIgnoreSettingsWhitelist(); + return mService.isLocationEnabledForUser(userHandle.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * @hide - hide this constructor because it has a parameter - * of type ILocationManager, which is a system private class. The - * right way to create an instance of this class is using the - * factory Context.getSystemService. + * Enables or disables the location setting. + * + * @param enabled true to enable location and false to disable location. + * @param userHandle the user to set + * + * @hide */ - public LocationManager(@NonNull Context context, @NonNull ILocationManager service) { - mService = service; - mContext = context; - mGnssMeasurementCallbackTransport = - new GnssMeasurementCallbackTransport(mContext, mService); - mGnssNavigationMessageCallbackTransport = - new GnssNavigationMessageCallbackTransport(mContext, mService); - mBatchedLocationCallbackTransport = - new BatchedLocationCallbackTransport(mContext, mService); - + @SystemApi + @TestApi + @RequiresPermission(WRITE_SECURE_SETTINGS) + public void setLocationEnabledForUser(boolean enabled, @NonNull UserHandle userHandle) { + Settings.Secure.putIntForUser( + mContext.getContentResolver(), + Settings.Secure.LOCATION_MODE, + enabled + ? Settings.Secure.LOCATION_MODE_ON + : Settings.Secure.LOCATION_MODE_OFF, + userHandle.getIdentifier()); } - private LocationProvider createProvider(String name, ProviderProperties properties) { - return new LocationProvider(name, properties); + /** + * Returns the current enabled/disabled status of the given provider. To listen for changes, see + * {@link #PROVIDERS_CHANGED_ACTION}. + * + * Before API version {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method would throw + * {@link SecurityException} if the location permissions were not sufficient to use the + * specified provider. + * + * @param provider the name of the provider + * @return true if the provider exists and is enabled + * + * @throws IllegalArgumentException if provider is null + */ + public boolean isProviderEnabled(@NonNull String provider) { + return isProviderEnabledForUser(provider, Process.myUserHandle()); } /** - * Returns a list of the names of all known location providers. - * <p>All providers are returned, including ones that are not permitted to - * be accessed by the calling activity or are currently disabled. + * Returns the current enabled/disabled status of the given provider and user. Callers should + * prefer {@link #isLocationEnabledForUser(UserHandle)} unless they depend on provider-specific + * APIs. * - * @return list of Strings containing names of the provider + * Before API version {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method would throw + * {@link SecurityException} if the location permissions were not sufficient to use the + * specified provider. + * + * @param provider the name of the provider + * @param userHandle the user to query + * @return true if the provider exists and is enabled + * + * @throws IllegalArgumentException if provider is null + * @hide */ - public @NonNull List<String> getAllProviders() { + @SystemApi + public boolean isProviderEnabledForUser( + @NonNull String provider, @NonNull UserHandle userHandle) { + checkProvider(provider); + try { - return mService.getAllProviders(); + return mService.isProviderEnabledForUser(provider, userHandle.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Returns a list of the names of location providers. + * Method for enabling or disabling a single location provider. This method is deprecated and + * 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 enabledOnly if true then only the providers which are currently - * enabled are returned. - * @return list of Strings containing names of the providers + * @param provider the name of the provider + * @param enabled true to enable the provider. false to disable the provider + * @param userHandle the user to set + * @return true if the value was set, false otherwise + * + * @throws IllegalArgumentException if provider is null + * @deprecated Do not manipulate providers individually, use + * {@link #setLocationEnabledForUser(boolean, UserHandle)} instead. + * @hide */ - public @NonNull List<String> getProviders(boolean enabledOnly) { + @Deprecated + @SystemApi + @RequiresPermission(WRITE_SECURE_SETTINGS) + public boolean setProviderEnabledForUser( + @NonNull String provider, boolean enabled, @NonNull UserHandle userHandle) { + checkProvider(provider); + + return Settings.Secure.putStringForUser( + mContext.getContentResolver(), + Settings.Secure.LOCATION_PROVIDERS_ALLOWED, + (enabled ? "+" : "-") + provider, + userHandle.getIdentifier()); + } + + /** + * Get the last known location. + * + * <p>This location could be very old so use + * {@link Location#getElapsedRealtimeNanos} to calculate its age. It can + * also return null if no previous location is available. + * + * <p>Always returns immediately. + * + * @return The last known location, or null if not available + * @throws SecurityException if no suitable permission is present + * + * @hide + */ + @Nullable + public Location getLastLocation() { + String packageName = mContext.getPackageName(); + try { - return mService.getProviders(null, enabledOnly); + return mService.getLastLocation(null, packageName); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Returns the information associated with the location provider of the - * given name, or null if no provider exists by that name. + * Returns a Location indicating the data from the last known + * location fix obtained from the given provider. * - * @param name the provider name - * @return a LocationProvider, or null + * <p> This can be done + * without starting the provider. Note that this location could + * be out-of-date, for example if the device was turned off and + * moved to another location. * - * @throws IllegalArgumentException if name is null or does not exist - * @throws SecurityException if the caller is not permitted to access the - * given provider. + * <p> If the provider is currently disabled, null is returned. + * + * @param provider the name of the provider + * @return the last known location for the provider, or null + * + * @throws SecurityException if no suitable permission is present + * @throws IllegalArgumentException if provider is null or doesn't exist */ - public @Nullable LocationProvider getProvider(@NonNull String name) { - checkProvider(name); + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + @Nullable + public Location getLastKnownLocation(@NonNull String provider) { + checkProvider(provider); + String packageName = mContext.getPackageName(); + LocationRequest request = LocationRequest.createFromDeprecatedProvider( + provider, 0, 0, true); + try { - ProviderProperties properties = mService.getProviderProperties(name); - if (properties == null) { - return null; - } - return createProvider(name, properties); + return mService.getLastLocation(request, packageName); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Returns a list of the names of LocationProviders that satisfy the given - * criteria, or null if none do. Only providers that are permitted to be - * accessed by the calling activity will be returned. + * Register for a single location update using the named provider and + * a callback. * - * @param criteria the criteria that the returned providers must match - * @param enabledOnly if true then only the providers which are currently - * enabled are returned. - * @return list of Strings containing names of the providers + * <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 listener a {@link LocationListener} whose + * {@link LocationListener#onLocationChanged} method will be called when + * the location update is available + * @param looper a Looper object whose message queue will be used to + * implement the callback mechanism, or null to make callbacks on the calling + * thread + * + * @throws IllegalArgumentException if provider is null or doesn't exist + * @throws IllegalArgumentException if listener is null + * @throws SecurityException if no suitable permission is present */ - public @NonNull List<String> getProviders(@NonNull Criteria criteria, boolean enabledOnly) { + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void requestSingleUpdate( + @NonNull String provider, @NonNull LocationListener listener, @Nullable Looper looper) { + checkProvider(provider); + checkListener(listener); + + LocationRequest request = LocationRequest.createFromDeprecatedProvider( + provider, 0, 0, true); + requestLocationUpdates(request, listener, looper); + } + + /** + * Register for a single location update using a Criteria and + * a callback. + * + * <p>See {@link #requestLocationUpdates(long, float, Criteria, PendingIntent)} + * for more detail on how to use this method. + * + * @param criteria contains parameters for the location manager to choose the + * appropriate provider and parameters to compute the location + * @param listener a {@link LocationListener} whose + * {@link LocationListener#onLocationChanged} method will be called when + * the location update is available + * @param looper a Looper object whose message queue will be used to + * implement the callback mechanism, or null to make callbacks on the calling + * thread + * + * @throws IllegalArgumentException if criteria is null + * @throws IllegalArgumentException if listener is null + * @throws SecurityException if no suitable permission is present + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void requestSingleUpdate( + @NonNull Criteria criteria, + @NonNull LocationListener listener, + @Nullable Looper looper) { checkCriteria(criteria); - try { - return mService.getProviders(criteria, enabledOnly); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + checkListener(listener); + + LocationRequest request = LocationRequest.createFromDeprecatedCriteria( + criteria, 0, 0, true); + requestLocationUpdates(request, listener, looper); } /** - * Returns the name of the provider that best meets the given criteria. Only providers - * that are permitted to be accessed by the calling activity will be - * returned. If several providers meet the criteria, the one with the best - * accuracy is returned. If no provider meets the criteria, - * the criteria are loosened in the following sequence: + * Register for a single location update using a named provider and pending intent. * - * <ul> - * <li> power requirement - * <li> accuracy - * <li> bearing - * <li> speed - * <li> altitude - * </ul> + * <p>See {@link #requestLocationUpdates(long, float, Criteria, PendingIntent)} + * for more detail on how to use this method. * - * <p> Note that the requirement on monetary cost is not removed - * in this process. + * @param provider the name of the provider with which to register + * @param intent a {@link PendingIntent} to be sent for the location update * - * @param criteria the criteria that need to be matched - * @param enabledOnly if true then only a provider that is currently enabled is returned - * @return name of the provider that best matches the requirements + * @throws IllegalArgumentException if provider is null or doesn't exist + * @throws IllegalArgumentException if intent is null + * @throws SecurityException if no suitable permission is present */ - public @Nullable String getBestProvider(@NonNull Criteria criteria, boolean enabledOnly) { + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void requestSingleUpdate(@NonNull String provider, @NonNull PendingIntent intent) { + checkProvider(provider); + checkPendingIntent(intent); + + LocationRequest request = LocationRequest.createFromDeprecatedProvider( + provider, 0, 0, true); + requestLocationUpdates(request, intent); + } + + /** + * Register for a single location update using a Criteria and pending intent. + * + * <p>See {@link #requestLocationUpdates(long, float, Criteria, PendingIntent)} + * for more detail on how to use this method. + * + * @param criteria contains parameters for the location manager to choose the + * appropriate provider and parameters to compute the location + * @param intent a {@link PendingIntent} to be sent for the location update + * + * @throws IllegalArgumentException if provider is null or doesn't exist + * @throws IllegalArgumentException if intent is null + * @throws SecurityException if no suitable permission is present + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void requestSingleUpdate(@NonNull Criteria criteria, @NonNull PendingIntent intent) { checkCriteria(criteria); - try { - return mService.getBestProvider(criteria, enabledOnly); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + checkPendingIntent(intent); + + LocationRequest request = LocationRequest.createFromDeprecatedCriteria( + criteria, 0, 0, true); + requestLocationUpdates(request, intent); } /** @@ -524,7 +688,7 @@ public class LocationManager { LocationRequest request = LocationRequest.createFromDeprecatedProvider( provider, minTime, minDistance, false); - requestLocationUpdates(request, listener, null, null); + requestLocationUpdates(request, listener, null); } /** @@ -556,7 +720,36 @@ public class LocationManager { LocationRequest request = LocationRequest.createFromDeprecatedProvider( provider, minTime, minDistance, false); - requestLocationUpdates(request, listener, looper, null); + requestLocationUpdates(request, listener, looper); + } + + /** + * Register for location updates from the given provider with the given arguments. {@link + * LocationListener} callbacks will take place on the given {@link Executor}. Only one request + * can be registered for each unique listener, so any subsequent requests with the same listener + * will overwrite all associated arguments. + * + * <p>See {@link #requestLocationUpdates(String, long, float, LocationListener, Looper)} for + * more information. + * + * @param provider the name of the provider used for location updates + * @param minTimeMs minimum time interval between location updates, in milliseconds + * @param minDistanceM minimum distance between location updates, in meters + * @param executor all listener updates will take place on this {@link Executor} + * @param listener a {@link LocationListener} that will be called when updates are available + * @throws IllegalArgumentException if provider, listener, or looper is null or nonexistant + * @throws SecurityException if no suitable permission is present + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void requestLocationUpdates( + @NonNull String provider, + long minTimeMs, + float minDistanceM, + @NonNull @CallbackExecutor Executor executor, + @NonNull LocationListener listener) { + LocationRequest request = LocationRequest.createFromDeprecatedProvider( + provider, minTimeMs, minDistanceM, false); + requestLocationUpdates(request, executor, listener); } /** @@ -589,7 +782,33 @@ public class LocationManager { LocationRequest request = LocationRequest.createFromDeprecatedCriteria( criteria, minTime, minDistance, false); - requestLocationUpdates(request, listener, looper, null); + requestLocationUpdates(request, listener, looper); + } + + /** + * Uses the given {@link Criteria} to select a single provider to use for location updates. + * + * <p>See {@link #requestLocationUpdates(String, long, float, Executor, LocationListener)} for + * more information. + * + * @param minTimeMs minimum time interval between location updates, in milliseconds + * @param minDistanceM minimum distance between location updates, in meters + * @param criteria the {@link Criteria} used to select a provider for location updates + * @param executor all listener updates will take place on this {@link Executor} + * @param listener a {@link LocationListener} that will be called when updates are available + * @throws IllegalArgumentException if criteria, listener, or looper is null + * @throws SecurityException if no suitable permission is present + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void requestLocationUpdates( + long minTimeMs, + float minDistanceM, + @NonNull Criteria criteria, + @NonNull @CallbackExecutor Executor executor, + @NonNull LocationListener listener) { + LocationRequest request = LocationRequest.createFromDeprecatedCriteria( + criteria, minTimeMs, minDistanceM, false); + requestLocationUpdates(request, executor, listener); } /** @@ -617,7 +836,7 @@ public class LocationManager { LocationRequest request = LocationRequest.createFromDeprecatedProvider( provider, minTime, minDistance, false); - requestLocationUpdates(request, null, null, intent); + requestLocationUpdates(request, intent); } /** @@ -724,117 +943,7 @@ public class LocationManager { LocationRequest request = LocationRequest.createFromDeprecatedCriteria( criteria, minTime, minDistance, false); - requestLocationUpdates(request, null, null, intent); - } - - /** - * Register for a single location update using the named provider and - * a callback. - * - * <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 listener a {@link LocationListener} whose - * {@link LocationListener#onLocationChanged} method will be called when - * the location update is available - * @param looper a Looper object whose message queue will be used to - * implement the callback mechanism, or null to make callbacks on the calling - * thread - * - * @throws IllegalArgumentException if provider is null or doesn't exist - * @throws IllegalArgumentException if listener is null - * @throws SecurityException if no suitable permission is present - */ - @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) - public void requestSingleUpdate( - @NonNull String provider, @NonNull LocationListener listener, @Nullable Looper looper) { - checkProvider(provider); - checkListener(listener); - - LocationRequest request = LocationRequest.createFromDeprecatedProvider( - provider, 0, 0, true); - requestLocationUpdates(request, listener, looper, null); - } - - /** - * Register for a single location update using a Criteria and - * a callback. - * - * <p>See {@link #requestLocationUpdates(long, float, Criteria, PendingIntent)} - * for more detail on how to use this method. - * - * @param criteria contains parameters for the location manager to choose the - * appropriate provider and parameters to compute the location - * @param listener a {@link LocationListener} whose - * {@link LocationListener#onLocationChanged} method will be called when - * the location update is available - * @param looper a Looper object whose message queue will be used to - * implement the callback mechanism, or null to make callbacks on the calling - * thread - * - * @throws IllegalArgumentException if criteria is null - * @throws IllegalArgumentException if listener is null - * @throws SecurityException if no suitable permission is present - */ - @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) - public void requestSingleUpdate( - @NonNull Criteria criteria, - @NonNull LocationListener listener, - @Nullable Looper looper) { - checkCriteria(criteria); - checkListener(listener); - - LocationRequest request = LocationRequest.createFromDeprecatedCriteria( - criteria, 0, 0, true); - requestLocationUpdates(request, listener, looper, null); - } - - /** - * Register for a single location update using a named provider and pending intent. - * - * <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 intent a {@link PendingIntent} to be sent for the location update - * - * @throws IllegalArgumentException if provider is null or doesn't exist - * @throws IllegalArgumentException if intent is null - * @throws SecurityException if no suitable permission is present - */ - @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) - public void requestSingleUpdate(@NonNull String provider, @NonNull PendingIntent intent) { - checkProvider(provider); - checkPendingIntent(intent); - - LocationRequest request = LocationRequest.createFromDeprecatedProvider( - provider, 0, 0, true); - requestLocationUpdates(request, null, null, intent); - } - - /** - * Register for a single location update using a Criteria and pending intent. - * - * <p>See {@link #requestLocationUpdates(long, float, Criteria, PendingIntent)} - * for more detail on how to use this method. - * - * @param criteria contains parameters for the location manager to choose the - * appropriate provider and parameters to compute the location - * @param intent a {@link PendingIntent} to be sent for the location update - * - * @throws IllegalArgumentException if provider is null or doesn't exist - * @throws IllegalArgumentException if intent is null - * @throws SecurityException if no suitable permission is present - */ - @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) - public void requestSingleUpdate(@NonNull Criteria criteria, @NonNull PendingIntent intent) { - checkCriteria(criteria); - checkPendingIntent(intent); - - LocationRequest request = LocationRequest.createFromDeprecatedCriteria( - criteria, 0, 0, true); - requestLocationUpdates(request, null, null, intent); + requestLocationUpdates(request, intent); } /** @@ -881,7 +990,7 @@ public class LocationManager { * * <p> To unregister for Location updates, use: {@link #removeUpdates(LocationListener)}. * - * @param request quality of service required, null for default low power + * @param locationRequest quality of service required, null for default low power * @param listener a {@link LocationListener} whose * {@link LocationListener#onLocationChanged} method will be called when * the location update is available @@ -898,13 +1007,37 @@ public class LocationManager { @TestApi @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates( - @NonNull LocationRequest request, + @NonNull LocationRequest locationRequest, @NonNull LocationListener listener, @Nullable Looper looper) { - checkListener(listener); - requestLocationUpdates(request, listener, looper, null); + requestLocationUpdates(locationRequest, + new LocationListenerTransport(looper == null ? new Handler() : new Handler(looper), + listener)); } + /** + * Register for location updates with the given {@link LocationRequest}. + * + * <p>See {@link #requestLocationUpdates(String, long, float, Executor, LocationListener)} for + * more information. + * + * @param locationRequest the {@link LocationRequest} being made + * @param executor all listener updates will take place on this {@link Executor} + * @param listener a {@link LocationListener} that will be called when updates are + * available + * @throws IllegalArgumentException if locationRequest, listener, or executor is null + * @throws SecurityException if no suitable permission is present + * @hide + */ + @SystemApi + @TestApi + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void requestLocationUpdates( + @NonNull LocationRequest locationRequest, + @NonNull @CallbackExecutor Executor executor, + @NonNull LocationListener listener) { + requestLocationUpdates(locationRequest, new LocationListenerTransport(executor, listener)); + } /** * Register for fused location updates using a LocationRequest and a pending intent. @@ -918,8 +1051,8 @@ public class LocationManager { * <p> See {@link #requestLocationUpdates(LocationRequest, LocationListener, Looper)} * for more detail. * - * @param request quality of service required, null for default low power - * @param intent a {@link PendingIntent} to be sent for the location update + * @param locationRequest quality of service required, null for default low power + * @param pendingIntent a {@link PendingIntent} to be sent for the location update * * @throws IllegalArgumentException if intent is null * @throws SecurityException if no suitable permission is present @@ -930,9 +1063,38 @@ public class LocationManager { @TestApi @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates( - @NonNull LocationRequest request, @NonNull PendingIntent intent) { - checkPendingIntent(intent); - requestLocationUpdates(request, null, null, intent); + @NonNull LocationRequest locationRequest, + @NonNull PendingIntent pendingIntent) { + Preconditions.checkArgument(locationRequest != null, "invalid null location request"); + Preconditions.checkArgument(pendingIntent != null, "invalid null pending intent"); + if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.JELLY_BEAN) { + Preconditions.checkArgument(pendingIntent.isTargetedToPackage(), + "pending intent must be targeted to package"); + } + + try { + mService.requestLocationUpdates(locationRequest, null, pendingIntent, + mContext.getPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + private void requestLocationUpdates(LocationRequest request, + LocationListenerTransport transport) { + synchronized (mListeners) { + LocationListenerTransport oldTransport = mListeners.put(transport.getKey(), transport); + if (oldTransport != null) { + oldTransport.unregisterListener(); + } + + try { + mService.requestLocationUpdates(request, transport, null, + mContext.getPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } } /** @@ -963,443 +1125,185 @@ public class LocationManager { } } - private ListenerTransport wrapListener(LocationListener listener, Looper looper) { - if (listener == null) return null; - synchronized (mListeners) { - ListenerTransport transport = mListeners.get(listener); - if (transport == null) { - transport = new ListenerTransport(listener, looper); - } - mListeners.put(listener, transport); - return transport; - } - } - - @UnsupportedAppUsage - private void requestLocationUpdates(LocationRequest request, LocationListener listener, - Looper looper, PendingIntent intent) { - - String packageName = mContext.getPackageName(); - - // wrap the listener class - ListenerTransport transport = wrapListener(listener, looper); - - try { - mService.requestLocationUpdates(request, transport, intent, packageName); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - /** - * Removes all location updates for the specified LocationListener. + * Removes location updates for the specified LocationListener. Following this call, updates + * will no longer occur for this listener. * - * <p>Following this call, updates will no longer - * occur for this listener. - * - * @param listener listener object that no longer needs location updates + * @param listener listener that no longer needs location updates * @throws IllegalArgumentException if listener is null */ public void removeUpdates(@NonNull LocationListener listener) { - checkListener(listener); - String packageName = mContext.getPackageName(); + Preconditions.checkArgument(listener != null, "invalid null listener"); - ListenerTransport transport; synchronized (mListeners) { - transport = mListeners.remove(listener); - } - if (transport == null) return; - - try { - mService.removeUpdates(transport, null, packageName); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - /** - * Removes all location updates for the specified pending intent. - * - * <p>Following this call, updates will no longer for this pending intent. - * - * @param intent pending intent object that no longer needs location updates - * @throws IllegalArgumentException if intent is null - */ - public void removeUpdates(@NonNull PendingIntent intent) { - checkPendingIntent(intent); - String packageName = mContext.getPackageName(); - - try { - mService.removeUpdates(null, intent, packageName); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - /** - * Set a proximity alert for the location given by the position - * (latitude, longitude) and the given radius. - * - * <p> When the device - * detects that it has entered or exited the area surrounding the - * location, the given PendingIntent will be used to create an Intent - * to be fired. - * - * <p> The fired Intent will have a boolean extra added with key - * {@link #KEY_PROXIMITY_ENTERING}. If the value is true, the device is - * entering the proximity region; if false, it is exiting. - * - * <p> Due to the approximate nature of position estimation, if the - * device passes through the given area briefly, it is possible - * that no Intent will be fired. Similarly, an Intent could be - * fired if the device passes very close to the given area but - * does not actually enter it. - * - * <p> After the number of milliseconds given by the expiration - * parameter, the location manager will delete this proximity - * alert and no longer monitor it. A value of -1 indicates that - * there should be no expiration time. - * - * <p> Internally, this method uses both {@link #NETWORK_PROVIDER} - * and {@link #GPS_PROVIDER}. - * - * <p>Before API version 17, this method could be used with - * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or - * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. - * From API version 17 and onwards, this method requires - * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. - * - * @param latitude the latitude of the central point of the - * alert region - * @param longitude the longitude of the central point of the - * alert region - * @param radius the radius of the central point of the - * alert region, in meters - * @param expiration time for this proximity alert, in milliseconds, - * or -1 to indicate no expiration - * @param intent a PendingIntent that will be used to generate an Intent to - * fire when entry to or exit from the alert region is detected - * - * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} - * permission is not present - */ - @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) - public void addProximityAlert(double latitude, double longitude, float radius, long expiration, - @NonNull PendingIntent intent) { - checkPendingIntent(intent); - if (expiration < 0) expiration = Long.MAX_VALUE; + LocationListenerTransport transport = mListeners.remove(listener); + if (transport == null) { + return; + } + transport.unregisterListener(); - Geofence fence = Geofence.createCircle(latitude, longitude, radius); - LocationRequest request = new LocationRequest().setExpireIn(expiration); - try { - mService.requestGeofence(request, fence, intent, mContext.getPackageName()); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + try { + mService.removeUpdates(transport, null, mContext.getPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } /** - * Add a geofence with the specified LocationRequest quality of service. - * - * <p> When the device - * detects that it has entered or exited the area surrounding the - * location, the given PendingIntent will be used to create an Intent - * to be fired. - * - * <p> The fired Intent will have a boolean extra added with key - * {@link #KEY_PROXIMITY_ENTERING}. If the value is true, the device is - * entering the proximity region; if false, it is exiting. + * Removes all location updates for the specified pending intent. Following this call, updates + * will no longer occur for this pending intent. * - * <p> The geofence engine fuses results from all location providers to - * provide the best balance between accuracy and power. Applications - * can choose the quality of service required using the - * {@link LocationRequest} object. If it is null then a default, - * low power geo-fencing implementation is used. It is possible to cross - * a geo-fence without notification, but the system will do its best - * to detect, using {@link LocationRequest} as a hint to trade-off - * accuracy and power. - * - * <p> The power required by the geofence engine can depend on many factors, - * such as quality and interval requested in {@link LocationRequest}, - * distance to nearest geofence and current device velocity. - * - * @param request quality of service required, null for default low power - * @param fence a geographical description of the geofence area - * @param intent pending intent to receive geofence updates - * - * @throws IllegalArgumentException if fence is null - * @throws IllegalArgumentException if intent is null - * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} - * permission is not present - * - * @hide + * @param pendingIntent pending intent that no longer needs location updates + * @throws IllegalArgumentException if pendingIntent is null */ - @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) - public void addGeofence( - @NonNull LocationRequest request, - @NonNull Geofence fence, - @NonNull PendingIntent intent) { - checkPendingIntent(intent); - checkGeofence(fence); + public void removeUpdates(@NonNull PendingIntent pendingIntent) { + Preconditions.checkArgument(pendingIntent != null, "invalid null pending intent"); try { - mService.requestGeofence(request, fence, intent, mContext.getPackageName()); + mService.removeUpdates(null, pendingIntent, mContext.getPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Removes the proximity alert with the given PendingIntent. - * - * <p>Before API version 17, this method could be used with - * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or - * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. - * From API version 17 and onwards, this method requires - * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. - * - * @param intent the PendingIntent that no longer needs to be notified of - * proximity alerts + * Returns a list of the names of all known location providers. + * <p>All providers are returned, including ones that are not permitted to + * be accessed by the calling activity or are currently disabled. * - * @throws IllegalArgumentException if intent is null - * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} - * permission is not present + * @return list of Strings containing names of the provider */ - public void removeProximityAlert(@NonNull PendingIntent intent) { - checkPendingIntent(intent); - String packageName = mContext.getPackageName(); - + public @NonNull List<String> getAllProviders() { try { - mService.removeGeofence(null, intent, packageName); + return mService.getAllProviders(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Remove a single geofence. - * - * <p>This removes only the specified geofence associated with the - * specified pending intent. All other geofences remain unchanged. - * - * @param fence a geofence previously passed to {@link #addGeofence} - * @param intent a pending intent previously passed to {@link #addGeofence} - * - * @throws IllegalArgumentException if fence is null - * @throws IllegalArgumentException if intent is null - * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} - * permission is not present + * Returns a list of the names of location providers. * - * @hide + * @param enabledOnly if true then only the providers which are currently + * enabled are returned. + * @return list of Strings containing names of the providers */ - public void removeGeofence(@NonNull Geofence fence, @NonNull PendingIntent intent) { - checkPendingIntent(intent); - checkGeofence(fence); - String packageName = mContext.getPackageName(); - + public @NonNull List<String> getProviders(boolean enabledOnly) { try { - mService.removeGeofence(fence, intent, packageName); + return mService.getProviders(null, enabledOnly); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Remove all geofences registered to the specified pending intent. - * - * @param intent a pending intent previously passed to {@link #addGeofence} - * - * @throws IllegalArgumentException if intent is null - * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} - * permission is not present + * Returns a list of the names of LocationProviders that satisfy the given + * criteria, or null if none do. Only providers that are permitted to be + * accessed by the calling activity will be returned. * - * @hide + * @param criteria the criteria that the returned providers must match + * @param enabledOnly if true then only the providers which are currently + * enabled are returned. + * @return list of Strings containing names of the providers */ - public void removeAllGeofences(@NonNull PendingIntent intent) { - checkPendingIntent(intent); - String packageName = mContext.getPackageName(); - + public @NonNull List<String> getProviders(@NonNull Criteria criteria, boolean enabledOnly) { + checkCriteria(criteria); try { - mService.removeGeofence(null, intent, packageName); + return mService.getProviders(criteria, enabledOnly); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Returns the current enabled/disabled state of location. To listen for changes, see - * {@link #MODE_CHANGED_ACTION}. + * Returns the name of the provider that best meets the given criteria. Only providers + * that are permitted to be accessed by the calling activity will be + * returned. If several providers meet the criteria, the one with the best + * accuracy is returned. If no provider meets the criteria, + * the criteria are loosened in the following sequence: * - * @return true if location is enabled and false if location is disabled. - */ - public boolean isLocationEnabled() { - return isLocationEnabledForUser(Process.myUserHandle()); - } - - /** - * Returns the current enabled/disabled state of location. + * <ul> + * <li> power requirement + * <li> accuracy + * <li> bearing + * <li> speed + * <li> altitude + * </ul> * - * @param userHandle the user to query - * @return true if location is enabled and false if location is disabled. + * <p> Note that the requirement on monetary cost is not removed + * in this process. * - * @hide + * @param criteria the criteria that need to be matched + * @param enabledOnly if true then only a provider that is currently enabled is returned + * @return name of the provider that best matches the requirements */ - @SystemApi - public boolean isLocationEnabledForUser(@NonNull UserHandle userHandle) { + public @Nullable String getBestProvider(@NonNull Criteria criteria, boolean enabledOnly) { + checkCriteria(criteria); try { - return mService.isLocationEnabledForUser(userHandle.getIdentifier()); + return mService.getBestProvider(criteria, enabledOnly); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Enables or disables the location setting. - * - * @param enabled true to enable location and false to disable location. - * @param userHandle the user to set - * - * @hide - */ - @SystemApi - @TestApi - @RequiresPermission(WRITE_SECURE_SETTINGS) - public void setLocationEnabledForUser(boolean enabled, @NonNull UserHandle userHandle) { - Settings.Secure.putIntForUser( - mContext.getContentResolver(), - Settings.Secure.LOCATION_MODE, - enabled - ? Settings.Secure.LOCATION_MODE_ON - : Settings.Secure.LOCATION_MODE_OFF, - userHandle.getIdentifier()); - } - - /** - * Returns the current enabled/disabled status of the given provider. To listen for changes, see - * {@link #PROVIDERS_CHANGED_ACTION}. - * - * Before API version {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method would throw - * {@link SecurityException} if the location permissions were not sufficient to use the - * specified provider. - * - * @param provider the name of the provider - * @return true if the provider exists and is enabled - * - * @throws IllegalArgumentException if provider is null - */ - public boolean isProviderEnabled(@NonNull String provider) { - return isProviderEnabledForUser(provider, Process.myUserHandle()); - } - - /** - * Returns the current enabled/disabled status of the given provider and user. Callers should - * prefer {@link #isLocationEnabledForUser(UserHandle)} unless they depend on provider-specific - * APIs. - * - * Before API version {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method would throw - * {@link SecurityException} if the location permissions were not sufficient to use the - * specified provider. + * Returns the information associated with the location provider of the + * given name, or null if no provider exists by that name. * - * @param provider the name of the provider - * @param userHandle the user to query - * @return true if the provider exists and is enabled + * @param name the provider name + * @return a LocationProvider, or null * - * @throws IllegalArgumentException if provider is null - * @hide + * @throws IllegalArgumentException if name is null or does not exist + * @throws SecurityException if the caller is not permitted to access the + * given provider. */ - @SystemApi - public boolean isProviderEnabledForUser( - @NonNull String provider, @NonNull UserHandle userHandle) { - checkProvider(provider); - + public @Nullable LocationProvider getProvider(@NonNull String name) { + checkProvider(name); try { - return mService.isProviderEnabledForUser(provider, userHandle.getIdentifier()); + ProviderProperties properties = mService.getProviderProperties(name); + if (properties == null) { + return null; + } + return new LocationProvider(name, properties); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Method for enabling or disabling a single location provider. This method is deprecated and - * 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 userHandle the user to set - * @return true if the value was set, false otherwise + * Returns true if the given package name matches a location provider package, and false + * otherwise. * - * @throws IllegalArgumentException if provider is null - * @deprecated Do not manipulate providers individually, use - * {@link #setLocationEnabledForUser(boolean, UserHandle)} instead. * @hide */ - @Deprecated @SystemApi - @RequiresPermission(WRITE_SECURE_SETTINGS) - public boolean setProviderEnabledForUser( - @NonNull String provider, boolean enabled, @NonNull UserHandle userHandle) { - checkProvider(provider); - - return Settings.Secure.putStringForUser( - mContext.getContentResolver(), - Settings.Secure.LOCATION_PROVIDERS_ALLOWED, - (enabled ? "+" : "-") + provider, - userHandle.getIdentifier()); - } - - /** - * Get the last known location. - * - * <p>This location could be very old so use - * {@link Location#getElapsedRealtimeNanos} to calculate its age. It can - * also return null if no previous location is available. - * - * <p>Always returns immediately. - * - * @return The last known location, or null if not available - * @throws SecurityException if no suitable permission is present - * - * @hide - */ - @Nullable - public Location getLastLocation() { - String packageName = mContext.getPackageName(); - + @RequiresPermission(Manifest.permission.READ_DEVICE_CONFIG) + public boolean isProviderPackage(@NonNull String packageName) { try { - return mService.getLastLocation(null, packageName); + return mService.isProviderPackage(packageName); } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + e.rethrowFromSystemServer(); + return false; } } /** - * Returns a Location indicating the data from the last known - * location fix obtained from the given provider. - * - * <p> This can be done - * without starting the provider. Note that this location could - * be out-of-date, for example if the device was turned off and - * moved to another location. - * - * <p> If the provider is currently disabled, null is returned. - * - * @param provider the name of the provider - * @return the last known location for the provider, or null + * Sends additional commands to a location provider. Can be used to support provider specific + * extensions to the Location Manager API. * - * @throws SecurityException if no suitable permission is present - * @throws IllegalArgumentException if provider is null or doesn't exist + * @param provider name of the location provider. + * @param command name of the command to send to the provider. + * @param extras optional arguments for the command (or null). + * @return true always */ - @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) - @Nullable - public Location getLastKnownLocation(@NonNull String provider) { - checkProvider(provider); - String packageName = mContext.getPackageName(); - LocationRequest request = LocationRequest.createFromDeprecatedProvider( - provider, 0, 0, true); + public boolean sendExtraCommand( + @NonNull String provider, @NonNull String command, @Nullable Bundle extras) { + Preconditions.checkArgument(provider != null, "invalid null provider"); + Preconditions.checkArgument(command != null, "invalid null command"); try { - return mService.getLastLocation(request, packageName); + return mService.sendExtraCommand(provider, command, extras); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1574,199 +1478,308 @@ public class LocationManager { } } - // --- GPS-specific support --- - - // This class is used to send Gnss status events to the client's specific thread. - private class GnssStatusListenerTransport extends IGnssStatusListener.Stub { - - private final GnssStatus.Callback mGnssCallback; - private final OnNmeaMessageListener mGnssNmeaListener; - - private class GnssHandler extends Handler { - GnssHandler(Handler handler) { - super(handler != null ? handler.getLooper() : Looper.myLooper()); - } + /** + * Set a proximity alert for the location given by the position + * (latitude, longitude) and the given radius. + * + * <p> When the device + * detects that it has entered or exited the area surrounding the + * location, the given PendingIntent will be used to create an Intent + * to be fired. + * + * <p> The fired Intent will have a boolean extra added with key + * {@link #KEY_PROXIMITY_ENTERING}. If the value is true, the device is + * entering the proximity region; if false, it is exiting. + * + * <p> Due to the approximate nature of position estimation, if the + * device passes through the given area briefly, it is possible + * that no Intent will be fired. Similarly, an Intent could be + * fired if the device passes very close to the given area but + * does not actually enter it. + * + * <p> After the number of milliseconds given by the expiration + * parameter, the location manager will delete this proximity + * alert and no longer monitor it. A value of -1 indicates that + * there should be no expiration time. + * + * <p> Internally, this method uses both {@link #NETWORK_PROVIDER} + * and {@link #GPS_PROVIDER}. + * + * <p>Before API version 17, this method could be used with + * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * From API version 17 and onwards, this method requires + * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. + * + * @param latitude the latitude of the central point of the + * alert region + * @param longitude the longitude of the central point of the + * alert region + * @param radius the radius of the central point of the + * alert region, in meters + * @param expiration time for this proximity alert, in milliseconds, + * or -1 to indicate no expiration + * @param intent a PendingIntent that will be used to generate an Intent to + * fire when entry to or exit from the alert region is detected + * + * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} + * permission is not present + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void addProximityAlert(double latitude, double longitude, float radius, long expiration, + @NonNull PendingIntent intent) { + checkPendingIntent(intent); + if (expiration < 0) expiration = Long.MAX_VALUE; - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case NMEA_RECEIVED: - synchronized (mNmeaBuffer) { - for (Nmea nmea : mNmeaBuffer) { - mGnssNmeaListener.onNmeaMessage(nmea.mNmea, nmea.mTimestamp); - } - mNmeaBuffer.clear(); - } - break; - case GNSS_EVENT_STARTED: - mGnssCallback.onStarted(); - break; - case GNSS_EVENT_STOPPED: - mGnssCallback.onStopped(); - break; - case GNSS_EVENT_FIRST_FIX: - mGnssCallback.onFirstFix(mTimeToFirstFix); - break; - case GNSS_EVENT_SATELLITE_STATUS: - mGnssCallback.onSatelliteStatusChanged(mGnssStatus); - break; - default: - break; - } - } + Geofence fence = Geofence.createCircle(latitude, longitude, radius); + LocationRequest request = new LocationRequest().setExpireIn(expiration); + try { + mService.requestGeofence(request, fence, intent, mContext.getPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - private final Handler mGnssHandler; - - private static final int NMEA_RECEIVED = 1; - private static final int GNSS_EVENT_STARTED = 2; - private static final int GNSS_EVENT_STOPPED = 3; - private static final int GNSS_EVENT_FIRST_FIX = 4; - private static final int GNSS_EVENT_SATELLITE_STATUS = 5; - - private class Nmea { - long mTimestamp; - String mNmea; + /** + * Removes the proximity alert with the given PendingIntent. + * + * <p>Before API version 17, this method could be used with + * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * From API version 17 and onwards, this method requires + * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. + * + * @param intent the PendingIntent that no longer needs to be notified of + * proximity alerts + * + * @throws IllegalArgumentException if intent is null + * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} + * permission is not present + */ + public void removeProximityAlert(@NonNull PendingIntent intent) { + checkPendingIntent(intent); + String packageName = mContext.getPackageName(); - Nmea(long timestamp, String nmea) { - mTimestamp = timestamp; - mNmea = nmea; - } + try { + mService.removeGeofence(null, intent, packageName); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - private final ArrayList<Nmea> mNmeaBuffer; + } - GnssStatusListenerTransport(GnssStatus.Callback callback, Handler handler) { - mGnssCallback = callback; - mGnssHandler = new GnssHandler(handler); - mGnssNmeaListener = null; - mNmeaBuffer = null; - } + /** + * Add a geofence with the specified LocationRequest quality of service. + * + * <p> When the device + * detects that it has entered or exited the area surrounding the + * location, the given PendingIntent will be used to create an Intent + * to be fired. + * + * <p> The fired Intent will have a boolean extra added with key + * {@link #KEY_PROXIMITY_ENTERING}. If the value is true, the device is + * entering the proximity region; if false, it is exiting. + * + * <p> The geofence engine fuses results from all location providers to + * provide the best balance between accuracy and power. Applications + * can choose the quality of service required using the + * {@link LocationRequest} object. If it is null then a default, + * low power geo-fencing implementation is used. It is possible to cross + * a geo-fence without notification, but the system will do its best + * to detect, using {@link LocationRequest} as a hint to trade-off + * accuracy and power. + * + * <p> The power required by the geofence engine can depend on many factors, + * such as quality and interval requested in {@link LocationRequest}, + * distance to nearest geofence and current device velocity. + * + * @param request quality of service required, null for default low power + * @param fence a geographical description of the geofence area + * @param intent pending intent to receive geofence updates + * + * @throws IllegalArgumentException if fence is null + * @throws IllegalArgumentException if intent is null + * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} + * permission is not present + * + * @hide + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + public void addGeofence( + @NonNull LocationRequest request, + @NonNull Geofence fence, + @NonNull PendingIntent intent) { + checkPendingIntent(intent); + checkGeofence(fence); - GnssStatusListenerTransport(OnNmeaMessageListener listener, Handler handler) { - mGnssCallback = null; - mGnssHandler = new GnssHandler(handler); - mGnssNmeaListener = listener; - mNmeaBuffer = new ArrayList<>(); + try { + mService.requestGeofence(request, fence, intent, mContext.getPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - GnssStatusListenerTransport(GpsStatus.Listener listener, Handler handler) { - mGnssHandler = new GnssHandler(handler); - mNmeaBuffer = null; - mGnssCallback = listener != null ? new GnssStatus.Callback() { - @Override - public void onStarted() { - listener.onGpsStatusChanged(GpsStatus.GPS_EVENT_STARTED); - } + /** + * Remove a single geofence. + * + * <p>This removes only the specified geofence associated with the + * specified pending intent. All other geofences remain unchanged. + * + * @param fence a geofence previously passed to {@link #addGeofence} + * @param intent a pending intent previously passed to {@link #addGeofence} + * + * @throws IllegalArgumentException if fence is null + * @throws IllegalArgumentException if intent is null + * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} + * permission is not present + * + * @hide + */ + public void removeGeofence(@NonNull Geofence fence, @NonNull PendingIntent intent) { + checkPendingIntent(intent); + checkGeofence(fence); + String packageName = mContext.getPackageName(); - @Override - public void onStopped() { - listener.onGpsStatusChanged(GpsStatus.GPS_EVENT_STOPPED); - } + try { + mService.removeGeofence(fence, intent, packageName); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } - @Override - public void onFirstFix(int ttff) { - listener.onGpsStatusChanged(GpsStatus.GPS_EVENT_FIRST_FIX); - } + /** + * Remove all geofences registered to the specified pending intent. + * + * @param intent a pending intent previously passed to {@link #addGeofence} + * + * @throws IllegalArgumentException if intent is null + * @throws SecurityException if {@link android.Manifest.permission#ACCESS_FINE_LOCATION} + * permission is not present + * + * @hide + */ + public void removeAllGeofences(@NonNull PendingIntent intent) { + checkPendingIntent(intent); + String packageName = mContext.getPackageName(); - @Override - public void onSatelliteStatusChanged(GnssStatus status) { - listener.onGpsStatusChanged(GpsStatus.GPS_EVENT_SATELLITE_STATUS); - } - } : null; - mGnssNmeaListener = null; + try { + mService.removeGeofence(null, intent, packageName); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - @Override - public void onGnssStarted() { - if (mGnssCallback != null) { - mGnssHandler.obtainMessage(GNSS_EVENT_STARTED).sendToTarget(); - } - } + // ================= GNSS APIs ================= - @Override - public void onGnssStopped() { - if (mGnssCallback != null) { - mGnssHandler.obtainMessage(GNSS_EVENT_STOPPED).sendToTarget(); + /** + * Returns the supported capabilities of the GNSS chipset. + * + * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present. + * + * @hide + */ + @SystemApi + @RequiresPermission(ACCESS_FINE_LOCATION) + public @NonNull GnssCapabilities getGnssCapabilities() { + try { + long gnssCapabilities = mService.getGnssCapabilities(mContext.getPackageName()); + if (gnssCapabilities == GnssCapabilities.INVALID_CAPABILITIES) { + gnssCapabilities = 0L; } + return GnssCapabilities.of(gnssCapabilities); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - @Override - public void onFirstFix(int ttff) { - if (mGnssCallback != null) { - mTimeToFirstFix = ttff; - mGnssHandler.obtainMessage(GNSS_EVENT_FIRST_FIX).sendToTarget(); - } + /** + * Returns the model year of the GNSS hardware and software build. More details, such as build + * date, may be available in {@link #getGnssHardwareModelName()}. May return 0 if the model year + * is less than 2016. + */ + public int getGnssYearOfHardware() { + try { + return mService.getGnssYearOfHardware(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - @Override - public void onSvStatusChanged(int svCount, int[] prnWithFlags, - float[] cn0s, float[] elevations, float[] azimuths, float[] carrierFreqs) { - if (mGnssCallback != null) { - mGnssStatus = new GnssStatus(svCount, prnWithFlags, cn0s, elevations, azimuths, - carrierFreqs); - - mGnssHandler.removeMessages(GNSS_EVENT_SATELLITE_STATUS); - mGnssHandler.obtainMessage(GNSS_EVENT_SATELLITE_STATUS).sendToTarget(); - } + /** + * Returns the Model Name (including Vendor and Hardware/Software Version) of the GNSS hardware + * driver. + * + * <p> No device-specific serial number or ID is returned from this API. + * + * <p> Will return null when the GNSS hardware abstraction layer does not support providing + * this value. + */ + @Nullable + public String getGnssHardwareModelName() { + try { + return mService.getGnssHardwareModelName(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } + } - @Override - public void onNmeaReceived(long timestamp, String nmea) { - if (mGnssNmeaListener != null) { - synchronized (mNmeaBuffer) { - mNmeaBuffer.add(new Nmea(timestamp, nmea)); - } - - mGnssHandler.removeMessages(NMEA_RECEIVED); - mGnssHandler.obtainMessage(NMEA_RECEIVED).sendToTarget(); - } + /** + * Retrieves information about the current status of the GPS engine. + * This should only be called from the {@link GpsStatus.Listener#onGpsStatusChanged} + * callback to ensure that the data is copied atomically. + * + * The caller may either pass in a {@link GpsStatus} object to set with the latest + * status information, or pass null to create a new {@link GpsStatus} object. + * + * @param status object containing GPS status details, or null. + * @return status object containing updated GPS status. + * @deprecated GpsStatus APIs are deprecated, use {@link GnssStatus} APIs instead. + */ + @Deprecated + @RequiresPermission(ACCESS_FINE_LOCATION) + public @Nullable GpsStatus getGpsStatus(@Nullable GpsStatus status) { + if (status == null) { + status = new GpsStatus(); } + // 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); + } + return status; } /** * Adds a GPS status listener. * * @param listener GPS status listener object to register - * * @return true if the listener was successfully added - * * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present - * @deprecated use {@link #registerGnssStatusCallback(GnssStatus.Callback)} instead. + * @deprecated use {@link #registerGnssStatusCallback(GnssStatus.Callback)} instead. No longer + * supported in apps targeting R and above. */ @Deprecated @RequiresPermission(ACCESS_FINE_LOCATION) public boolean addGpsStatusListener(GpsStatus.Listener listener) { - boolean result; - - if (mGpsStatusListeners.get(listener) != null) { - return true; - } try { - GnssStatusListenerTransport transport = new GnssStatusListenerTransport(listener, null); - result = mService.registerGnssStatusCallback(transport, mContext.getPackageName()); - if (result) { - mGpsStatusListeners.put(listener, transport); - } + return mGnssStatusListenerManager.addListener(listener, new Handler()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } - - return result; } /** * Removes a GPS status listener. * * @param listener GPS status listener object to remove - * @deprecated use {@link #unregisterGnssStatusCallback(GnssStatus.Callback)} instead. + * @deprecated use {@link #unregisterGnssStatusCallback(GnssStatus.Callback)} instead. No longer + * supported in apps targeting R and above. */ @Deprecated public void removeGpsStatusListener(GpsStatus.Listener listener) { try { - GnssStatusListenerTransport transport = mGpsStatusListeners.remove(listener); - if (transport != null) { - mService.unregisterGnssStatusCallback(transport); - } + mGnssStatusListenerManager.removeListener(listener); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1776,11 +1789,12 @@ public class LocationManager { * Registers a GNSS status callback. * * @param callback GNSS status callback object to register - * * @return true if the listener was successfully added - * * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present + * @deprecated Use {@link #registerGnssStatusCallback(GnssStatus.Callback, Handler)} or {@link + * #registerGnssStatusCallback(Executor, GnssStatus.Callback)} instead. */ + @Deprecated @RequiresPermission(ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull GnssStatus.Callback callback) { return registerGnssStatusCallback(callback, null); @@ -1790,33 +1804,41 @@ public class LocationManager { * Registers a GNSS status callback. * * @param callback GNSS status callback object to register - * @param handler the handler that the callback runs on. - * + * @param handler a handler with a looper that the callback runs on. * @return true if the listener was successfully added - * * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present */ @RequiresPermission(ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback( @NonNull GnssStatus.Callback callback, @Nullable Handler handler) { - boolean result; - synchronized (mGnssStatusListeners) { - if (mGnssStatusListeners.get(callback) != null) { - return true; - } - try { - GnssStatusListenerTransport transport = - new GnssStatusListenerTransport(callback, handler); - result = mService.registerGnssStatusCallback(transport, mContext.getPackageName()); - if (result) { - mGnssStatusListeners.put(callback, transport); - } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + if (handler == null) { + handler = new Handler(); } - return result; + try { + return mGnssStatusListenerManager.addListener(callback, handler); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Registers a GNSS status callback. + * + * @param callback GNSS status callback object to register + * @param executor the executor that the callback runs on. + * @return true if the listener was successfully added + * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present + */ + @RequiresPermission(ACCESS_FINE_LOCATION) + public boolean registerGnssStatusCallback( + @NonNull @CallbackExecutor Executor executor, + @NonNull GnssStatus.Callback callback) { + try { + return mGnssStatusListenerManager.addListener(callback, executor); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } /** @@ -1825,15 +1847,10 @@ public class LocationManager { * @param callback GNSS status callback object to remove */ public void unregisterGnssStatusCallback(@NonNull GnssStatus.Callback callback) { - synchronized (mGnssStatusListeners) { - try { - GnssStatusListenerTransport transport = mGnssStatusListeners.remove(callback); - if (transport != null) { - mService.unregisterGnssStatusCallback(transport); - } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + try { + mGnssStatusListenerManager.removeListener(callback); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } } @@ -1868,11 +1885,12 @@ public class LocationManager { * Adds an NMEA listener. * * @param listener a {@link OnNmeaMessageListener} object to register - * * @return true if the listener was successfully added - * * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present + * @deprecated Use {@link #addNmeaListener(OnNmeaMessageListener, Handler)} or {@link + * #addNmeaListener(Executor, OnNmeaMessageListener)} instead. */ + @Deprecated @RequiresPermission(ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull OnNmeaMessageListener listener) { return addNmeaListener(listener, null); @@ -1882,33 +1900,40 @@ public class LocationManager { * Adds an NMEA listener. * * @param listener a {@link OnNmeaMessageListener} object to register - * @param handler the handler that the listener runs on. - * + * @param handler a handler with the looper that the listener runs on. * @return true if the listener was successfully added - * * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present */ @RequiresPermission(ACCESS_FINE_LOCATION) public boolean addNmeaListener( @NonNull OnNmeaMessageListener listener, @Nullable Handler handler) { - boolean result; - - if (mGnssNmeaListeners.get(listener) != null) { - // listener is already registered - return true; + if (handler == null) { + handler = new Handler(); } try { - GnssStatusListenerTransport transport = - new GnssStatusListenerTransport(listener, handler); - result = mService.registerGnssStatusCallback(transport, mContext.getPackageName()); - if (result) { - mGnssNmeaListeners.put(listener, transport); - } + return mGnssStatusListenerManager.addListener(listener, handler); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } + } - return result; + /** + * Adds an NMEA listener. + * + * @param listener a {@link OnNmeaMessageListener} object to register + * @param executor the {@link Executor} that the listener runs on. + * @return true if the listener was successfully added + * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present + */ + @RequiresPermission(ACCESS_FINE_LOCATION) + public boolean addNmeaListener( + @NonNull @CallbackExecutor Executor executor, + @NonNull OnNmeaMessageListener listener) { + try { + return mGnssStatusListenerManager.addListener(listener, executor); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } /** @@ -1918,10 +1943,7 @@ public class LocationManager { */ public void removeNmeaListener(@NonNull OnNmeaMessageListener listener) { try { - GnssStatusListenerTransport transport = mGnssNmeaListeners.remove(listener); - if (transport != null) { - mService.unregisterGnssStatusCallback(transport); - } + mGnssStatusListenerManager.removeListener(listener); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1942,11 +1964,29 @@ public class LocationManager { } /** + * No-op method to keep backward-compatibility. Don't use it. Use {@link + * #unregisterGnssMeasurementsCallback} instead. + * + * @hide + * @deprecated use {@link #unregisterGnssMeasurementsCallback(GnssMeasurementsEvent.Callback)} + * instead. + * @removed + */ + @Deprecated + @SystemApi + @SuppressLint("Doclava125") + public void removeGpsMeasurementListener(GpsMeasurementsEvent.Listener listener) {} + + /** * Registers a GPS Measurement callback. * * @param callback a {@link GnssMeasurementsEvent.Callback} object to register. * @return {@code true} if the callback was added successfully, {@code false} otherwise. + * @deprecated Use {@link + * #registerGnssMeasurementsCallback(GnssMeasurementsEvent.Callback, Handler)} or {@link + * #registerGnssMeasurementsCallback(Executor, GnssMeasurementsEvent.Callback)} instead. */ + @Deprecated @RequiresPermission(ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback( @NonNull GnssMeasurementsEvent.Callback callback) { @@ -1957,77 +1997,72 @@ public class LocationManager { * Registers a GPS Measurement callback. * * @param callback a {@link GnssMeasurementsEvent.Callback} object to register. - * @param handler the handler that the callback runs on. + * @param handler the handler that the callback runs on. * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ @RequiresPermission(ACCESS_FINE_LOCATION) public boolean registerGnssMeasurementsCallback( @NonNull GnssMeasurementsEvent.Callback callback, @Nullable Handler handler) { - return mGnssMeasurementCallbackTransport.add(callback, handler); + if (handler == null) { + handler = new Handler(); + } + try { + return mGnssMeasurementsListenerManager.addListener(callback, handler); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } /** - * Injects GNSS measurement corrections into the GNSS chipset. + * Registers a GPS Measurement callback. * - * @param measurementCorrections a {@link GnssMeasurementCorrections} object with the GNSS - * measurement corrections to be injected into the GNSS chipset. - * @hide + * @param callback a {@link GnssMeasurementsEvent.Callback} object to register. + * @param executor the executor that the callback runs on. + * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ - @SystemApi @RequiresPermission(ACCESS_FINE_LOCATION) - public void injectGnssMeasurementCorrections( - @NonNull GnssMeasurementCorrections measurementCorrections) { + public boolean registerGnssMeasurementsCallback( + @NonNull @CallbackExecutor Executor executor, + @NonNull GnssMeasurementsEvent.Callback callback) { try { - mGnssMeasurementCallbackTransport.injectGnssMeasurementCorrections( - measurementCorrections); + return mGnssMeasurementsListenerManager.addListener(callback, executor); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Returns the supported capabilities of the GNSS chipset. - * - * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present. + * Injects GNSS measurement corrections into the GNSS chipset. * + * @param measurementCorrections a {@link GnssMeasurementCorrections} object with the GNSS + * measurement corrections to be injected into the GNSS chipset. * @hide */ @SystemApi @RequiresPermission(ACCESS_FINE_LOCATION) - public @NonNull GnssCapabilities getGnssCapabilities() { + public void injectGnssMeasurementCorrections( + @NonNull GnssMeasurementCorrections measurementCorrections) { + Preconditions.checkArgument(measurementCorrections != null); try { - long gnssCapabilities = mGnssMeasurementCallbackTransport.getGnssCapabilities(); - if (gnssCapabilities == GnssCapabilities.INVALID_CAPABILITIES) { - gnssCapabilities = 0L; - } - return GnssCapabilities.of(gnssCapabilities); + mService.injectGnssMeasurementCorrections( + measurementCorrections, mContext.getPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * No-op method to keep backward-compatibility. Don't use it. Use {@link - * #unregisterGnssMeasurementsCallback} instead. - * - * @hide - * @deprecated use {@link #unregisterGnssMeasurementsCallback(GnssMeasurementsEvent.Callback)} - * instead. - * @removed - */ - @Deprecated - @SystemApi - @SuppressLint("Doclava125") - public void removeGpsMeasurementListener(GpsMeasurementsEvent.Listener listener) {} - - /** * Unregisters a GPS Measurement callback. * * @param callback a {@link GnssMeasurementsEvent.Callback} object to remove. */ public void unregisterGnssMeasurementsCallback( @NonNull GnssMeasurementsEvent.Callback callback) { - mGnssMeasurementCallbackTransport.remove(callback); + try { + mGnssMeasurementsListenerManager.removeListener(callback); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } /** @@ -2063,7 +2098,11 @@ public class LocationManager { * * @param callback a {@link GnssNavigationMessage.Callback} object to register. * @return {@code true} if the callback was added successfully, {@code false} otherwise. + * @deprecated Use {@link + * #registerGnssNavigationMessageCallback(GnssNavigationMessage.Callback, Handler)} or {@link + * #registerGnssNavigationMessageCallback(Executor, GnssNavigationMessage.Callback)} instead. */ + @Deprecated public boolean registerGnssNavigationMessageCallback( @NonNull GnssNavigationMessage.Callback callback) { return registerGnssNavigationMessageCallback(callback, null); @@ -2073,78 +2112,50 @@ public class LocationManager { * Registers a GNSS Navigation Message callback. * * @param callback a {@link GnssNavigationMessage.Callback} object to register. - * @param handler the handler that the callback runs on. + * @param handler the handler that the callback runs on. * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ @RequiresPermission(ACCESS_FINE_LOCATION) public boolean registerGnssNavigationMessageCallback( @NonNull GnssNavigationMessage.Callback callback, @Nullable Handler handler) { - return mGnssNavigationMessageCallbackTransport.add(callback, handler); - } - - /** - * Unregisters a GNSS Navigation Message callback. - * - * @param callback a {@link GnssNavigationMessage.Callback} object to remove. - */ - public void unregisterGnssNavigationMessageCallback( - @NonNull GnssNavigationMessage.Callback callback) { - mGnssNavigationMessageCallbackTransport.remove(callback); - } - - /** - * Retrieves information about the current status of the GPS engine. - * This should only be called from the {@link GpsStatus.Listener#onGpsStatusChanged} - * callback to ensure that the data is copied atomically. - * - * The caller may either pass in a {@link GpsStatus} object to set with the latest - * status information, or pass null to create a new {@link GpsStatus} object. - * - * @param status object containing GPS status details, or null. - * @return status object containing updated GPS status. - */ - @Deprecated - @RequiresPermission(ACCESS_FINE_LOCATION) - public @Nullable GpsStatus getGpsStatus(@Nullable GpsStatus status) { - if (status == null) { - status = new GpsStatus(); + if (handler == null) { + handler = new Handler(); } - // When mGnssStatus is null, that means that this method is called outside - // onGpsStatusChanged(). Return an empty status to maintain backwards compatibility. - if (mGnssStatus != null) { - status.setStatus(mGnssStatus, mTimeToFirstFix); + + try { + return mGnssNavigationMessageListenerTransport.addListener(callback, handler); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - return status; } /** - * Returns the model year of the GNSS hardware and software build. - * - * <p> More details, such as build date, may be available in {@link #getGnssHardwareModelName()}. + * Registers a GNSS Navigation Message callback. * - * <p> May return 0 if the model year is less than 2016. + * @param callback a {@link GnssNavigationMessage.Callback} object to register. + * @param executor the looper that the callback runs on. + * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ - public int getGnssYearOfHardware() { + @RequiresPermission(ACCESS_FINE_LOCATION) + public boolean registerGnssNavigationMessageCallback( + @NonNull @CallbackExecutor Executor executor, + @NonNull GnssNavigationMessage.Callback callback) { try { - return mService.getGnssYearOfHardware(); + return mGnssNavigationMessageListenerTransport.addListener(callback, executor); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Returns the Model Name (including Vendor and Hardware/Software Version) of the GNSS hardware - * driver. - * - * <p> No device-specific serial number or ID is returned from this API. + * Unregisters a GNSS Navigation Message callback. * - * <p> Will return null when the GNSS hardware abstraction layer does not support providing - * this value. + * @param callback a {@link GnssNavigationMessage.Callback} object to remove. */ - @Nullable - public String getGnssHardwareModelName() { + public void unregisterGnssNavigationMessageCallback( + @NonNull GnssNavigationMessage.Callback callback) { try { - return mService.getGnssHardwareModelName(); + mGnssNavigationMessageListenerTransport.removeListener(callback); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2192,12 +2203,20 @@ public class LocationManager { @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) public boolean registerGnssBatchedLocationCallback(long periodNanos, boolean wakeOnFifoFull, @NonNull BatchedLocationCallback callback, @Nullable Handler handler) { - mBatchedLocationCallbackTransport.add(callback, handler); + if (handler == null) { + handler = new Handler(); + } - try { - return mService.startGnssBatch(periodNanos, wakeOnFifoFull, mContext.getPackageName()); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + synchronized (mBatchedLocationCallbackManager) { + try { + if (mBatchedLocationCallbackManager.addListener(callback, handler)) { + return mService.startGnssBatch(periodNanos, wakeOnFifoFull, + mContext.getPackageName()); + } + return false; + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } @@ -2231,34 +2250,14 @@ public class LocationManager { @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) public boolean unregisterGnssBatchedLocationCallback( @NonNull BatchedLocationCallback callback) { - - mBatchedLocationCallbackTransport.remove(callback); - - try { - return mService.stopGnssBatch(); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - /** - * 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 command name of the command to send to the provider. - * @param extras optional arguments for the command (or null). - * @return true always - */ - public boolean sendExtraCommand( - @NonNull String provider, @NonNull String command, @Nullable Bundle extras) { - Preconditions.checkArgument(provider != null, "invalid null provider"); - Preconditions.checkArgument(command != null, "invalid null command"); - - try { - return mService.sendExtraCommand(provider, command, extras); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + synchronized (mBatchedLocationCallbackManager) { + try { + mBatchedLocationCallbackManager.removeListener(callback); + mService.stopGnssBatch(); + return true; + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } @@ -2316,117 +2315,391 @@ public class LocationManager { } } - /** - * Returns true if the given package name matches a location provider package, and false - * otherwise. - * - * @hide - */ - @SystemApi - @RequiresPermission(Manifest.permission.READ_DEVICE_CONFIG) - public boolean isProviderPackage(@NonNull String packageName) { - try { - return mService.isProviderPackage(packageName); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); - return false; + private class LocationListenerTransport extends ILocationListener.Stub { + + private final Executor mExecutor; + @Nullable private volatile LocationListener mListener; + + private LocationListenerTransport(@NonNull Handler handler, + @NonNull LocationListener listener) { + Preconditions.checkArgument(handler != null, "invalid null handler"); + Preconditions.checkArgument(listener != null, "invalid null listener"); + + mExecutor = new HandlerExecutor(handler); + mListener = listener; } - } - /** - * Set the extra location controller package for location services on the device. - * - * @hide - */ - @SystemApi - @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) - public void setExtraLocationControllerPackage(@Nullable String packageName) { - try { - mService.setExtraLocationControllerPackage(packageName); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); + private LocationListenerTransport(@NonNull Executor executor, + @NonNull LocationListener listener) { + Preconditions.checkArgument(executor != null, "invalid null executor"); + Preconditions.checkArgument(listener != null, "invalid null listener"); + + mExecutor = executor; + mListener = listener; } - } - /** - * Set the extra location controller package for location services on the device. - * - * @removed - * @deprecated Use {@link #setExtraLocationControllerPackage} instead. - * @hide - */ - @Deprecated - @SystemApi - @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) - public void setLocationControllerExtraPackage(String packageName) { - try { - mService.setExtraLocationControllerPackage(packageName); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); + private LocationListener getKey() { + return mListener; + } + + private void unregisterListener() { + mListener = null; + } + + @Override + public void onLocationChanged(Location location) { + try { + mExecutor.execute(() -> { + try { + LocationListener listener = mListener; + if (listener == null) { + return; + } + + // we may be under the binder identity if a direct executor is used + long identity = Binder.clearCallingIdentity(); + try { + listener.onLocationChanged(location); + } finally { + Binder.restoreCallingIdentity(identity); + } + } finally { + locationCallbackFinished(); + } + }); + } catch (RejectedExecutionException e) { + locationCallbackFinished(); + throw e; + } + } + + @Override + public void onStatusChanged(String provider, int status, Bundle extras) { + try { + mExecutor.execute(() -> { + try { + LocationListener listener = mListener; + if (listener == null) { + return; + } + + // we may be under the binder identity if a direct executor is used + long identity = Binder.clearCallingIdentity(); + try { + listener.onStatusChanged(provider, status, extras); + } finally { + Binder.restoreCallingIdentity(identity); + } + } finally { + locationCallbackFinished(); + } + }); + } catch (RejectedExecutionException e) { + locationCallbackFinished(); + throw e; + } + } + + @Override + public void onProviderEnabled(String provider) { + try { + mExecutor.execute(() -> { + try { + LocationListener listener = mListener; + if (listener == null) { + return; + } + + // we may be under the binder identity if a direct executor is used + long identity = Binder.clearCallingIdentity(); + try { + listener.onProviderEnabled(provider); + } finally { + Binder.restoreCallingIdentity(identity); + } + } finally { + locationCallbackFinished(); + } + }); + } catch (RejectedExecutionException e) { + locationCallbackFinished(); + throw e; + } + } + + @Override + public void onProviderDisabled(String provider) { + try { + mExecutor.execute(() -> { + try { + LocationListener listener = mListener; + if (listener == null) { + return; + } + + // we may be under the binder identity if a direct executor is used + long identity = Binder.clearCallingIdentity(); + try { + listener.onProviderDisabled(provider); + } finally { + Binder.restoreCallingIdentity(identity); + } + } finally { + locationCallbackFinished(); + } + }); + } catch (RejectedExecutionException e) { + locationCallbackFinished(); + throw e; + } + } + + private void locationCallbackFinished() { + try { + mService.locationCallbackFinished(this); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } - /** - * Returns the extra location controller package on the device. - * - * @hide - */ - @SystemApi - public @Nullable String getExtraLocationControllerPackage() { - try { - return mService.getExtraLocationControllerPackage(); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); - return null; + private static class NmeaAdapter extends GnssStatus.Callback implements OnNmeaMessageListener { + + private final OnNmeaMessageListener mListener; + + private NmeaAdapter(OnNmeaMessageListener listener) { + mListener = listener; + } + + @Override + public void onNmeaMessage(String message, long timestamp) { + mListener.onNmeaMessage(message, timestamp); } } - /** - * Set whether the extra location controller package is currently enabled on the device. - * - * @removed - * @deprecated Use {@link #setExtraLocationControllerPackageEnabled} instead. - * @hide - */ - @SystemApi - @Deprecated - @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) - public void setLocationControllerExtraPackageEnabled(boolean enabled) { - try { - mService.setExtraLocationControllerPackageEnabled(enabled); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); + private class GnssStatusListenerManager extends + AbstractListenerManager<GnssStatus.Callback> { + + @Nullable + private IGnssStatusListener mListenerTransport; + + @Nullable + private volatile GnssStatus mGnssStatus; + private volatile int mTtff; + + public GnssStatus getGnssStatus() { + return mGnssStatus; + } + + public int getTtff() { + return mTtff; + } + + public boolean addListener(@NonNull GpsStatus.Listener listener, @NonNull Handler handler) + throws RemoteException { + return addInternal(listener, handler); + } + + public boolean addListener(@NonNull OnNmeaMessageListener listener, + @NonNull Handler handler) + throws RemoteException { + return addInternal(listener, handler); + } + + public boolean addListener(@NonNull OnNmeaMessageListener listener, + @NonNull Executor executor) + throws RemoteException { + return addInternal(listener, executor); + } + + @Override + protected GnssStatus.Callback convertKey(Object listener) { + if (listener instanceof GnssStatus.Callback) { + return (GnssStatus.Callback) listener; + } else if (listener instanceof GpsStatus.Listener) { + return new GnssStatus.Callback() { + private final GpsStatus.Listener mGpsListener = (GpsStatus.Listener) listener; + + @Override + public void onStarted() { + mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_STARTED); + } + + @Override + public void onStopped() { + mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_STOPPED); + } + + @Override + public void onFirstFix(int ttffMillis) { + mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_FIRST_FIX); + } + + @Override + public void onSatelliteStatusChanged(GnssStatus status) { + mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_SATELLITE_STATUS); + } + }; + } else if (listener instanceof OnNmeaMessageListener) { + return new NmeaAdapter((OnNmeaMessageListener) listener); + } else { + throw new IllegalStateException(); + } + } + + @Override + protected boolean registerService() throws RemoteException { + Preconditions.checkState(mListenerTransport == null); + + mListenerTransport = new GnssStatusListener(); + return mService.registerGnssStatusCallback(mListenerTransport, + mContext.getPackageName()); + } + + @Override + protected void unregisterService() throws RemoteException { + Preconditions.checkState(mListenerTransport != null); + + mService.unregisterGnssStatusCallback(mListenerTransport); + mListenerTransport = null; + } + + private class GnssStatusListener extends IGnssStatusListener.Stub { + @Override + public void onGnssStarted() { + execute(GnssStatus.Callback::onStarted); + } + + @Override + public void onGnssStopped() { + execute(GnssStatus.Callback::onStopped); + } + + @Override + public void onFirstFix(int ttff) { + mTtff = ttff; + execute((callback) -> callback.onFirstFix(ttff)); + } + + @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); + mGnssStatus = localStatus; + execute((callback) -> callback.onSatelliteStatusChanged(localStatus)); + } + + @Override + public void onNmeaReceived(long timestamp, String nmea) { + execute((callback) -> { + if (callback instanceof NmeaAdapter) { + ((NmeaAdapter) callback).onNmeaMessage(nmea, timestamp); + } + }); + } } } - /** - * Set whether the extra location controller package is currently enabled on the device. - * - * @hide - */ - @SystemApi - @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) - public void setExtraLocationControllerPackageEnabled(boolean enabled) { - try { - mService.setExtraLocationControllerPackageEnabled(enabled); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); + private class GnssMeasurementsListenerManager extends + AbstractListenerManager<GnssMeasurementsEvent.Callback> { + + @Nullable + private IGnssMeasurementsListener mListenerTransport; + + @Override + protected boolean registerService() throws RemoteException { + Preconditions.checkState(mListenerTransport == null); + + mListenerTransport = new GnssMeasurementsListener(); + return mService.addGnssMeasurementsListener(mListenerTransport, + mContext.getPackageName()); + } + + @Override + protected void unregisterService() throws RemoteException { + Preconditions.checkState(mListenerTransport != null); + + mService.removeGnssMeasurementsListener(mListenerTransport); + mListenerTransport = null; + } + + private class GnssMeasurementsListener extends IGnssMeasurementsListener.Stub { + @Override + public void onGnssMeasurementsReceived(final GnssMeasurementsEvent event) { + execute((callback) -> callback.onGnssMeasurementsReceived(event)); + } + + @Override + public void onStatusChanged(int status) { + execute((callback) -> callback.onStatusChanged(status)); + } } } - /** - * Returns whether extra location controller package is currently enabled on the device. - * - * @hide - */ - @SystemApi - public boolean isExtraLocationControllerPackageEnabled() { - try { - return mService.isExtraLocationControllerPackageEnabled(); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); - return false; + private class GnssNavigationMessageListenerManager extends + AbstractListenerManager<GnssNavigationMessage.Callback> { + + @Nullable + private IGnssNavigationMessageListener mListenerTransport; + + @Override + protected boolean registerService() throws RemoteException { + Preconditions.checkState(mListenerTransport == null); + + mListenerTransport = new GnssNavigationMessageListener(); + return mService.addGnssNavigationMessageListener(mListenerTransport, + mContext.getPackageName()); + } + + @Override + protected void unregisterService() throws RemoteException { + Preconditions.checkState(mListenerTransport != null); + + mService.removeGnssNavigationMessageListener(mListenerTransport); + mListenerTransport = null; + } + + private class GnssNavigationMessageListener extends IGnssNavigationMessageListener.Stub { + @Override + public void onGnssNavigationMessageReceived(GnssNavigationMessage event) { + execute((listener) -> listener.onGnssNavigationMessageReceived(event)); + } + + @Override + public void onStatusChanged(int status) { + execute((listener) -> listener.onStatusChanged(status)); + } } } + private class BatchedLocationCallbackManager extends + AbstractListenerManager<BatchedLocationCallback> { + + @Nullable + private IBatchedLocationCallback mListenerTransport; + + @Override + protected boolean registerService() throws RemoteException { + Preconditions.checkState(mListenerTransport == null); + + mListenerTransport = new BatchedLocationCallback(); + return mService.addGnssBatchingCallback(mListenerTransport, mContext.getPackageName()); + } + + @Override + protected void unregisterService() throws RemoteException { + Preconditions.checkState(mListenerTransport != null); + + mService.removeGnssBatchingCallback(); + mListenerTransport = null; + } + + private class BatchedLocationCallback extends IBatchedLocationCallback.Stub { + @Override + public void onLocationBatch(List<Location> locations) { + execute((listener) -> listener.onLocationBatch(locations)); + } + } + } } diff --git a/media/Android.bp b/media/Android.bp index a59b3e76faed..2f75e4458ef5 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -63,26 +63,6 @@ filegroup { path: "apex/java", } -filegroup { - name: "mediaplayer2-srcs", - srcs: [ - "apex/java/android/media/CloseGuard.java", - "apex/java/android/media/DataSourceCallback.java", - "apex/java/android/media/DataSourceDesc.java", - "apex/java/android/media/UriDataSourceDesc.java", - "apex/java/android/media/FileDataSourceDesc.java", - "apex/java/android/media/Media2Utils.java", - "apex/java/android/media/MediaPlayer2Utils.java", - "apex/java/android/media/MediaPlayer2.java", - "apex/java/android/media/Media2HTTPService.java", - "apex/java/android/media/Media2HTTPConnection.java", - "apex/java/android/media/RoutingDelegate.java", - "apex/java/android/media/BufferingParams.java", - "apex/java/android/media/ProxyDataSourceCallback.java", - ], - path: "apex/java", -} - metalava_updatable_media_args = " --error UnhiddenSystemApi " + "--hide RequiresPermission " + "--hide MissingPermission --hide BroadcastBehavior " + diff --git a/media/apex/java/android/media/DataSourceDesc.java b/media/apex/java/android/media/DataSourceDesc.java deleted file mode 100644 index 9a9c74aba2c7..000000000000 --- a/media/apex/java/android/media/DataSourceDesc.java +++ /dev/null @@ -1,384 +0,0 @@ -/* - * Copyright 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.net.Uri; -import android.os.ParcelFileDescriptor; - -import java.net.CookieHandler; -import java.net.CookieManager; -import java.net.HttpCookie; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Data source descriptor. - * - * Used by {@link MediaPlayer2#setDataSource}, {@link MediaPlayer2#setNextDataSource} and - * {@link MediaPlayer2#setNextDataSources} to set data source for playback. - * - * @hide - */ -public class DataSourceDesc { - // intentionally less than long.MAX_VALUE - static final long LONG_MAX = 0x7ffffffffffffffL; - - // keep consistent with native code - public static final long LONG_MAX_TIME_MS = LONG_MAX / 1000; - /** - * @hide - */ - public static final long LONG_MAX_TIME_US = LONG_MAX_TIME_MS * 1000; - - public static final long POSITION_UNKNOWN = LONG_MAX_TIME_MS; - - private String mMediaId; - private long mStartPositionMs = 0; - private long mEndPositionMs = POSITION_UNKNOWN; - - DataSourceDesc(String mediaId, long startPositionMs, long endPositionMs) { - mMediaId = mediaId; - mStartPositionMs = startPositionMs; - mEndPositionMs = endPositionMs; - } - - /** - * Releases the resources held by this {@code DataSourceDesc} object. - */ - void close() { - } - - // Have to declare protected for finalize() since it is protected - // in the base class Object. - @Override - protected void finalize() throws Throwable { - close(); - } - - /** - * Return the media Id of data source. - * @return the media Id of data source - */ - public @Nullable String getMediaId() { - return mMediaId; - } - - /** - * Return the position in milliseconds at which the playback will start. - * @return the position in milliseconds at which the playback will start - */ - public long getStartPosition() { - return mStartPositionMs; - } - - /** - * Return the position in milliseconds at which the playback will end. - * {@link #POSITION_UNKNOWN} means ending at the end of source content. - * @return the position in milliseconds at which the playback will end - */ - public long getEndPosition() { - return mEndPositionMs; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("DataSourceDesc{"); - sb.append("mMediaId=").append(mMediaId); - sb.append(", mStartPositionMs=").append(mStartPositionMs); - sb.append(", mEndPositionMs=").append(mEndPositionMs); - sb.append('}'); - return sb.toString(); - } - - /** - * Builder for {@link DataSourceDesc}. - * <p> - * Here is an example where <code>Builder</code> is used to define the - * {@link DataSourceDesc} to be used by a {@link MediaPlayer2} instance: - * - * <pre class="prettyprint"> - * DataSourceDesc newDSD = new DataSourceDesc.Builder() - * .setDataSource(context, uri, headers, cookies) - * .setStartPosition(1000) - * .setEndPosition(15000) - * .build(); - * mediaplayer2.setDataSourceDesc(newDSD); - * </pre> - */ - public static final class Builder { - private static final int SOURCE_TYPE_UNKNOWN = 0; - private static final int SOURCE_TYPE_URI = 1; - private static final int SOURCE_TYPE_FILE = 2; - - private int mSourceType = SOURCE_TYPE_UNKNOWN; - private String mMediaId; - private long mStartPositionMs = 0; - private long mEndPositionMs = POSITION_UNKNOWN; - - // For UriDataSourceDesc - private Uri mUri; - private Map<String, String> mHeader; - private List<HttpCookie> mCookies; - - // For FileDataSourceDesc - private ParcelFileDescriptor mPFD; - private long mOffset = 0; - private long mLength = FileDataSourceDesc.FD_LENGTH_UNKNOWN; - - /** - * Constructs a new BuilderBase with the defaults. - */ - public Builder() { - } - - /** - * Constructs a new BuilderBase from a given {@link DataSourceDesc} instance - * @param dsd the {@link DataSourceDesc} object whose data will be reused - * in the new BuilderBase. - */ - public Builder(@Nullable DataSourceDesc dsd) { - if (dsd == null) { - return; - } - mMediaId = dsd.mMediaId; - mStartPositionMs = dsd.mStartPositionMs; - mEndPositionMs = dsd.mEndPositionMs; - if (dsd instanceof FileDataSourceDesc) { - mSourceType = SOURCE_TYPE_FILE; - mPFD = ((FileDataSourceDesc) dsd).getParcelFileDescriptor(); - mOffset = ((FileDataSourceDesc) dsd).getOffset(); - mLength = ((FileDataSourceDesc) dsd).getLength(); - } else if (dsd instanceof UriDataSourceDesc) { - mSourceType = SOURCE_TYPE_URI; - mUri = ((UriDataSourceDesc) dsd).getUri(); - mHeader = ((UriDataSourceDesc) dsd).getHeaders(); - mCookies = ((UriDataSourceDesc) dsd).getCookies(); - } else { - throw new IllegalStateException("Unknown source type:" + mSourceType); - } - } - - /** - * Sets all fields that have been set in the {@link DataSourceDesc} object. - * <code>IllegalStateException</code> will be thrown if there is conflict between fields. - * - * @return {@link DataSourceDesc} - */ - @NonNull - public DataSourceDesc build() { - if (mSourceType == SOURCE_TYPE_UNKNOWN) { - throw new IllegalStateException("Source is not set."); - } - if (mStartPositionMs > mEndPositionMs) { - throw new IllegalStateException("Illegal start/end position: " - + mStartPositionMs + " : " + mEndPositionMs); - } - - DataSourceDesc desc; - if (mSourceType == SOURCE_TYPE_FILE) { - desc = new FileDataSourceDesc( - mMediaId, mStartPositionMs, mEndPositionMs, mPFD, mOffset, mLength); - } else if (mSourceType == SOURCE_TYPE_URI) { - desc = new UriDataSourceDesc( - mMediaId, mStartPositionMs, mEndPositionMs, mUri, mHeader, mCookies); - } else { - throw new IllegalStateException("Unknown source type:" + mSourceType); - } - return desc; - } - - /** - * Sets the media Id of this data source. - * - * @param mediaId the media Id of this data source - * @return the same Builder instance. - */ - @NonNull - public Builder setMediaId(@Nullable String mediaId) { - mMediaId = mediaId; - return this; - } - - /** - * Sets the start position in milliseconds at which the playback will start. - * Any negative number is treated as 0. - * - * @param position the start position in milliseconds at which the playback will start - * @return the same Builder instance. - * - */ - @NonNull - public Builder setStartPosition(long position) { - if (position < 0) { - position = 0; - } - mStartPositionMs = position; - return this; - } - - /** - * Sets the end position in milliseconds at which the playback will end. - * Any negative number is treated as maximum duration {@link #LONG_MAX_TIME_MS} - * of the data source - * - * @param position the end position in milliseconds at which the playback will end - * @return the same Builder instance. - */ - @NonNull - public Builder setEndPosition(long position) { - if (position < 0) { - position = LONG_MAX_TIME_MS; - } - mEndPositionMs = position; - return this; - } - - /** - * Sets the data source as a content Uri. - * - * @param uri the Content URI of the data you want to play - * @return the same Builder instance. - * @throws NullPointerException if context or uri is null. - */ - @NonNull - public Builder setDataSource(@NonNull Uri uri) { - setSourceType(SOURCE_TYPE_URI); - Media2Utils.checkArgument(uri != null, "uri cannot be null"); - mUri = uri; - return this; - } - - /** - * Sets the data source as a content Uri. - * - * To provide cookies for the subsequent HTTP requests, you can install your own default - * cookie handler and use other variants of setDataSource APIs instead. Alternatively, you - * can use this API to pass the cookies as a list of HttpCookie. If the app has not - * installed a CookieHandler already, {@link MediaPlayer2} will create a CookieManager - * and populates its CookieStore with the provided cookies when this data source is passed - * to {@link MediaPlayer2}. If the app has installed its own handler already, the handler - * is required to be of CookieManager type such that {@link MediaPlayer2} can update the - * manager’s CookieStore. - * - * <p><strong>Note</strong> that the cross domain redirection is allowed by default, - * but that can be changed with key/value pairs through the headers parameter with - * "android-allow-cross-domain-redirect" as the key and "0" or "1" as the value to - * disallow or allow cross domain redirection. - * - * @param uri the Content URI of the data you want to play - * @param headers the headers to be sent together with the request for the data - * The headers must not include cookies. Instead, use the cookies param. - * @param cookies the cookies to be sent together with the request - * @return the same Builder instance. - * @throws NullPointerException if context or uri is null. - * @throws IllegalArgumentException if the cookie handler is not of CookieManager type - * when cookies are provided. - */ - @NonNull - public Builder setDataSource(@NonNull Uri uri, @Nullable Map<String, String> headers, - @Nullable List<HttpCookie> cookies) { - setSourceType(SOURCE_TYPE_URI); - Media2Utils.checkArgument(uri != null, "uri cannot be null"); - if (cookies != null) { - CookieHandler cookieHandler = CookieHandler.getDefault(); - if (cookieHandler != null && !(cookieHandler instanceof CookieManager)) { - throw new IllegalArgumentException( - "The cookie handler has to be of CookieManager type " - + "when cookies are provided."); - } - } - - mUri = uri; - if (headers != null) { - mHeader = new HashMap<String, String>(headers); - } - if (cookies != null) { - mCookies = new ArrayList<HttpCookie>(cookies); - } - return this; - } - - /** - * Sets the data source (ParcelFileDescriptor) to use. The ParcelFileDescriptor must be - * seekable (N.B. a LocalSocket is not seekable). When the {@link DataSourceDesc} - * created by this builder is passed to {@link MediaPlayer2} via - * {@link MediaPlayer2#setDataSource}, - * {@link MediaPlayer2#setNextDataSource} or - * {@link MediaPlayer2#setNextDataSources}, MediaPlayer2 will - * close the ParcelFileDescriptor. - * - * @param pfd the ParcelFileDescriptor for the file to play - * @return the same Builder instance. - * @throws NullPointerException if pfd is null. - */ - @NonNull - public Builder setDataSource(@NonNull ParcelFileDescriptor pfd) { - setSourceType(SOURCE_TYPE_FILE); - Media2Utils.checkArgument(pfd != null, "pfd cannot be null."); - mPFD = pfd; - return this; - } - - /** - * Sets the data source (ParcelFileDescriptor) to use. The ParcelFileDescriptor must be - * seekable (N.B. a LocalSocket is not seekable). When the {@link DataSourceDesc} - * created by this builder is passed to {@link MediaPlayer2} via - * {@link MediaPlayer2#setDataSource}, - * {@link MediaPlayer2#setNextDataSource} or - * {@link MediaPlayer2#setNextDataSources}, MediaPlayer2 will - * close the ParcelFileDescriptor. - * - * Any negative number for offset is treated as 0. - * Any negative number for length is treated as maximum length of the data source. - * - * @param pfd the ParcelFileDescriptor for the file to play - * @param offset the offset into the file where the data to be played starts, in bytes - * @param length the length in bytes of the data to be played - * @return the same Builder instance. - * @throws NullPointerException if pfd is null. - */ - @NonNull - public Builder setDataSource( - @NonNull ParcelFileDescriptor pfd, long offset, long length) { - setSourceType(SOURCE_TYPE_FILE); - if (pfd == null) { - throw new NullPointerException("pfd cannot be null."); - } - if (offset < 0) { - offset = 0; - } - if (length < 0) { - length = FileDataSourceDesc.FD_LENGTH_UNKNOWN; - } - mPFD = pfd; - mOffset = offset; - mLength = length; - return this; - } - - private void setSourceType(int type) { - if (mSourceType != SOURCE_TYPE_UNKNOWN) { - throw new IllegalStateException("Source is already set. type=" + mSourceType); - } - mSourceType = type; - } - } -} diff --git a/media/apex/java/android/media/FileDataSourceDesc.java b/media/apex/java/android/media/FileDataSourceDesc.java deleted file mode 100644 index 2aa2cb7eb1bb..000000000000 --- a/media/apex/java/android/media/FileDataSourceDesc.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import android.annotation.NonNull; -import android.os.ParcelFileDescriptor; -import android.util.Log; - -import java.io.IOException; - -/** - * Structure of data source descriptor for sources using file descriptor. - * - * Used by {@link MediaPlayer2#setDataSource}, {@link MediaPlayer2#setNextDataSource} and - * {@link MediaPlayer2#setNextDataSources} to set data source for playback. - * - * <p>Users should use {@link Builder} to create {@link FileDataSourceDesc}. - * @hide - */ -public class FileDataSourceDesc extends DataSourceDesc { - private static final String TAG = "FileDataSourceDesc"; - - /** - * Used when the length of file descriptor is unknown. - * - * @see #getLength() - */ - public static final long FD_LENGTH_UNKNOWN = LONG_MAX; - - private ParcelFileDescriptor mPFD; - private long mOffset = 0; - private long mLength = FD_LENGTH_UNKNOWN; - private int mCount = 0; - private boolean mClosed = false; - - FileDataSourceDesc(String mediaId, long startPositionMs, long endPositionMs, - ParcelFileDescriptor pfd, long offset, long length) { - super(mediaId, startPositionMs, endPositionMs); - mPFD = pfd; - mOffset = offset; - mLength = length; - } - - /** - * Releases the resources held by this {@code FileDataSourceDesc} object. - */ - @Override - void close() { - super.close(); - decCount(); - } - - /** - * Decrements usage count by {@link MediaPlayer2}. - * If this is the last usage, also releases the file descriptor held by this - * {@code FileDataSourceDesc} object. - */ - void decCount() { - synchronized (this) { - --mCount; - if (mCount > 0) { - return; - } - - try { - mPFD.close(); - mClosed = true; - } catch (IOException e) { - Log.e(TAG, "failed to close pfd: " + e); - } - } - } - - /** - * Increments usage count by {@link MediaPlayer2} if PFD has not been closed. - */ - void incCount() { - synchronized (this) { - if (!mClosed) { - ++mCount; - } - } - } - - /** - * Return the status of underline ParcelFileDescriptor - * @return true if underline ParcelFileDescriptor is closed, false otherwise. - */ - boolean isPFDClosed() { - synchronized (this) { - return mClosed; - } - } - - /** - * Return the ParcelFileDescriptor of this data source. - * @return the ParcelFileDescriptor of this data source - */ - public @NonNull ParcelFileDescriptor getParcelFileDescriptor() { - return mPFD; - } - - /** - * Return the offset associated with the ParcelFileDescriptor of this data source. - * It's meaningful only when it has been set by the {@link Builder}. - * @return the offset associated with the ParcelFileDescriptor of this data source - */ - public long getOffset() { - return mOffset; - } - - /** - * Return the content length associated with the ParcelFileDescriptor of this data source. - * {@link #FD_LENGTH_UNKNOWN} means same as the length of source content. - * @return the content length associated with the ParcelFileDescriptor of this data source - */ - public long getLength() { - return mLength; - } -} diff --git a/media/apex/java/android/media/Media2HTTPConnection.java b/media/apex/java/android/media/Media2HTTPConnection.java deleted file mode 100644 index a369a62b39db..000000000000 --- a/media/apex/java/android/media/Media2HTTPConnection.java +++ /dev/null @@ -1,385 +0,0 @@ -/* - * Copyright 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import static android.media.MediaPlayer2.MEDIA_ERROR_UNSUPPORTED; - -import android.os.StrictMode; -import android.util.Log; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.CookieHandler; -import java.net.HttpURLConnection; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.NoRouteToHostException; -import java.net.ProtocolException; -import java.net.Proxy; -import java.net.URL; -import java.net.UnknownHostException; -import java.net.UnknownServiceException; -import java.util.HashMap; -import java.util.Map; - -/** @hide */ -public class Media2HTTPConnection { - private static final String TAG = "Media2HTTPConnection"; - private static final boolean VERBOSE = false; - - // connection timeout - 30 sec - private static final int CONNECT_TIMEOUT_MS = 30 * 1000; - - private long mCurrentOffset = -1; - private URL mURL = null; - private Map<String, String> mHeaders = null; - private HttpURLConnection mConnection = null; - private long mTotalSize = -1; - private InputStream mInputStream = null; - - private boolean mAllowCrossDomainRedirect = true; - private boolean mAllowCrossProtocolRedirect = true; - - // from com.squareup.okhttp.internal.http - private final static int HTTP_TEMP_REDIRECT = 307; - private final static int MAX_REDIRECTS = 20; - - public Media2HTTPConnection() { - CookieHandler cookieHandler = CookieHandler.getDefault(); - if (cookieHandler == null) { - Log.w(TAG, "Media2HTTPConnection: Unexpected. No CookieHandler found."); - } - } - - public boolean connect(String uri, String headers) { - if (VERBOSE) { - Log.d(TAG, "connect: uri=" + uri + ", headers=" + headers); - } - - try { - disconnect(); - mAllowCrossDomainRedirect = true; - mURL = new URL(uri); - mHeaders = convertHeaderStringToMap(headers); - } catch (MalformedURLException e) { - return false; - } - - return true; - } - - private boolean parseBoolean(String val) { - try { - return Long.parseLong(val) != 0; - } catch (NumberFormatException e) { - return "true".equalsIgnoreCase(val) || - "yes".equalsIgnoreCase(val); - } - } - - /* returns true iff header is internal */ - private boolean filterOutInternalHeaders(String key, String val) { - if ("android-allow-cross-domain-redirect".equalsIgnoreCase(key)) { - mAllowCrossDomainRedirect = parseBoolean(val); - // cross-protocol redirects are also controlled by this flag - mAllowCrossProtocolRedirect = mAllowCrossDomainRedirect; - } else { - return false; - } - return true; - } - - private Map<String, String> convertHeaderStringToMap(String headers) { - HashMap<String, String> map = new HashMap<String, String>(); - - String[] pairs = headers.split("\r\n"); - for (String pair : pairs) { - int colonPos = pair.indexOf(":"); - if (colonPos >= 0) { - String key = pair.substring(0, colonPos); - String val = pair.substring(colonPos + 1); - - if (!filterOutInternalHeaders(key, val)) { - map.put(key, val); - } - } - } - - return map; - } - - public void disconnect() { - teardownConnection(); - mHeaders = null; - mURL = null; - } - - private void teardownConnection() { - if (mConnection != null) { - if (mInputStream != null) { - try { - mInputStream.close(); - } catch (IOException e) { - } - mInputStream = null; - } - - mConnection.disconnect(); - mConnection = null; - - mCurrentOffset = -1; - } - } - - private static final boolean isLocalHost(URL url) { - if (url == null) { - return false; - } - - String host = url.getHost(); - - if (host == null) { - return false; - } - - try { - if (host.equalsIgnoreCase("localhost")) { - return true; - } - if (InetAddress.getByName(host).isLoopbackAddress()) { - return true; - } - } catch (IllegalArgumentException | UnknownHostException e) { - } - return false; - } - - private void seekTo(long offset) throws IOException { - teardownConnection(); - - try { - int response; - int redirectCount = 0; - - URL url = mURL; - - // do not use any proxy for localhost (127.0.0.1) - boolean noProxy = isLocalHost(url); - - while (true) { - if (noProxy) { - mConnection = (HttpURLConnection)url.openConnection(Proxy.NO_PROXY); - } else { - mConnection = (HttpURLConnection)url.openConnection(); - } - mConnection.setConnectTimeout(CONNECT_TIMEOUT_MS); - - // handle redirects ourselves if we do not allow cross-domain redirect - mConnection.setInstanceFollowRedirects(mAllowCrossDomainRedirect); - - if (mHeaders != null) { - for (Map.Entry<String, String> entry : mHeaders.entrySet()) { - mConnection.setRequestProperty( - entry.getKey(), entry.getValue()); - } - } - - if (offset > 0) { - mConnection.setRequestProperty( - "Range", "bytes=" + offset + "-"); - } - - response = mConnection.getResponseCode(); - if (response != HttpURLConnection.HTTP_MULT_CHOICE && - response != HttpURLConnection.HTTP_MOVED_PERM && - response != HttpURLConnection.HTTP_MOVED_TEMP && - response != HttpURLConnection.HTTP_SEE_OTHER && - response != HTTP_TEMP_REDIRECT) { - // not a redirect, or redirect handled by HttpURLConnection - break; - } - - if (++redirectCount > MAX_REDIRECTS) { - throw new NoRouteToHostException("Too many redirects: " + redirectCount); - } - - String method = mConnection.getRequestMethod(); - if (response == HTTP_TEMP_REDIRECT && - !method.equals("GET") && !method.equals("HEAD")) { - // "If the 307 status code is received in response to a - // request other than GET or HEAD, the user agent MUST NOT - // automatically redirect the request" - throw new NoRouteToHostException("Invalid redirect"); - } - String location = mConnection.getHeaderField("Location"); - if (location == null) { - throw new NoRouteToHostException("Invalid redirect"); - } - url = new URL(mURL /* TRICKY: don't use url! */, location); - if (!url.getProtocol().equals("https") && - !url.getProtocol().equals("http")) { - throw new NoRouteToHostException("Unsupported protocol redirect"); - } - boolean sameProtocol = mURL.getProtocol().equals(url.getProtocol()); - if (!mAllowCrossProtocolRedirect && !sameProtocol) { - throw new NoRouteToHostException("Cross-protocol redirects are disallowed"); - } - boolean sameHost = mURL.getHost().equals(url.getHost()); - if (!mAllowCrossDomainRedirect && !sameHost) { - throw new NoRouteToHostException("Cross-domain redirects are disallowed"); - } - - if (response != HTTP_TEMP_REDIRECT) { - // update effective URL, unless it is a Temporary Redirect - mURL = url; - } - } - - if (mAllowCrossDomainRedirect) { - // remember the current, potentially redirected URL if redirects - // were handled by HttpURLConnection - mURL = mConnection.getURL(); - } - - if (response == HttpURLConnection.HTTP_PARTIAL) { - // Partial content, we cannot just use getContentLength - // because what we want is not just the length of the range - // returned but the size of the full content if available. - - String contentRange = - mConnection.getHeaderField("Content-Range"); - - mTotalSize = -1; - if (contentRange != null) { - // format is "bytes xxx-yyy/zzz - // where "zzz" is the total number of bytes of the - // content or '*' if unknown. - - int lastSlashPos = contentRange.lastIndexOf('/'); - if (lastSlashPos >= 0) { - String total = - contentRange.substring(lastSlashPos + 1); - - try { - mTotalSize = Long.parseLong(total); - } catch (NumberFormatException e) { - } - } - } - } else if (response != HttpURLConnection.HTTP_OK) { - throw new IOException(); - } else { - mTotalSize = mConnection.getContentLength(); - } - - if (offset > 0 && response != HttpURLConnection.HTTP_PARTIAL) { - // Some servers simply ignore "Range" requests and serve - // data from the start of the content. - throw new ProtocolException(); - } - - mInputStream = - new BufferedInputStream(mConnection.getInputStream()); - - mCurrentOffset = offset; - } catch (IOException e) { - mTotalSize = -1; - teardownConnection(); - mCurrentOffset = -1; - - throw e; - } - } - - public int readAt(long offset, byte[] data, int size) { - StrictMode.ThreadPolicy policy = - new StrictMode.ThreadPolicy.Builder().permitAll().build(); - - StrictMode.setThreadPolicy(policy); - - try { - if (offset != mCurrentOffset) { - seekTo(offset); - } - - int n = mInputStream.read(data, 0, size); - - if (n == -1) { - // InputStream signals EOS using a -1 result, our semantics - // are to return a 0-length read. - n = 0; - } - - mCurrentOffset += n; - - if (VERBOSE) { - Log.d(TAG, "readAt " + offset + " / " + size + " => " + n); - } - - return n; - } catch (ProtocolException e) { - Log.w(TAG, "readAt " + offset + " / " + size + " => " + e); - return MEDIA_ERROR_UNSUPPORTED; - } catch (NoRouteToHostException e) { - Log.w(TAG, "readAt " + offset + " / " + size + " => " + e); - return MEDIA_ERROR_UNSUPPORTED; - } catch (UnknownServiceException e) { - Log.w(TAG, "readAt " + offset + " / " + size + " => " + e); - return MEDIA_ERROR_UNSUPPORTED; - } catch (IOException e) { - if (VERBOSE) { - Log.d(TAG, "readAt " + offset + " / " + size + " => -1"); - } - return -1; - } catch (Exception e) { - if (VERBOSE) { - Log.d(TAG, "unknown exception " + e); - Log.d(TAG, "readAt " + offset + " / " + size + " => -1"); - } - return -1; - } - } - - public long getSize() { - if (mConnection == null) { - try { - seekTo(0); - } catch (IOException e) { - return -1; - } - } - - return mTotalSize; - } - - public String getMIMEType() { - if (mConnection == null) { - try { - seekTo(0); - } catch (IOException e) { - return "application/octet-stream"; - } - } - - return mConnection.getContentType(); - } - - public String getUri() { - return mURL.toString(); - } -} diff --git a/media/apex/java/android/media/Media2HTTPService.java b/media/apex/java/android/media/Media2HTTPService.java deleted file mode 100644 index 0d46ce404831..000000000000 --- a/media/apex/java/android/media/Media2HTTPService.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import android.util.Log; - -import java.net.HttpCookie; -import java.util.List; - -/** @hide */ -public class Media2HTTPService { - private static final String TAG = "Media2HTTPService"; - private List<HttpCookie> mCookies; - private Boolean mCookieStoreInitialized = new Boolean(false); - - public Media2HTTPService(List<HttpCookie> cookies) { - mCookies = cookies; - Log.v(TAG, "Media2HTTPService(" + this + "): Cookies: " + cookies); - } - - public Media2HTTPConnection makeHTTPConnection() { - - synchronized (mCookieStoreInitialized) { - Media2Utils.storeCookies(mCookies); - } - - return new Media2HTTPConnection(); - } - - /* package private */ static Media2HTTPService createHTTPService(String path) { - return createHTTPService(path, null); - } - - // when cookies are provided - static Media2HTTPService createHTTPService(String path, List<HttpCookie> cookies) { - if (path.startsWith("http://") || path.startsWith("https://")) { - return (new Media2HTTPService(cookies)); - } else if (path.startsWith("widevine://")) { - Log.d(TAG, "Widevine classic is no longer supported"); - } - - return null; - } -} diff --git a/media/apex/java/android/media/Media2Utils.java b/media/apex/java/android/media/Media2Utils.java deleted file mode 100644 index a87e9676d017..000000000000 --- a/media/apex/java/android/media/Media2Utils.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import android.util.Log; - -import java.net.CookieHandler; -import java.net.CookieManager; -import java.net.CookieStore; -import java.net.HttpCookie; -import java.util.List; - -/** @hide */ -public class Media2Utils { - private static final String TAG = "Media2Utils"; - - private Media2Utils() { - } - - /** - * Ensures that an expression checking an argument is true. - * - * @param expression the expression to check - * @param errorMessage the exception message to use if the check fails; will - * be converted to a string using {@link String#valueOf(Object)} - * @throws IllegalArgumentException if {@code expression} is false - */ - public static void checkArgument(boolean expression, String errorMessage) { - if (!expression) { - throw new IllegalArgumentException(errorMessage); - } - } - - public static synchronized void storeCookies(List<HttpCookie> cookies) { - CookieHandler cookieHandler = CookieHandler.getDefault(); - if (cookieHandler == null) { - cookieHandler = new CookieManager(); - CookieHandler.setDefault(cookieHandler); - Log.v(TAG, "storeCookies: CookieManager created: " + cookieHandler); - } else { - Log.v(TAG, "storeCookies: CookieHandler (" + cookieHandler + ") exists."); - } - - if (cookies != null) { - if (cookieHandler instanceof CookieManager) { - CookieManager cookieManager = (CookieManager)cookieHandler; - CookieStore store = cookieManager.getCookieStore(); - for (HttpCookie cookie : cookies) { - try { - store.add(null, cookie); - } catch (Exception e) { - Log.v(TAG, "storeCookies: CookieStore.add" + cookie, e); - } - } - } else { - Log.w(TAG, "storeCookies: The installed CookieHandler is not a CookieManager." - + " Can’t add the provided cookies to the cookie store."); - } - } // cookies - - Log.v(TAG, "storeCookies: cookieHandler: " + cookieHandler + " Cookies: " + cookies); - - } -} diff --git a/media/apex/java/android/media/MediaPlayer2.java b/media/apex/java/android/media/MediaPlayer2.java deleted file mode 100644 index 614d737e3758..000000000000 --- a/media/apex/java/android/media/MediaPlayer2.java +++ /dev/null @@ -1,5507 +0,0 @@ -/* - * Copyright 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import android.annotation.CallbackExecutor; -import android.annotation.IntDef; -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.annotation.StringDef; -import android.annotation.TestApi; -import android.content.ContentResolver; -import android.content.Context; -import android.content.res.AssetFileDescriptor; -import android.graphics.Rect; -import android.graphics.SurfaceTexture; -import android.media.MediaDrm.KeyRequest; -import android.media.MediaPlayer2.DrmInfo; -import android.media.MediaPlayer2Proto.PlayerMessage; -import android.media.MediaPlayer2Proto.Value; -import android.media.protobuf.InvalidProtocolBufferException; -import android.net.Uri; -import android.os.Handler; -import android.os.HandlerThread; -import android.os.Looper; -import android.os.Message; -import android.os.ParcelFileDescriptor; -import android.os.PersistableBundle; -import android.os.PowerManager; -import android.util.Log; -import android.util.Pair; -import android.util.Size; -import android.view.Surface; -import android.view.SurfaceHolder; - -import com.android.internal.annotations.GuardedBy; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileDescriptor; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.ref.WeakReference; -import java.net.HttpCookie; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.ByteOrder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - -/** - * MediaPlayer2 class can be used to control playback of audio/video files and streams. - * - * <p> - * This API is not generally intended for third party application developers. - * Use the <a href="{@docRoot}jetpack/androidx.html">AndroidX</a> - * <a href="{@docRoot}reference/androidx/media2/package-summary.html">Media2 Library</a> - * for consistent behavior across all devices. - * - * <p>Topics covered here are: - * <ol> - * <li><a href="#PlayerStates">Player states</a> - * <li><a href="#InvalidStates">Invalid method calls</a> - * <li><a href="#Permissions">Permissions</a> - * <li><a href="#Callbacks">Callbacks</a> - * </ol> - * - * - * <h3 id="PlayerStates">Player states</h3> - * - * <p>The playback control of audio/video files is managed as a state machine.</p> - * <p><div style="text-align:center;"><img src="../../../images/mediaplayer2_state_diagram.png" - * alt="MediaPlayer2 State diagram" - * border="0" /></div></p> - * <p>The MediaPlayer2 object has five states:</p> - * <ol> - * <li><p>{@link #PLAYER_STATE_IDLE}: MediaPlayer2 is in the <strong>Idle</strong> - * state after it's created, or after calling {@link #reset()}.</p> - * - * <p>While in this state, you should call - * {@link #setDataSource setDataSource}. It is a good - * programming practice to register an {@link EventCallback#onCallCompleted onCallCompleted} - * <a href="#Callbacks">callback</a> and watch for {@link #CALL_STATUS_BAD_VALUE} and - * {@link #CALL_STATUS_ERROR_IO}, which might be caused by <code>setDataSource</code>. - * </p> - * - * <p>Calling {@link #prepare()} transfers a MediaPlayer2 object to - * the <strong>Prepared</strong> state. Note - * that {@link #prepare()} is asynchronous. When the preparation completes, - * if you register an {@link EventCallback#onInfo onInfo} <a href="#Callbacks">callback</a>, - * the player executes the callback - * with {@link #MEDIA_INFO_PREPARED} and transitions to the - * <strong>Prepared</strong> state.</p> - * </li> - * - * <li>{@link #PLAYER_STATE_PREPARED}: A MediaPlayer object must be in the - * <strong>Prepared</strong> state before playback can be started for the first time. - * While in this state, you can set player properties - * such as audio/sound volume and looping by invoking the corresponding set methods. - * Calling {@link #play()} transfers a MediaPlayer2 object to - * the <strong>Playing</strong> state. - * </li> - * - * <li>{@link #PLAYER_STATE_PLAYING}: - * <p>The player plays the data source while in this state. - * If you register an {@link EventCallback#onInfo onInfo} <a href="#Callbacks">callback</a>, - * the player regularly executes the callback with - * {@link #MEDIA_INFO_BUFFERING_UPDATE}. - * This allows applications to keep track of the buffering status - * while streaming audio/video.</p> - * - * <p> When the playback reaches the end of stream, the behavior depends on whether or - * not you've enabled looping by calling {@link #loopCurrent}:</p> - * <ul> - * <li>If the looping mode was set to <code>false</code>, the player will transfer - * to the <strong>Paused</strong> state. If you registered an {@link EventCallback#onInfo - * onInfo} <a href="#Callbacks">callback</a> - * the player calls the callback with {@link #MEDIA_INFO_DATA_SOURCE_END} and enters - * the <strong>Paused</strong> state. - * </li> - * <li>If the looping mode was set to <code>true</code>, - * the MediaPlayer2 object remains in the <strong>Playing</strong> state and replays its - * data source from the beginning.</li> - * </ul> - * </li> - * - * <li>{@link #PLAYER_STATE_PAUSED}: Audio/video playback pauses while in this state. - * Call {@link #play()} to resume playback from the position where it paused.</li> - * - * <li>{@link #PLAYER_STATE_ERROR}: <p>In general, playback might fail due to various - * reasons such as unsupported audio/video format, poorly interleaved - * audio/video, resolution too high, streaming timeout, and others. - * In addition, due to programming errors, a playback - * control operation might be performed from an <a href="#InvalidStates">invalid state</a>. - * In these cases the player transitions to the <strong>Error</strong> state.</p> - * - * <p>If you register an {@link EventCallback#onError onError}} - * <a href="#Callbacks">callback</a>, - * the callback will be performed when entering the state. When programming errors happen, - * such as calling {@link #prepare()} and - * {@link #setDataSource} methods - * from an <a href="#InvalidStates">invalid state</a>, the callback is called with - * {@link #CALL_STATUS_INVALID_OPERATION}. The MediaPlayer2 object enters the - * <strong>Error</strong> state whether or not a callback exists. </p> - * - * <p>To recover from an error and reuse a MediaPlayer2 object that is in the <strong> - * Error</strong> state, - * call {@link #reset()}. The object will return to the <strong>Idle</strong> - * state and all state information will be lost.</p> - * </li> - * </ol> - * - * <p>You should follow these best practices when coding an app that uses MediaPlayer2:</p> - * - * <ul> - * - * <li>Use <a href="#Callbacks">callbacks</a> to respond to state changes and errors.</li> - * - * <li>When a MediaPlayer2 object is no longer being used, call {@link #close()} as soon as - * possible to release the resources used by the internal player engine associated with the - * MediaPlayer2. Failure to call {@link #close()} may cause subsequent instances of - * MediaPlayer2 objects to fallback to software implementations or fail altogether. - * You cannot use MediaPlayer2 - * after you call {@link #close()}. There is no way to bring it back to any other state.</li> - * - * <li>The current playback position can be retrieved with a call to - * {@link #getCurrentPosition()}, - * which is helpful for applications such as a Music player that need to keep track of the playback - * progress.</li> - * - * <li>The playback position can be adjusted with a call to {@link #seekTo}. Although the - * asynchronous {@link #seekTo} call returns right away, the actual seek operation may take a - * while to finish, especially for audio/video being streamed. If you register an - * {@link EventCallback#onCallCompleted onCallCompleted} <a href="#Callbacks">callback</a>, - * the callback is - * called When the seek operation completes with {@link #CALL_COMPLETED_SEEK_TO}.</li> - * - * <li>You can call {@link #seekTo} from the <strong>Paused</strong> state. - * In this case, if you are playing a video stream and - * the requested position is valid one video frame is displayed.</li> - * - * </ul> - * - * <h3 id="InvalidStates">Invalid method calls</h3> - * - * <p>The only methods you safely call from the <strong>Error</strong> state are - * {@link #close}, - * {@link #reset}, - * {@link #notifyWhenCommandLabelReached}, - * {@link #clearPendingCommands}, - * {@link #registerEventCallback}, - * {@link #unregisterEventCallback} - * and {@link #getState}. - * Any other methods might throw an exception, return meaningless data, or invoke a - * {@link EventCallback#onCallCompleted onCallCompleted} with an error code.</p> - * - * <p>Most methods can be called from any non-Error state. They will either perform their work or - * silently have no effect. The following table lists the methods that will invoke a - * {@link EventCallback#onCallCompleted onCallCompleted} with an error code - * or throw an exception when they are called from the associated invalid states.</p> - * - * <table border="0" cellspacing="0" cellpadding="0"> - * <tr><th>Method Name</th> - * <th>Invalid States</th></tr> - * - * <tr><td>setDataSource</td> <td>{Prepared, Paused, Playing}</td></tr> - * <tr><td>prepare</td> <td>{Prepared, Paused, Playing}</td></tr> - * <tr><td>play</td> <td>{Idle}</td></tr> - * <tr><td>pause</td> <td>{Idle}</td></tr> - * <tr><td>seekTo</td> <td>{Idle}</td></tr> - * <tr><td>getCurrentPosition</td> <td>{Idle}</td></tr> - * <tr><td>getDuration</td> <td>{Idle}</td></tr> - * <tr><td>getBufferedPosition</td> <td>{Idle}</td></tr> - * <tr><td>getTrackInfo</td> <td>{Idle}</td></tr> - * <tr><td>getSelectedTrack</td> <td>{Idle}</td></tr> - * <tr><td>selectTrack</td> <td>{Idle}</td></tr> - * <tr><td>deselectTrack</td> <td>{Idle}</td></tr> - * </table> - * - * <h3 id="Permissions">Permissions</h3> - * <p>This class requires the {@link android.Manifest.permission#INTERNET} permission - * when used with network-based content. - * - * <h3 id="Callbacks">Callbacks</h3> - * <p>Many errors do not result in a transition to the <strong>Error</strong> state. - * It is good programming practice to register callback listeners using - * {@link #registerEventCallback}. - * You can receive a callback at any time and from any state.</p> - * - * <p>If it's important for your app to respond to state changes (for instance, to update the - * controls on a transport UI), you should register an - * {@link EventCallback#onCallCompleted onCallCompleted} and - * detect state change commands by testing the <code>what</code> parameter for a callback from one - * of the state transition methods: {@link #CALL_COMPLETED_PREPARE}, {@link #CALL_COMPLETED_PLAY}, - * and {@link #CALL_COMPLETED_PAUSE}. - * Then check the <code>status</code> parameter. The value {@link #CALL_STATUS_NO_ERROR} indicates a - * successful transition. Any other value will be an error. Call {@link #getState()} to - * determine the current state. </p> - * - * @hide - */ -public class MediaPlayer2 implements AutoCloseable, AudioRouting { - static { - System.loadLibrary("media2_jni"); - native_init(); - } - - private static native void native_init(); - - private static final int NEXT_SOURCE_STATE_ERROR = -1; - private static final int NEXT_SOURCE_STATE_INIT = 0; - private static final int NEXT_SOURCE_STATE_PREPARING = 1; - private static final int NEXT_SOURCE_STATE_PREPARED = 2; - - private static final String TAG = "MediaPlayer2"; - - private Context mContext; - - private long mNativeContext; // accessed by native methods - private long mNativeSurfaceTexture; // accessed by native methods - private int mListenerContext; // accessed by native methods - private SurfaceHolder mSurfaceHolder; - private PowerManager.WakeLock mWakeLock = null; - private boolean mScreenOnWhilePlaying; - private boolean mStayAwake; - - private final Object mSrcLock = new Object(); - //--- guarded by |mSrcLock| start - private SourceInfo mCurrentSourceInfo; - private final Queue<SourceInfo> mNextSourceInfos = new ConcurrentLinkedQueue<>(); - //--- guarded by |mSrcLock| end - private final AtomicLong mSrcIdGenerator = new AtomicLong(0); - - private volatile float mVolume = 1.0f; - private Size mVideoSize = new Size(0, 0); - - private static ExecutorService sDrmThreadPool = Executors.newCachedThreadPool(); - - // Creating a dummy audio track, used for keeping session id alive - private final Object mSessionIdLock = new Object(); - @GuardedBy("mSessionIdLock") - private AudioTrack mDummyAudioTrack; - - private HandlerThread mHandlerThread; - private final TaskHandler mTaskHandler; - private final Object mTaskLock = new Object(); - @GuardedBy("mTaskLock") - private final List<Task> mPendingTasks = new LinkedList<>(); - @GuardedBy("mTaskLock") - private Task mCurrentTask; - private final AtomicLong mTaskIdGenerator = new AtomicLong(0); - - @GuardedBy("mTaskLock") - boolean mIsPreviousCommandSeekTo = false; - // |mPreviousSeekPos| and |mPreviousSeekMode| are valid only when |mIsPreviousCommandSeekTo| - // is true, and they are accessed on |mHandlerThread| only. - long mPreviousSeekPos = -1; - int mPreviousSeekMode = SEEK_PREVIOUS_SYNC; - - @GuardedBy("this") - private boolean mReleased; - - private final CloseGuard mGuard = CloseGuard.get(); - - /** - * Default constructor. - * <p>When done with the MediaPlayer2, you should call {@link #close()}, - * to free the resources. If not released, too many MediaPlayer2 instances may - * result in an exception.</p> - */ - public MediaPlayer2(@NonNull Context context) { - mGuard.open("close"); - - mContext = context; - mHandlerThread = new HandlerThread("MediaPlayer2TaskThread"); - mHandlerThread.start(); - Looper looper = mHandlerThread.getLooper(); - mTaskHandler = new TaskHandler(this, looper); - AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); - int sessionId = am.generateAudioSessionId(); - keepAudioSessionIdAlive(sessionId); - - /* Native setup requires a weak reference to our object. - * It's easier to create it here than in C++. - */ - native_setup(sessionId, new WeakReference<MediaPlayer2>(this)); - } - - private native void native_setup(int sessionId, Object mediaplayer2This); - - /** - * Releases the resources held by this {@code MediaPlayer2} object. - * - * It is considered good practice to call this method when you're - * done using the MediaPlayer2. In particular, whenever an Activity - * of an application is paused (its onPause() method is called), - * or stopped (its onStop() method is called), this method should be - * invoked to release the MediaPlayer2 object, unless the application - * has a special need to keep the object around. In addition to - * unnecessary resources (such as memory and instances of codecs) - * being held, failure to call this method immediately if a - * MediaPlayer2 object is no longer needed may also lead to - * continuous battery consumption for mobile devices, and playback - * failure for other applications if no multiple instances of the - * same codec are supported on a device. Even if multiple instances - * of the same codec are supported, some performance degradation - * may be expected when unnecessary multiple instances are used - * at the same time. - * - * {@code close()} may be safely called after a prior {@code close()}. - * This class implements the Java {@code AutoCloseable} interface and - * may be used with try-with-resources. - */ - // This is a synchronous call. - @Override - public void close() { - synchronized (mGuard) { - mGuard.close(); - } - release(); - } - - private synchronized void release() { - if (mReleased) { - return; - } - stayAwake(false); - updateSurfaceScreenOn(); - synchronized (mEventCbLock) { - mEventCallbackRecords.clear(); - } - if (mHandlerThread != null) { - mHandlerThread.quitSafely(); - mHandlerThread = null; - } - - clearSourceInfos(); - - // Modular DRM clean up - synchronized (mDrmEventCallbackLock) { - mDrmEventCallback = null; - } - clearMediaDrmObjects(); - - native_release(); - - synchronized (mSessionIdLock) { - mDummyAudioTrack.release(); - } - - mReleased = true; - } - - void clearMediaDrmObjects() { - Collection<MediaDrm> drmObjs = mDrmObjs.values(); - synchronized (mDrmObjs) { - for (MediaDrm drmObj : drmObjs) { - drmObj.close(); - } - mDrmObjs.clear(); - } - } - - private native void native_release(); - - // Have to declare protected for finalize() since it is protected - // in the base class Object. - @Override - protected void finalize() throws Throwable { - if (mGuard != null) { - mGuard.warnIfOpen(); - } - - close(); - native_finalize(); - } - - private native void native_finalize(); - - /** - * Resets the MediaPlayer2 to its uninitialized state. After calling - * this method, you will have to initialize it again by setting the - * data source and calling prepare(). - */ - // This is a synchronous call. - public void reset() { - clearSourceInfos(); - clearMediaDrmObjects(); - - stayAwake(false); - native_reset(); - - AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); - int sessionId = am.generateAudioSessionId(); - keepAudioSessionIdAlive(sessionId); - - // make sure none of the listeners get called anymore - if (mTaskHandler != null) { - mTaskHandler.removeCallbacksAndMessages(null); - } - - } - - private native void native_reset(); - - /** - * Starts or resumes playback. If playback had previously been paused, - * playback will continue from where it was paused. If playback had - * reached end of stream and been paused, or never started before, - * playback will start at the beginning. - * - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object play() { - return addTask(new Task(CALL_COMPLETED_PLAY, false) { - @Override - void process() { - stayAwake(true); - native_start(); - } - }); - } - - private native void native_start() throws IllegalStateException; - - /** - * Prepares the player for playback, asynchronously. - * - * After setting the datasource and the display surface, you need to call prepare(). - * - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object prepare() { - return addTask(new Task(CALL_COMPLETED_PREPARE, true) { - @Override - void process() { - native_prepare(); - } - }); - } - - private native void native_prepare(); - - /** - * Pauses playback. Call play() to resume. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object pause() { - return addTask(new Task(CALL_COMPLETED_PAUSE, false) { - @Override - void process() { - stayAwake(false); - - native_pause(); - } - }); - } - - private native void native_pause() throws IllegalStateException; - - /** - * Tries to play next data source if applicable. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object skipToNext() { - return addTask(new Task(CALL_COMPLETED_SKIP_TO_NEXT, false) { - @Override - void process() { - if (getState() == PLAYER_STATE_PLAYING) { - native_pause(); - } - playNextDataSource(); - } - }); - } - - /** - * Gets the current playback position. - * - * @return the current position in milliseconds - */ - public native long getCurrentPosition(); - - /** - * Gets the duration of the current data source. - * Same as {@link #getDuration(DataSourceDesc)} with - * {@code dsd = getCurrentDataSource()}. - * - * @return the duration in milliseconds, if no duration is available - * (for example, if streaming live content), -1 is returned. - * @throws NullPointerException if current data source is null - */ - public long getDuration() { - return getDuration(getCurrentDataSource()); - } - - /** - * Gets the duration of the dsd. - * - * @param dsd the descriptor of data source of which you want to get duration - * @return the duration in milliseconds, if no duration is available - * (for example, if streaming live content), -1 is returned. - * @throws NullPointerException if dsd is null - */ - public long getDuration(@NonNull DataSourceDesc dsd) { - if (dsd == null) { - throw new NullPointerException("non-null dsd is expected"); - } - SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo == null) { - return -1; - } - - return native_getDuration(sourceInfo.mId); - } - - private native long native_getDuration(long srcId); - - /** - * Gets the buffered media source position of current data source. - * Same as {@link #getBufferedPosition(DataSourceDesc)} with - * {@code dsd = getCurrentDataSource()}. - * - * @return the current buffered media source position in milliseconds - * @throws NullPointerException if current data source is null - */ - public long getBufferedPosition() { - return getBufferedPosition(getCurrentDataSource()); - } - - /** - * Gets the buffered media source position of given dsd. - * For example a buffering update of 8000 milliseconds when 5000 milliseconds of the content - * has already been played indicates that the next 3000 milliseconds of the - * content to play has been buffered. - * - * @param dsd the descriptor of data source of which you want to get buffered position - * @return the current buffered media source position in milliseconds - * @throws NullPointerException if dsd is null - */ - public long getBufferedPosition(@NonNull DataSourceDesc dsd) { - if (dsd == null) { - throw new NullPointerException("non-null dsd is expected"); - } - SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo == null) { - return 0; - } - - // Use cached buffered percent for now. - int bufferedPercentage = sourceInfo.mBufferedPercentage.get(); - - long duration = getDuration(dsd); - if (duration < 0) { - duration = 0; - } - - return duration * bufferedPercentage / 100; - } - - /** - * MediaPlayer2 has not been prepared or just has been reset. - * In this state, MediaPlayer2 doesn't fetch data. - */ - public static final int PLAYER_STATE_IDLE = 1001; - - /** - * MediaPlayer2 has been just prepared. - * In this state, MediaPlayer2 just fetches data from media source, - * but doesn't actively render data. - */ - public static final int PLAYER_STATE_PREPARED = 1002; - - /** - * MediaPlayer2 is paused. - * In this state, MediaPlayer2 has allocated resources to construct playback - * pipeline, but it doesn't actively render data. - */ - public static final int PLAYER_STATE_PAUSED = 1003; - - /** - * MediaPlayer2 is actively playing back data. - */ - public static final int PLAYER_STATE_PLAYING = 1004; - - /** - * MediaPlayer2 has hit some fatal error and cannot continue playback. - */ - public static final int PLAYER_STATE_ERROR = 1005; - - /** - * @hide - */ - @IntDef(flag = false, prefix = "MEDIAPLAYER2_STATE", value = { - PLAYER_STATE_IDLE, - PLAYER_STATE_PREPARED, - PLAYER_STATE_PAUSED, - PLAYER_STATE_PLAYING, - PLAYER_STATE_ERROR }) - @Retention(RetentionPolicy.SOURCE) - public @interface MediaPlayer2State {} - - /** - * Gets the current player state. - * - * @return the current player state. - */ - public @MediaPlayer2State int getState() { - return native_getState(); - } - - private native int native_getState(); - - /** - * Sets the audio attributes for this MediaPlayer2. - * See {@link AudioAttributes} for how to build and configure an instance of this class. - * You must call this method before {@link #play()} and {@link #pause()} in order - * for the audio attributes to become effective thereafter. - * @param attributes a non-null set of audio attributes - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setAudioAttributes(@NonNull AudioAttributes attributes) { - return addTask(new Task(CALL_COMPLETED_SET_AUDIO_ATTRIBUTES, false) { - @Override - void process() { - if (attributes == null) { - final String msg = "Cannot set AudioAttributes to null"; - throw new IllegalArgumentException(msg); - } - native_setAudioAttributes(attributes); - } - }); - } - - // return true if the parameter is set successfully, false otherwise - private native boolean native_setAudioAttributes(AudioAttributes audioAttributes); - - /** - * Gets the audio attributes for this MediaPlayer2. - * @return attributes a set of audio attributes - */ - public @NonNull AudioAttributes getAudioAttributes() { - return native_getAudioAttributes(); - } - - private native AudioAttributes native_getAudioAttributes(); - - /** - * Sets the data source as described by a DataSourceDesc. - * When the data source is of {@link FileDataSourceDesc} type, the {@link ParcelFileDescriptor} - * in the {@link FileDataSourceDesc} will be closed by the player. - * - * @param dsd the descriptor of data source you want to play - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setDataSource(@NonNull DataSourceDesc dsd) { - return addTask(new Task(CALL_COMPLETED_SET_DATA_SOURCE, false) { - @Override - void process() throws IOException { - checkDataSourceDesc(dsd); - int state = getState(); - try { - if (state != PLAYER_STATE_ERROR && state != PLAYER_STATE_IDLE) { - throw new IllegalStateException("called in wrong state " + state); - } - - synchronized (mSrcLock) { - setCurrentSourceInfo_l(new SourceInfo(dsd)); - handleDataSource(true /* isCurrent */, dsd, mCurrentSourceInfo.mId); - } - } finally { - dsd.close(); - } - } - - }); - } - - /** - * Sets a single data source as described by a DataSourceDesc which will be played - * after current data source is finished. - * When the data source is of {@link FileDataSourceDesc} type, the {@link ParcelFileDescriptor} - * in the {@link FileDataSourceDesc} will be closed by the player. - * - * @param dsd the descriptor of data source you want to play after current one - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setNextDataSource(@NonNull DataSourceDesc dsd) { - return addTask(new Task(CALL_COMPLETED_SET_NEXT_DATA_SOURCE, false) { - @Override - void process() { - checkDataSourceDesc(dsd); - synchronized (mSrcLock) { - clearNextSourceInfos_l(); - mNextSourceInfos.add(new SourceInfo(dsd)); - } - prepareNextDataSource(); - } - }); - } - - /** - * Sets a list of data sources to be played sequentially after current data source is done. - * When the data source is of {@link FileDataSourceDesc} type, the {@link ParcelFileDescriptor} - * in the {@link FileDataSourceDesc} will be closed by the player. - * - * @param dsds the list of data sources you want to play after current one - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setNextDataSources(@NonNull List<DataSourceDesc> dsds) { - return addTask(new Task(CALL_COMPLETED_SET_NEXT_DATA_SOURCES, false) { - @Override - void process() { - if (dsds == null || dsds.size() == 0) { - throw new IllegalArgumentException("data source list cannot be null or empty."); - } - boolean hasError = false; - for (DataSourceDesc dsd : dsds) { - if (dsd == null) { - hasError = true; - continue; - } - if (dsd instanceof FileDataSourceDesc) { - FileDataSourceDesc fdsd = (FileDataSourceDesc) dsd; - if (fdsd.isPFDClosed()) { - hasError = true; - continue; - } - - fdsd.incCount(); - } - } - if (hasError) { - for (DataSourceDesc dsd : dsds) { - if (dsd != null) { - dsd.close(); - } - } - throw new IllegalArgumentException("invalid data source list"); - } - - synchronized (mSrcLock) { - clearNextSourceInfos_l(); - for (DataSourceDesc dsd : dsds) { - mNextSourceInfos.add(new SourceInfo(dsd)); - } - } - prepareNextDataSource(); - } - }); - } - - // throws IllegalArgumentException if dsd is null or underline PFD of dsd has been closed. - private void checkDataSourceDesc(DataSourceDesc dsd) { - if (dsd == null) { - throw new IllegalArgumentException("dsd is expected to be non null"); - } - if (dsd instanceof FileDataSourceDesc) { - FileDataSourceDesc fdsd = (FileDataSourceDesc) dsd; - if (fdsd.isPFDClosed()) { - throw new IllegalArgumentException("the underline FileDescriptor has been closed"); - } - fdsd.incCount(); - } - } - - /** - * Removes all data sources pending to be played. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object clearNextDataSources() { - return addTask(new Task(CALL_COMPLETED_CLEAR_NEXT_DATA_SOURCES, false) { - @Override - void process() { - synchronized (mSrcLock) { - clearNextSourceInfos_l(); - } - } - }); - } - - /** - * Gets the current data source as described by a DataSourceDesc. - * - * @return the current DataSourceDesc - */ - public @Nullable DataSourceDesc getCurrentDataSource() { - synchronized (mSrcLock) { - return mCurrentSourceInfo == null ? null : mCurrentSourceInfo.mDSD; - } - } - - private void handleDataSource(boolean isCurrent, @NonNull DataSourceDesc dsd, long srcId) - throws IOException { - Media2Utils.checkArgument(dsd != null, "the DataSourceDesc cannot be null"); - - if (dsd instanceof FileDataSourceDesc) { - FileDataSourceDesc fileDSD = (FileDataSourceDesc) dsd; - ParcelFileDescriptor pfd = fileDSD.getParcelFileDescriptor(); - if (pfd.getStatSize() == -1) { - // Underlying pipeline doesn't understand '-1' size. Create a wrapper for - // translation. - // TODO: Make native code handle '-1' size. - handleDataSource(isCurrent, - srcId, - new ProxyDataSourceCallback(pfd), - fileDSD.getStartPosition(), - fileDSD.getEndPosition()); - } else { - handleDataSource(isCurrent, - srcId, - pfd, - fileDSD.getOffset(), - fileDSD.getLength(), - fileDSD.getStartPosition(), - fileDSD.getEndPosition()); - } - } else if (dsd instanceof UriDataSourceDesc) { - UriDataSourceDesc uriDSD = (UriDataSourceDesc) dsd; - handleDataSource(isCurrent, - srcId, - mContext, - uriDSD.getUri(), - uriDSD.getHeaders(), - uriDSD.getCookies(), - uriDSD.getStartPosition(), - uriDSD.getEndPosition()); - } else { - throw new IllegalArgumentException("Unsupported DataSourceDesc. " + dsd.toString()); - } - } - - /** - * To provide cookies for the subsequent HTTP requests, you can install your own default cookie - * handler and use other variants of setDataSource APIs instead. Alternatively, you can use - * this API to pass the cookies as a list of HttpCookie. If the app has not installed - * a CookieHandler already, this API creates a CookieManager and populates its CookieStore with - * the provided cookies. If the app has installed its own handler already, this API requires the - * handler to be of CookieManager type such that the API can update the manager’s CookieStore. - * - * <p><strong>Note</strong> that the cross domain redirection is allowed by default, - * but that can be changed with key/value pairs through the headers parameter with - * "android-allow-cross-domain-redirect" as the key and "0" or "1" as the value to - * disallow or allow cross domain redirection. - * - * @throws IllegalArgumentException if cookies are provided and the installed handler is not - * a CookieManager - * @throws IllegalStateException if it is called in an invalid state - * @throws NullPointerException if context or uri is null - * @throws IOException if uri has a file scheme and an I/O error occurs - */ - private void handleDataSource( - boolean isCurrent, long srcId, - @NonNull Context context, @NonNull Uri uri, - @Nullable Map<String, String> headers, @Nullable List<HttpCookie> cookies, - long startPos, long endPos) - throws IOException { - // The context and URI usually belong to the calling user. Get a resolver for that user. - final ContentResolver resolver = context.getContentResolver(); - final String scheme = uri.getScheme(); - if (ContentResolver.SCHEME_FILE.equals(scheme)) { - handleDataSource(isCurrent, srcId, uri.getPath(), null, null, startPos, endPos); - return; - } - - final int ringToneType = RingtoneManager.getDefaultType(uri); - try { - AssetFileDescriptor afd; - // Try requested Uri locally first - if (ContentResolver.SCHEME_CONTENT.equals(scheme) && ringToneType != -1) { - afd = RingtoneManager.openDefaultRingtoneUri(context, uri); - if (attemptDataSource(isCurrent, srcId, afd, startPos, endPos)) { - return; - } - final Uri actualUri = RingtoneManager.getActualDefaultRingtoneUri( - context, ringToneType); - afd = resolver.openAssetFileDescriptor(actualUri, "r"); - } else { - afd = resolver.openAssetFileDescriptor(uri, "r"); - } - if (attemptDataSource(isCurrent, srcId, afd, startPos, endPos)) { - return; - } - } catch (NullPointerException | SecurityException | IOException ex) { - Log.w(TAG, "Couldn't open " + uri == null ? "null uri" : uri.toSafeString(), ex); - // Fallback to media server - } - handleDataSource(isCurrent, srcId, uri.toString(), headers, cookies, startPos, endPos); - } - - private boolean attemptDataSource(boolean isCurrent, long srcId, AssetFileDescriptor afd, - long startPos, long endPos) throws IOException { - try { - if (afd.getDeclaredLength() < 0) { - handleDataSource(isCurrent, - srcId, - ParcelFileDescriptor.dup(afd.getFileDescriptor()), - 0, - DataSourceDesc.LONG_MAX, - startPos, - endPos); - } else { - handleDataSource(isCurrent, - srcId, - ParcelFileDescriptor.dup(afd.getFileDescriptor()), - afd.getStartOffset(), - afd.getDeclaredLength(), - startPos, - endPos); - } - return true; - } catch (NullPointerException | SecurityException | IOException ex) { - Log.w(TAG, "Couldn't open srcId:" + srcId + ": " + ex); - return false; - } finally { - if (afd != null) { - afd.close(); - } - } - } - - private void handleDataSource( - boolean isCurrent, long srcId, - String path, Map<String, String> headers, List<HttpCookie> cookies, - long startPos, long endPos) - throws IOException { - String[] keys = null; - String[] values = null; - - if (headers != null) { - keys = new String[headers.size()]; - values = new String[headers.size()]; - - int i = 0; - for (Map.Entry<String, String> entry: headers.entrySet()) { - keys[i] = entry.getKey(); - values[i] = entry.getValue(); - ++i; - } - } - handleDataSource(isCurrent, srcId, path, keys, values, cookies, startPos, endPos); - } - - private void handleDataSource(boolean isCurrent, long srcId, - String path, String[] keys, String[] values, List<HttpCookie> cookies, - long startPos, long endPos) - throws IOException { - final Uri uri = Uri.parse(path); - final String scheme = uri.getScheme(); - if ("file".equals(scheme)) { - path = uri.getPath(); - } else if (scheme != null) { - // handle non-file sources - Media2Utils.storeCookies(cookies); - nativeHandleDataSourceUrl( - isCurrent, - srcId, - Media2HTTPService.createHTTPService(path), - path, - keys, - values, - startPos, - endPos); - return; - } - - final File file = new File(path); - if (file.exists()) { - FileInputStream is = new FileInputStream(file); - FileDescriptor fd = is.getFD(); - handleDataSource(isCurrent, srcId, ParcelFileDescriptor.dup(fd), - 0, DataSourceDesc.LONG_MAX, startPos, endPos); - is.close(); - } else { - throw new IOException("handleDataSource failed."); - } - } - - private native void nativeHandleDataSourceUrl( - boolean isCurrent, long srcId, - Media2HTTPService httpService, String path, String[] keys, String[] values, - long startPos, long endPos) - throws IOException; - - /** - * Sets the data source (FileDescriptor) to use. The FileDescriptor must be - * seekable (N.B. a LocalSocket is not seekable). It is the caller's responsibility - * to close the file descriptor. It is safe to do so as soon as this call returns. - * - * @throws IllegalStateException if it is called in an invalid state - * @throws IllegalArgumentException if fd is not a valid FileDescriptor - * @throws IOException if fd can not be read - */ - private void handleDataSource( - boolean isCurrent, long srcId, - ParcelFileDescriptor pfd, long offset, long length, - long startPos, long endPos) throws IOException { - nativeHandleDataSourceFD(isCurrent, srcId, pfd.getFileDescriptor(), offset, length, - startPos, endPos); - } - - private native void nativeHandleDataSourceFD(boolean isCurrent, long srcId, - FileDescriptor fd, long offset, long length, - long startPos, long endPos) throws IOException; - - /** - * @throws IllegalStateException if it is called in an invalid state - * @throws IllegalArgumentException if dataSource is not a valid DataSourceCallback - */ - private void handleDataSource(boolean isCurrent, long srcId, DataSourceCallback dataSource, - long startPos, long endPos) { - nativeHandleDataSourceCallback(isCurrent, srcId, dataSource, startPos, endPos); - } - - private native void nativeHandleDataSourceCallback( - boolean isCurrent, long srcId, DataSourceCallback dataSource, - long startPos, long endPos); - - // return true if there is a next data source, false otherwise. - // This function should be always called on |mHandlerThread|. - private boolean prepareNextDataSource() { - HandlerThread handlerThread = mHandlerThread; - if (handlerThread != null && Looper.myLooper() != handlerThread.getLooper()) { - Log.e(TAG, "prepareNextDataSource: called on wrong looper"); - } - - boolean hasNextDSD; - int state = getState(); - synchronized (mSrcLock) { - hasNextDSD = !mNextSourceInfos.isEmpty(); - if (state == PLAYER_STATE_ERROR || state == PLAYER_STATE_IDLE) { - // Current source has not been prepared yet. - return hasNextDSD; - } - - SourceInfo nextSource = mNextSourceInfos.peek(); - if (!hasNextDSD || nextSource.mStateAsNextSource != NEXT_SOURCE_STATE_INIT) { - // There is no next source or it's in preparing or prepared state. - return hasNextDSD; - } - - try { - nextSource.mStateAsNextSource = NEXT_SOURCE_STATE_PREPARING; - handleDataSource(false /* isCurrent */, nextSource.mDSD, nextSource.mId); - } catch (Exception e) { - Message msg = mTaskHandler.obtainMessage( - MEDIA_ERROR, MEDIA_ERROR_IO, MEDIA_ERROR_UNKNOWN, null); - mTaskHandler.handleMessage(msg, nextSource.mId); - - SourceInfo nextSourceInfo = mNextSourceInfos.poll(); - if (nextSource != null) { - nextSourceInfo.close(); - } - return prepareNextDataSource(); - } - } - return hasNextDSD; - } - - // This function should be always called on |mHandlerThread|. - private void playNextDataSource() { - HandlerThread handlerThread = mHandlerThread; - if (handlerThread != null && Looper.myLooper() != handlerThread.getLooper()) { - Log.e(TAG, "playNextDataSource: called on wrong looper"); - } - - boolean hasNextDSD = false; - synchronized (mSrcLock) { - if (!mNextSourceInfos.isEmpty()) { - hasNextDSD = true; - SourceInfo nextSourceInfo = mNextSourceInfos.peek(); - if (nextSourceInfo.mStateAsNextSource == NEXT_SOURCE_STATE_PREPARED) { - // Switch to next source only when it has been prepared. - setCurrentSourceInfo_l(mNextSourceInfos.poll()); - - long srcId = mCurrentSourceInfo.mId; - try { - nativePlayNextDataSource(srcId); - } catch (Exception e) { - Message msg2 = mTaskHandler.obtainMessage( - MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, MEDIA_ERROR_UNSUPPORTED, null); - mTaskHandler.handleMessage(msg2, srcId); - // Keep |mNextSourcePlayPending| - hasNextDSD = prepareNextDataSource(); - } - if (hasNextDSD) { - stayAwake(true); - - // Now a new current src is playing. - // Wait for MEDIA_INFO_DATA_SOURCE_START to prepare next source. - } - } else if (nextSourceInfo.mStateAsNextSource == NEXT_SOURCE_STATE_INIT) { - hasNextDSD = prepareNextDataSource(); - } - } - } - - if (!hasNextDSD) { - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onInfo( - MediaPlayer2.this, null, MEDIA_INFO_DATA_SOURCE_LIST_END, 0); - } - }); - } - } - - private native void nativePlayNextDataSource(long srcId); - - /** - * Configures the player to loop on the current data source. - * @param loop true if the current data source is meant to loop. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object loopCurrent(boolean loop) { - return addTask(new Task(CALL_COMPLETED_LOOP_CURRENT, false) { - @Override - void process() { - setLooping(loop); - } - }); - } - - private native void setLooping(boolean looping); - - /** - * Sets the volume of the audio of the media to play, expressed as a linear multiplier - * on the audio samples. - * Note that this volume is specific to the player, and is separate from stream volume - * used across the platform.<br> - * A value of 0.0f indicates muting, a value of 1.0f is the nominal unattenuated and unamplified - * gain. See {@link #getMaxPlayerVolume()} for the volume range supported by this player. - * @param volume a value between 0.0f and {@link #getMaxPlayerVolume()}. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setPlayerVolume(float volume) { - return addTask(new Task(CALL_COMPLETED_SET_PLAYER_VOLUME, false) { - @Override - void process() { - mVolume = volume; - native_setVolume(volume); - } - }); - } - - private native void native_setVolume(float volume); - - /** - * Returns the current volume of this player. - * Note that it does not take into account the associated stream volume. - * @return the player volume. - */ - public float getPlayerVolume() { - return mVolume; - } - - /** - * @return the maximum volume that can be used in {@link #setPlayerVolume(float)}. - */ - public float getMaxPlayerVolume() { - return 1.0f; - } - - /** - * Insert a task in the command queue to help the client to identify whether a batch - * of commands has been finished. When this command is processed, a notification - * {@link EventCallback#onCommandLabelReached onCommandLabelReached} will be fired with the - * given {@code label}. - * - * @see EventCallback#onCommandLabelReached - * - * @param label An application specific Object used to help to identify the completeness - * of a batch of commands. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object notifyWhenCommandLabelReached(@NonNull Object label) { - return addTask(new Task(CALL_COMPLETED_NOTIFY_WHEN_COMMAND_LABEL_REACHED, false) { - @Override - void process() { - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onCommandLabelReached( - MediaPlayer2.this, label); - } - }); - } - }); - } - - /** - * Sets the {@link SurfaceHolder} to use for displaying the video - * portion of the media. - * - * Either a surface holder or surface must be set if a display or video sink - * is needed. Not calling this method or {@link #setSurface(Surface)} - * when playing back a video will result in only the audio track being played. - * A null surface holder or surface will result in only the audio track being - * played. - * - * @param sh the SurfaceHolder to use for video display - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - public @NonNull Object setDisplay(@Nullable SurfaceHolder sh) { - return addTask(new Task(CALL_COMPLETED_SET_DISPLAY, false) { - @Override - void process() { - mSurfaceHolder = sh; - Surface surface; - if (sh != null) { - surface = sh.getSurface(); - } else { - surface = null; - } - native_setVideoSurface(surface); - updateSurfaceScreenOn(); - } - }); - } - - /** - * Sets the {@link Surface} to be used as the sink for the video portion of - * the media. Setting a - * Surface will un-set any Surface or SurfaceHolder that was previously set. - * A null surface will result in only the audio track being played. - * - * If the Surface sends frames to a {@link SurfaceTexture}, the timestamps - * returned from {@link SurfaceTexture#getTimestamp()} will have an - * unspecified zero point. These timestamps cannot be directly compared - * between different media sources, different instances of the same media - * source, or multiple runs of the same program. The timestamp is normally - * monotonically increasing and is unaffected by time-of-day adjustments, - * but it is reset when the position is set. - * - * @param surface The {@link Surface} to be used for the video portion of - * the media. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setSurface(@Nullable Surface surface) { - return addTask(new Task(CALL_COMPLETED_SET_SURFACE, false) { - @Override - void process() { - if (mScreenOnWhilePlaying && surface != null) { - Log.w(TAG, "setScreenOnWhilePlaying(true) is ineffective for Surface"); - } - mSurfaceHolder = null; - native_setVideoSurface(surface); - updateSurfaceScreenOn(); - } - }); - } - - private native void native_setVideoSurface(Surface surface); - - /** - * Set the low-level power management behavior for this MediaPlayer2. This - * can be used when the MediaPlayer2 is not playing through a SurfaceHolder - * set with {@link #setDisplay(SurfaceHolder)} and thus can use the - * high-level {@link #setScreenOnWhilePlaying(boolean)} feature. - * - * <p>This function has the MediaPlayer2 access the low-level power manager - * service to control the device's power usage while playing is occurring. - * The parameter is a {@link android.os.PowerManager.WakeLock}. - * Use of this method requires {@link android.Manifest.permission#WAKE_LOCK} - * permission. - * By default, no attempt is made to keep the device awake during playback. - * - * @param wakeLock the power wake lock used during playback. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - * @see android.os.PowerManager - */ - // This is an asynchronous call. - public @NonNull Object setWakeLock(@NonNull PowerManager.WakeLock wakeLock) { - return addTask(new Task(CALL_COMPLETED_SET_WAKE_LOCK, false) { - @Override - void process() { - boolean wasHeld = false; - - if (mWakeLock != null) { - if (mWakeLock.isHeld()) { - wasHeld = true; - mWakeLock.release(); - } - } - - mWakeLock = wakeLock; - if (mWakeLock != null) { - mWakeLock.setReferenceCounted(false); - if (wasHeld) { - mWakeLock.acquire(); - } - } - } - }); - } - - /** - * Control whether we should use the attached SurfaceHolder to keep the - * screen on while video playback is occurring. This is the preferred - * method over {@link #setWakeLock} where possible, since it doesn't - * require that the application have permission for low-level wake lock - * access. - * - * @param screenOn Supply true to keep the screen on, false to allow it to turn off. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setScreenOnWhilePlaying(boolean screenOn) { - return addTask(new Task(CALL_COMPLETED_SET_SCREEN_ON_WHILE_PLAYING, false) { - @Override - void process() { - if (mScreenOnWhilePlaying != screenOn) { - if (screenOn && mSurfaceHolder == null) { - Log.w(TAG, "setScreenOnWhilePlaying(true) is ineffective" - + " without a SurfaceHolder"); - } - mScreenOnWhilePlaying = screenOn; - updateSurfaceScreenOn(); - } - } - }); - } - - private void stayAwake(boolean awake) { - if (mWakeLock != null) { - if (awake && !mWakeLock.isHeld()) { - mWakeLock.acquire(); - } else if (!awake && mWakeLock.isHeld()) { - mWakeLock.release(); - } - } - mStayAwake = awake; - updateSurfaceScreenOn(); - } - - private void updateSurfaceScreenOn() { - if (mSurfaceHolder != null) { - mSurfaceHolder.setKeepScreenOn(mScreenOnWhilePlaying && mStayAwake); - } - } - - /** - * Cancels a pending command. - * - * @param token the command to be canceled. This is the returned Object when command is issued. - * @return {@code false} if the task could not be cancelled; {@code true} otherwise. - * @throws IllegalArgumentException if argument token is null. - */ - // This is a synchronous call. - public boolean cancelCommand(@NonNull Object token) { - if (token == null) { - throw new IllegalArgumentException("command token should not be null"); - } - synchronized (mTaskLock) { - return mPendingTasks.remove(token); - } - } - - /** - * Discards all pending commands. - */ - // This is a synchronous call. - public void clearPendingCommands() { - synchronized (mTaskLock) { - mPendingTasks.clear(); - } - } - - //-------------------------------------------------------------------------- - // Explicit Routing - //-------------------- - private AudioDeviceInfo mPreferredDevice = null; - - /** - * Specifies an audio device (via an {@link AudioDeviceInfo} object) to route - * the output from this MediaPlayer2. - * @param deviceInfo The {@link AudioDeviceInfo} specifying the audio sink or source. - * If deviceInfo is null, default routing is restored. - * @return true if succesful, false if the specified {@link AudioDeviceInfo} is non-null and - * does not correspond to a valid audio device. - */ - // This is a synchronous call. - @Override - public boolean setPreferredDevice(@Nullable AudioDeviceInfo deviceInfo) { - boolean status = native_setPreferredDevice(deviceInfo); - if (status) { - synchronized (this) { - mPreferredDevice = deviceInfo; - } - } - return status; - } - - private native boolean native_setPreferredDevice(AudioDeviceInfo device); - - /** - * Returns the selected output specified by {@link #setPreferredDevice}. Note that this - * is not guaranteed to correspond to the actual device being used for playback. - */ - @Override - public @Nullable AudioDeviceInfo getPreferredDevice() { - synchronized (this) { - return mPreferredDevice; - } - } - - /** - * Returns an {@link AudioDeviceInfo} identifying the current routing of this MediaPlayer2 - * Note: The query is only valid if the MediaPlayer2 is currently playing. - * If the player is not playing, the returned device can be null or correspond to previously - * selected device when the player was last active. - */ - @Override - public @Nullable native AudioDeviceInfo getRoutedDevice(); - - /** - * Adds an {@link AudioRouting.OnRoutingChangedListener} to receive notifications of routing - * changes on this MediaPlayer2. - * @param listener The {@link AudioRouting.OnRoutingChangedListener} interface to receive - * notifications of rerouting events. - * @param handler Specifies the {@link Handler} object for the thread on which to execute - * the callback. If <code>null</code>, the handler on the main looper will be used. - */ - // This is a synchronous call. - @Override - public void addOnRoutingChangedListener(@NonNull AudioRouting.OnRoutingChangedListener listener, - @Nullable Handler handler) { - if (listener == null) { - throw new IllegalArgumentException("addOnRoutingChangedListener: listener is NULL"); - } - RoutingDelegate routingDelegate = new RoutingDelegate(this, listener, handler); - native_addDeviceCallback(routingDelegate); - } - - private native void native_addDeviceCallback(RoutingDelegate rd); - - /** - * Removes an {@link AudioRouting.OnRoutingChangedListener} which has been previously added - * to receive rerouting notifications. - * @param listener The previously added {@link AudioRouting.OnRoutingChangedListener} interface - * to remove. - */ - // This is a synchronous call. - @Override - public void removeOnRoutingChangedListener( - @NonNull AudioRouting.OnRoutingChangedListener listener) { - if (listener == null) { - throw new IllegalArgumentException("removeOnRoutingChangedListener: listener is NULL"); - } - native_removeDeviceCallback(listener); - } - - private native void native_removeDeviceCallback( - AudioRouting.OnRoutingChangedListener listener); - - /** - * Returns the size of the video. - * - * @return the size of the video. The width and height of size could be 0 if there is no video, - * or the size has not been determined yet. - * The {@code EventCallback} can be registered via - * {@link #registerEventCallback(Executor, EventCallback)} to provide a - * notification {@code EventCallback.onVideoSizeChanged} when the size - * is available. - */ - public @NonNull Size getVideoSize() { - return mVideoSize; - } - - /** - * Return Metrics data about the current player. - * - * @return a {@link PersistableBundle} containing the set of attributes and values - * available for the media being handled by this instance of MediaPlayer2 - * The attributes are descibed in {@link MetricsConstants}. - * - * Additional vendor-specific fields may also be present in the return value. - */ - public @Nullable PersistableBundle getMetrics() { - PersistableBundle bundle = native_getMetrics(); - return bundle; - } - - private native PersistableBundle native_getMetrics(); - - /** - * Gets the current buffering management params used by the source component. - * Calling it only after {@code setDataSource} has been called. - * Each type of data source might have different set of default params. - * - * @return the current buffering management params used by the source component. - * @throws IllegalStateException if the internal player engine has not been - * initialized, or {@code setDataSource} has not been called. - */ - // TODO: make it public when ready - @NonNull - native BufferingParams getBufferingParams(); - - /** - * Sets buffering management params. - * The object sets its internal BufferingParams to the input, except that the input is - * invalid or not supported. - * Call it only after {@code setDataSource} has been called. - * The input is a hint to MediaPlayer2. - * - * @param params the buffering management params. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // TODO: make it public when ready - // This is an asynchronous call. - @NonNull Object setBufferingParams(@NonNull BufferingParams params) { - return addTask(new Task(CALL_COMPLETED_SET_BUFFERING_PARAMS, false) { - @Override - void process() { - Media2Utils.checkArgument(params != null, "the BufferingParams cannot be null"); - native_setBufferingParams(params); - } - }); - } - - private native void native_setBufferingParams(@NonNull BufferingParams params); - - /** - * Sets playback rate using {@link PlaybackParams}. The object sets its internal - * PlaybackParams to the input. This allows the object to resume at previous speed - * when play() is called. Speed of zero is not allowed. Calling it does not change - * the object state. - * - * @param params the playback params. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setPlaybackParams(@NonNull PlaybackParams params) { - return addTask(new Task(CALL_COMPLETED_SET_PLAYBACK_PARAMS, false) { - @Override - void process() { - Media2Utils.checkArgument(params != null, "the PlaybackParams cannot be null"); - native_setPlaybackParams(params); - } - }); - } - - private native void native_setPlaybackParams(@NonNull PlaybackParams params); - - /** - * Gets the playback params, containing the current playback rate. - * - * @return the playback params. - * @throws IllegalStateException if the internal player engine has not been initialized. - */ - @NonNull - public native PlaybackParams getPlaybackParams(); - - /** - * Sets A/V sync mode. - * - * @param params the A/V sync params to apply - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setSyncParams(@NonNull SyncParams params) { - return addTask(new Task(CALL_COMPLETED_SET_SYNC_PARAMS, false) { - @Override - void process() { - Media2Utils.checkArgument(params != null, "the SyncParams cannot be null"); - native_setSyncParams(params); - } - }); - } - - private native void native_setSyncParams(@NonNull SyncParams params); - - /** - * Gets the A/V sync mode. - * - * @return the A/V sync params - * @throws IllegalStateException if the internal player engine has not been initialized. - */ - @NonNull - public native SyncParams getSyncParams(); - - /** - * Moves the media to specified time position. - * Same as {@link #seekTo(long, int)} with {@code mode = SEEK_PREVIOUS_SYNC}. - * - * @param msec the offset in milliseconds from the start to seek to - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object seekTo(long msec) { - return seekTo(msec, SEEK_PREVIOUS_SYNC /* mode */); - } - - /** - * Seek modes used in method seekTo(long, int) to move media position - * to a specified location. - * - * Do not change these mode values without updating their counterparts - * in include/media/IMediaSource.h! - */ - /** - * This mode is used with {@link #seekTo(long, int)} to move media position to - * a sync (or key) frame associated with a data source that is located - * right before or at the given time. - * - * @see #seekTo(long, int) - */ - public static final int SEEK_PREVIOUS_SYNC = 0x00; - /** - * This mode is used with {@link #seekTo(long, int)} to move media position to - * a sync (or key) frame associated with a data source that is located - * right after or at the given time. - * - * @see #seekTo(long, int) - */ - public static final int SEEK_NEXT_SYNC = 0x01; - /** - * This mode is used with {@link #seekTo(long, int)} to move media position to - * a sync (or key) frame associated with a data source that is located - * closest to (in time) or at the given time. - * - * @see #seekTo(long, int) - */ - public static final int SEEK_CLOSEST_SYNC = 0x02; - /** - * This mode is used with {@link #seekTo(long, int)} to move media position to - * a frame (not necessarily a key frame) associated with a data source that - * is located closest to or at the given time. - * - * @see #seekTo(long, int) - */ - public static final int SEEK_CLOSEST = 0x03; - - /** @hide */ - @IntDef(flag = false, prefix = "SEEK", value = { - SEEK_PREVIOUS_SYNC, - SEEK_NEXT_SYNC, - SEEK_CLOSEST_SYNC, - SEEK_CLOSEST, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface SeekMode {} - - /** - * Moves the media to specified time position by considering the given mode. - * <p> - * When seekTo is finished, the user will be notified via - * {@link EventCallback#onCallCompleted} with {@link #CALL_COMPLETED_SEEK_TO}. - * There is at most one active seekTo processed at any time. If there is a to-be-completed - * seekTo, new seekTo requests will be queued in such a way that only the last request - * is kept. When current seekTo is completed, the queued request will be processed if - * that request is different from just-finished seekTo operation, i.e., the requested - * position or mode is different. - * - * @param msec the offset in milliseconds from the start to seek to. - * When seeking to the given time position, there is no guarantee that the data source - * has a frame located at the position. When this happens, a frame nearby will be rendered. - * If msec is negative, time position zero will be used. - * If msec is larger than duration, duration will be used. - * @param mode the mode indicating where exactly to seek to. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object seekTo(long msec, @SeekMode int mode) { - return addTask(new Task(CALL_COMPLETED_SEEK_TO, true) { - @Override - void process() { - if (mode < SEEK_PREVIOUS_SYNC || mode > SEEK_CLOSEST) { - final String msg = "Illegal seek mode: " + mode; - throw new IllegalArgumentException(msg); - } - // TODO: pass long to native, instead of truncating here. - long posMs = msec; - if (posMs > Integer.MAX_VALUE) { - Log.w(TAG, "seekTo offset " + posMs + " is too large, cap to " - + Integer.MAX_VALUE); - posMs = Integer.MAX_VALUE; - } else if (posMs < Integer.MIN_VALUE) { - Log.w(TAG, "seekTo offset " + posMs + " is too small, cap to " - + Integer.MIN_VALUE); - posMs = Integer.MIN_VALUE; - } - - synchronized (mTaskLock) { - if (mIsPreviousCommandSeekTo - && mPreviousSeekPos == posMs - && mPreviousSeekMode == mode) { - throw new CommandSkippedException( - "same as previous seekTo"); - } - } - - native_seekTo(posMs, mode); - - synchronized (mTaskLock) { - mIsPreviousCommandSeekTo = true; - mPreviousSeekPos = posMs; - mPreviousSeekMode = mode; - } - } - }); - } - - private native void native_seekTo(long msec, int mode); - - /** - * Get current playback position as a {@link MediaTimestamp}. - * <p> - * The MediaTimestamp represents how the media time correlates to the system time in - * a linear fashion using an anchor and a clock rate. During regular playback, the media - * time moves fairly constantly (though the anchor frame may be rebased to a current - * system time, the linear correlation stays steady). Therefore, this method does not - * need to be called often. - * <p> - * To help users get current playback position, this method always anchors the timestamp - * to the current {@link System#nanoTime system time}, so - * {@link MediaTimestamp#getAnchorMediaTimeUs} can be used as current playback position. - * - * @return a MediaTimestamp object if a timestamp is available, or {@code null} if no timestamp - * is available, e.g. because the media player has not been initialized. - * - * @see MediaTimestamp - */ - @Nullable - public MediaTimestamp getTimestamp() { - try { - // TODO: get the timestamp from native side - return new MediaTimestamp( - getCurrentPosition() * 1000L, - System.nanoTime(), - getState() == PLAYER_STATE_PLAYING ? getPlaybackParams().getSpeed() : 0.f); - } catch (IllegalStateException e) { - return null; - } - } - - /** - * Checks whether the MediaPlayer2 is looping or non-looping. - * - * @return true if the MediaPlayer2 is currently looping, false otherwise - */ - // This is a synchronous call. - public native boolean isLooping(); - - /** - * Sets the audio session ID. - * - * @param sessionId the audio session ID. - * The audio session ID is a system wide unique identifier for the audio stream played by - * this MediaPlayer2 instance. - * The primary use of the audio session ID is to associate audio effects to a particular - * instance of MediaPlayer2: if an audio session ID is provided when creating an audio effect, - * this effect will be applied only to the audio content of media players within the same - * audio session and not to the output mix. - * When created, a MediaPlayer2 instance automatically generates its own audio session ID. - * However, it is possible to force this player to be part of an already existing audio session - * by calling this method. - * This method must be called when player is in {@link #PLAYER_STATE_IDLE} or - * {@link #PLAYER_STATE_PREPARED} state in order to have sessionId take effect. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setAudioSessionId(int sessionId) { - final AudioTrack dummyAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, 44100, - AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT, 2, - AudioTrack.MODE_STATIC, sessionId); - return addTask(new Task(CALL_COMPLETED_SET_AUDIO_SESSION_ID, false) { - @Override - void process() { - keepAudioSessionIdAlive(dummyAudioTrack); - native_setAudioSessionId(sessionId); - } - }); - } - - private native void native_setAudioSessionId(int sessionId); - - /** - * Returns the audio session ID. - * - * @return the audio session ID. {@see #setAudioSessionId(int)} - * Note that the audio session ID is 0 only if a problem occured when the MediaPlayer2 was - * contructed. - */ - // This is a synchronous call. - public native int getAudioSessionId(); - - /** - * Attaches an auxiliary effect to the player. A typical auxiliary effect is a reverberation - * effect which can be applied on any sound source that directs a certain amount of its - * energy to this effect. This amount is defined by setAuxEffectSendLevel(). - * See {@link #setAuxEffectSendLevel(float)}. - * <p>After creating an auxiliary effect (e.g. - * {@link android.media.audiofx.EnvironmentalReverb}), retrieve its ID with - * {@link android.media.audiofx.AudioEffect#getId()} and use it when calling this method - * to attach the player to the effect. - * <p>To detach the effect from the player, call this method with a null effect id. - * <p>This method must be called after one of the overloaded <code> setDataSource </code> - * methods. - * @param effectId system wide unique id of the effect to attach - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object attachAuxEffect(int effectId) { - return addTask(new Task(CALL_COMPLETED_ATTACH_AUX_EFFECT, false) { - @Override - void process() { - native_attachAuxEffect(effectId); - } - }); - } - - private native void native_attachAuxEffect(int effectId); - - /** - * Sets the send level of the player to the attached auxiliary effect. - * See {@link #attachAuxEffect(int)}. The level value range is 0 to 1.0. - * <p>By default the send level is 0, so even if an effect is attached to the player - * this method must be called for the effect to be applied. - * <p>Note that the passed level value is a raw scalar. UI controls should be scaled - * logarithmically: the gain applied by audio framework ranges from -72dB to 0dB, - * so an appropriate conversion from linear UI input x to level is: - * x == 0 -> level = 0 - * 0 < x <= R -> level = 10^(72*(x-R)/20/R) - * @param level send level scalar - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - */ - // This is an asynchronous call. - public @NonNull Object setAuxEffectSendLevel(float level) { - return addTask(new Task(CALL_COMPLETED_SET_AUX_EFFECT_SEND_LEVEL, false) { - @Override - void process() { - native_setAuxEffectSendLevel(level); - } - }); - } - - private native void native_setAuxEffectSendLevel(float level); - - private static native void native_stream_event_onTearDown( - long nativeCallbackPtr, long userDataPtr); - private static native void native_stream_event_onStreamPresentationEnd( - long nativeCallbackPtr, long userDataPtr); - private static native void native_stream_event_onStreamDataRequest( - long jAudioTrackPtr, long nativeCallbackPtr, long userDataPtr); - - /* Do not change these values (starting with INVOKE_ID) without updating - * their counterparts in include/media/mediaplayer2.h! - */ - private static final int INVOKE_ID_GET_TRACK_INFO = 1; - private static final int INVOKE_ID_ADD_EXTERNAL_SOURCE = 2; - private static final int INVOKE_ID_ADD_EXTERNAL_SOURCE_FD = 3; - private static final int INVOKE_ID_SELECT_TRACK = 4; - private static final int INVOKE_ID_DESELECT_TRACK = 5; - private static final int INVOKE_ID_GET_SELECTED_TRACK = 7; - - /** - * Invoke a generic method on the native player using opaque protocol - * buffer message for the request and reply. Both payloads' format is a - * convention between the java caller and the native player. - * - * @param msg PlayerMessage for the extension. - * - * @return PlayerMessage with the data returned by the - * native player. - */ - private PlayerMessage invoke(PlayerMessage msg) { - byte[] ret = native_invoke(msg.toByteArray()); - if (ret == null) { - return null; - } - try { - return PlayerMessage.parseFrom(ret); - } catch (InvalidProtocolBufferException e) { - return null; - } - } - - private native byte[] native_invoke(byte[] request); - - /** - * @hide - */ - @IntDef(flag = false, prefix = "MEDIA_TRACK_TYPE", value = { - TrackInfo.MEDIA_TRACK_TYPE_VIDEO, - TrackInfo.MEDIA_TRACK_TYPE_AUDIO, - TrackInfo.MEDIA_TRACK_TYPE_SUBTITLE - }) - @Retention(RetentionPolicy.SOURCE) - public @interface TrackType {} - - /** - * Class for MediaPlayer2 to return each audio/video/subtitle track's metadata. - * - * @see MediaPlayer2#getTrackInfo - */ - public static class TrackInfo { - /** - * Gets the track type. - * @return TrackType which indicates if the track is video, audio, timed text. - */ - public int getTrackType() { - return mTrackType; - } - - /** - * Gets the language code of the track. - * @return a language code in either way of ISO-639-1 or ISO-639-2. - * When the language is unknown or could not be determined, - * ISO-639-2 language code, "und", is returned. - */ - public @NonNull String getLanguage() { - String language = mFormat.getString(MediaFormat.KEY_LANGUAGE); - return language == null ? "und" : language; - } - - /** - * Gets the {@link MediaFormat} of the track. If the format is - * unknown or could not be determined, null is returned. - */ - public @Nullable MediaFormat getFormat() { - if (mTrackType == MEDIA_TRACK_TYPE_TIMEDTEXT - || mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) { - return mFormat; - } - return null; - } - - public static final int MEDIA_TRACK_TYPE_UNKNOWN = 0; - public static final int MEDIA_TRACK_TYPE_VIDEO = 1; - public static final int MEDIA_TRACK_TYPE_AUDIO = 2; - - /** @hide */ - public static final int MEDIA_TRACK_TYPE_TIMEDTEXT = 3; - - public static final int MEDIA_TRACK_TYPE_SUBTITLE = 4; - public static final int MEDIA_TRACK_TYPE_METADATA = 5; - - final int mId; - final int mTrackType; - final MediaFormat mFormat; - - static TrackInfo create(int idx, Iterator<Value> in) { - int trackType = in.next().getInt32Value(); - // TODO: build the full MediaFormat; currently we are using createSubtitleFormat - // even for audio/video tracks, meaning we only set the mime and language. - String mime = in.next().getStringValue(); - String language = in.next().getStringValue(); - MediaFormat format = MediaFormat.createSubtitleFormat(mime, language); - - if (trackType == MEDIA_TRACK_TYPE_SUBTITLE) { - format.setInteger(MediaFormat.KEY_IS_AUTOSELECT, in.next().getInt32Value()); - format.setInteger(MediaFormat.KEY_IS_DEFAULT, in.next().getInt32Value()); - format.setInteger(MediaFormat.KEY_IS_FORCED_SUBTITLE, in.next().getInt32Value()); - } - return new TrackInfo(idx, trackType, format); - } - - /** @hide */ - TrackInfo(int id, int type, MediaFormat format) { - mId = id; - mTrackType = type; - mFormat = format; - } - - @Override - public String toString() { - StringBuilder out = new StringBuilder(128); - out.append(getClass().getName()); - out.append('{'); - switch (mTrackType) { - case MEDIA_TRACK_TYPE_VIDEO: - out.append("VIDEO"); - break; - case MEDIA_TRACK_TYPE_AUDIO: - out.append("AUDIO"); - break; - case MEDIA_TRACK_TYPE_TIMEDTEXT: - out.append("TIMEDTEXT"); - break; - case MEDIA_TRACK_TYPE_SUBTITLE: - out.append("SUBTITLE"); - break; - default: - out.append("UNKNOWN"); - break; - } - out.append(", " + mFormat.toString()); - out.append("}"); - return out.toString(); - } - }; - - /** - * Returns a List of track information of current data source. - * Same as {@link #getTrackInfo(DataSourceDesc)} with - * {@code dsd = getCurrentDataSource()}. - * - * @return List of track info. The total number of tracks is the array length. - * Must be called again if an external timed text source has been added after - * addTimedTextSource method is called. - * @throws IllegalStateException if it is called in an invalid state. - * @throws NullPointerException if current data source is null - */ - public @NonNull List<TrackInfo> getTrackInfo() { - return getTrackInfo(getCurrentDataSource()); - } - - /** - * Returns a List of track information. - * - * @param dsd the descriptor of data source of which you want to get track info - * @return List of track info. The total number of tracks is the array length. - * Must be called again if an external timed text source has been added after - * addTimedTextSource method is called. - * @throws IllegalStateException if it is called in an invalid state. - * @throws NullPointerException if dsd is null - */ - public @NonNull List<TrackInfo> getTrackInfo(@NonNull DataSourceDesc dsd) { - if (dsd == null) { - throw new NullPointerException("non-null dsd is expected"); - } - SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo == null) { - return new ArrayList<TrackInfo>(0); - } - - TrackInfo[] trackInfo = getInbandTrackInfo(sourceInfo); - return (trackInfo != null ? Arrays.asList(trackInfo) : new ArrayList<TrackInfo>(0)); - } - - private TrackInfo[] getInbandTrackInfo(SourceInfo sourceInfo) throws IllegalStateException { - PlayerMessage request = PlayerMessage.newBuilder() - .addValues(Value.newBuilder().setInt32Value(INVOKE_ID_GET_TRACK_INFO)) - .addValues(Value.newBuilder().setInt64Value(sourceInfo.mId)) - .build(); - PlayerMessage response = invoke(request); - if (response == null) { - return null; - } - Iterator<Value> in = response.getValuesList().iterator(); - int size = in.next().getInt32Value(); - if (size == 0) { - return null; - } - TrackInfo[] trackInfo = new TrackInfo[size]; - for (int i = 0; i < size; ++i) { - trackInfo[i] = TrackInfo.create(i, in); - } - return trackInfo; - } - - /** - * Returns the index of the audio, video, or subtitle track currently selected for playback. - * The return value is an index into the array returned by {@link #getTrackInfo}, and can - * be used in calls to {@link #selectTrack(TrackInfo)} or {@link #deselectTrack(TrackInfo)}. - * Same as {@link #getSelectedTrack(DataSourceDesc, int)} with - * {@code dsd = getCurrentDataSource()}. - * - * @param trackType should be one of {@link TrackInfo#MEDIA_TRACK_TYPE_VIDEO}, - * {@link TrackInfo#MEDIA_TRACK_TYPE_AUDIO}, or - * {@link TrackInfo#MEDIA_TRACK_TYPE_SUBTITLE} - * @return metadata corresponding to the audio, video, or subtitle track currently selected for - * playback; {@code null} is returned when there is no selected track for {@code trackType} or - * when {@code trackType} is not one of audio, video, or subtitle. - * @throws IllegalStateException if called after {@link #close()} - * @throws NullPointerException if current data source is null - * - * @see #getTrackInfo() - * @see #selectTrack(TrackInfo) - * @see #deselectTrack(TrackInfo) - */ - @Nullable - public TrackInfo getSelectedTrack(@TrackType int trackType) { - return getSelectedTrack(getCurrentDataSource(), trackType); - } - - /** - * Returns the index of the audio, video, or subtitle track currently selected for playback. - * The return value is an index into the array returned by {@link #getTrackInfo}, and can - * be used in calls to {@link #selectTrack(DataSourceDesc, TrackInfo)} or - * {@link #deselectTrack(DataSourceDesc, TrackInfo)}. - * - * @param dsd the descriptor of data source of which you want to get selected track - * @param trackType should be one of {@link TrackInfo#MEDIA_TRACK_TYPE_VIDEO}, - * {@link TrackInfo#MEDIA_TRACK_TYPE_AUDIO}, or - * {@link TrackInfo#MEDIA_TRACK_TYPE_SUBTITLE} - * @return metadata corresponding to the audio, video, or subtitle track currently selected for - * playback; {@code null} is returned when there is no selected track for {@code trackType} or - * when {@code trackType} is not one of audio, video, or subtitle. - * @throws IllegalStateException if called after {@link #close()} - * @throws NullPointerException if dsd is null - * - * @see #getTrackInfo(DataSourceDesc) - * @see #selectTrack(DataSourceDesc, TrackInfo) - * @see #deselectTrack(DataSourceDesc, TrackInfo) - */ - @Nullable - public TrackInfo getSelectedTrack(@NonNull DataSourceDesc dsd, @TrackType int trackType) { - if (dsd == null) { - throw new NullPointerException("non-null dsd is expected"); - } - SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo == null) { - return null; - } - - PlayerMessage request = PlayerMessage.newBuilder() - .addValues(Value.newBuilder().setInt32Value(INVOKE_ID_GET_SELECTED_TRACK)) - .addValues(Value.newBuilder().setInt64Value(sourceInfo.mId)) - .addValues(Value.newBuilder().setInt32Value(trackType)) - .build(); - PlayerMessage response = invoke(request); - if (response == null) { - return null; - } - // TODO: return full TrackInfo data from native player instead of index - final int idx = response.getValues(0).getInt32Value(); - final List<TrackInfo> trackInfos = getTrackInfo(dsd); - return trackInfos.isEmpty() ? null : trackInfos.get(idx); - } - - /** - * Selects a track of current data source. - * Same as {@link #selectTrack(DataSourceDesc, TrackInfo)} with - * {@code dsd = getCurrentDataSource()}. - * - * @param trackInfo metadata corresponding to the track to be selected. A {@code trackInfo} - * object can be obtained from {@link #getTrackInfo()}. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - * - * This is an asynchronous call. - * - * @see MediaPlayer2#getTrackInfo() - */ - @NonNull - public Object selectTrack(@NonNull TrackInfo trackInfo) { - return selectTrack(getCurrentDataSource(), trackInfo); - } - - /** - * Selects a track. - * <p> - * If a MediaPlayer2 is in invalid state, it throws an IllegalStateException exception. - * If a MediaPlayer2 is in <em>Started</em> state, the selected track is presented immediately. - * If a MediaPlayer2 is not in Started state, it just marks the track to be played. - * </p> - * <p> - * In any valid state, if it is called multiple times on the same type of track (ie. Video, - * Audio, Timed Text), the most recent one will be chosen. - * </p> - * <p> - * The first audio and video tracks are selected by default if available, even though - * this method is not called. However, no timed text track will be selected until - * this function is called. - * </p> - * <p> - * Currently, only timed text tracks or audio tracks can be selected via this method. - * In addition, the support for selecting an audio track at runtime is pretty limited - * in that an audio track can only be selected in the <em>Prepared</em> state. - * </p> - * @param dsd the descriptor of data source of which you want to select track - * @param trackInfo metadata corresponding to the track to be selected. A {@code trackInfo} - * object can be obtained from {@link #getTrackInfo()}. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - * - * This is an asynchronous call. - * - * @see MediaPlayer2#getTrackInfo(DataSourceDesc) - */ - @NonNull - public Object selectTrack(@NonNull DataSourceDesc dsd, @NonNull TrackInfo trackInfo) { - return addTask(new Task(CALL_COMPLETED_SELECT_TRACK, false) { - @Override - void process() { - selectOrDeselectTrack(dsd, trackInfo.mId, true /* select */); - } - }); - } - - /** - * Deselect a track of current data source. - * Same as {@link #deselectTrack(DataSourceDesc, TrackInfo)} with - * {@code dsd = getCurrentDataSource()}. - * - * @param trackInfo metadata corresponding to the track to be selected. A {@code trackInfo} - * object can be obtained from {@link #getTrackInfo()}. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - * - * This is an asynchronous call. - * - * @see MediaPlayer2#getTrackInfo() - */ - @NonNull - public Object deselectTrack(@NonNull TrackInfo trackInfo) { - return deselectTrack(getCurrentDataSource(), trackInfo); - } - - /** - * Deselect a track. - * <p> - * Currently, the track must be a timed text track and no audio or video tracks can be - * deselected. If the timed text track identified by index has not been - * selected before, it throws an exception. - * </p> - * @param dsd the descriptor of data source of which you want to deselect track - * @param trackInfo metadata corresponding to the track to be selected. A {@code trackInfo} - * object can be obtained from {@link #getTrackInfo()}. - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - * - * This is an asynchronous call. - * - * @see MediaPlayer2#getTrackInfo(DataSourceDesc) - */ - @NonNull - public Object deselectTrack(@NonNull DataSourceDesc dsd, @NonNull TrackInfo trackInfo) { - return addTask(new Task(CALL_COMPLETED_DESELECT_TRACK, false) { - @Override - void process() { - selectOrDeselectTrack(dsd, trackInfo.mId, false /* select */); - } - }); - } - - private void selectOrDeselectTrack(@NonNull DataSourceDesc dsd, int index, boolean select) { - if (dsd == null) { - throw new IllegalArgumentException("non-null dsd is expected"); - } - SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo == null) { - return; - } - - PlayerMessage request = PlayerMessage.newBuilder() - .addValues(Value.newBuilder().setInt32Value( - select ? INVOKE_ID_SELECT_TRACK : INVOKE_ID_DESELECT_TRACK)) - .addValues(Value.newBuilder().setInt64Value(sourceInfo.mId)) - .addValues(Value.newBuilder().setInt32Value(index)) - .build(); - invoke(request); - } - - /* Do not change these values without updating their counterparts - * in include/media/mediaplayer2.h! - */ - private static final int MEDIA_NOP = 0; // interface test message - private static final int MEDIA_PREPARED = 1; - private static final int MEDIA_PLAYBACK_COMPLETE = 2; - private static final int MEDIA_BUFFERING_UPDATE = 3; - private static final int MEDIA_SEEK_COMPLETE = 4; - private static final int MEDIA_SET_VIDEO_SIZE = 5; - private static final int MEDIA_STARTED = 6; - private static final int MEDIA_PAUSED = 7; - private static final int MEDIA_STOPPED = 8; - private static final int MEDIA_SKIPPED = 9; - private static final int MEDIA_DRM_PREPARED = 10; - private static final int MEDIA_NOTIFY_TIME = 98; - private static final int MEDIA_TIMED_TEXT = 99; - private static final int MEDIA_ERROR = 100; - private static final int MEDIA_INFO = 200; - private static final int MEDIA_SUBTITLE_DATA = 201; - private static final int MEDIA_META_DATA = 202; - private static final int MEDIA_DRM_INFO = 210; - - private class TaskHandler extends Handler { - private MediaPlayer2 mMediaPlayer; - - TaskHandler(MediaPlayer2 mp, Looper looper) { - super(looper); - mMediaPlayer = mp; - } - - @Override - public void handleMessage(Message msg) { - handleMessage(msg, 0); - } - - public void handleMessage(Message msg, long srcId) { - if (mMediaPlayer.mNativeContext == 0) { - Log.w(TAG, "mediaplayer2 went away with unhandled events"); - return; - } - final int what = msg.arg1; - final int extra = msg.arg2; - - final SourceInfo sourceInfo = getSourceInfo(srcId); - if (sourceInfo == null) { - return; - } - final DataSourceDesc dsd = sourceInfo.mDSD; - - switch(msg.what) { - case MEDIA_PREPARED: - case MEDIA_DRM_PREPARED: - { - sourceInfo.mPrepareBarrier--; - if (sourceInfo.mPrepareBarrier > 0) { - break; - } else if (sourceInfo.mPrepareBarrier < 0) { - Log.w(TAG, "duplicated (drm) prepared events"); - break; - } - - if (dsd != null) { - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onInfo( - mMediaPlayer, dsd, MEDIA_INFO_PREPARED, 0); - } - }); - } - - synchronized (mSrcLock) { - SourceInfo nextSourceInfo = mNextSourceInfos.peek(); - Log.i(TAG, "MEDIA_PREPARED: srcId=" + srcId - + ", curSrc=" + mCurrentSourceInfo - + ", nextSrc=" + nextSourceInfo); - - if (isCurrentSource(srcId)) { - prepareNextDataSource(); - } else if (isNextSource(srcId)) { - nextSourceInfo.mStateAsNextSource = NEXT_SOURCE_STATE_PREPARED; - if (nextSourceInfo.mPlayPendingAsNextSource) { - playNextDataSource(); - } - } - } - - synchronized (mTaskLock) { - if (mCurrentTask != null - && mCurrentTask.mMediaCallType == CALL_COMPLETED_PREPARE - && mCurrentTask.mDSD == dsd - && mCurrentTask.mNeedToWaitForEventToComplete) { - mCurrentTask.sendCompleteNotification(CALL_STATUS_NO_ERROR); - mCurrentTask = null; - processPendingTask_l(); - } - } - return; - } - - case MEDIA_DRM_INFO: - { - if (msg.obj == null) { - Log.w(TAG, "MEDIA_DRM_INFO msg.obj=NULL"); - } else if (msg.obj instanceof byte[]) { - // The PlayerMessage was parsed already in postEventFromNative - - final DrmInfo drmInfo; - synchronized (sourceInfo) { - if (sourceInfo.mDrmInfo != null) { - drmInfo = sourceInfo.mDrmInfo.makeCopy(); - } else { - drmInfo = null; - } - } - - // notifying the client outside the lock - DrmPreparationInfo drmPrepareInfo = null; - if (drmInfo != null) { - try { - drmPrepareInfo = sendDrmEventWait( - new DrmEventNotifier<DrmPreparationInfo>() { - @Override - public DrmPreparationInfo notifyWait( - DrmEventCallback callback) { - return callback.onDrmInfo(mMediaPlayer, dsd, - drmInfo); - } - }); - } catch (InterruptedException | ExecutionException - | TimeoutException e) { - Log.w(TAG, "Exception while waiting for DrmPreparationInfo", e); - } - } - if (sourceInfo.mDrmHandle.setPreparationInfo(drmPrepareInfo)) { - sourceInfo.mPrepareBarrier++; - final Task prepareDrmTask; - prepareDrmTask = newPrepareDrmTask(dsd, drmPrepareInfo.mUUID); - mTaskHandler.post(new Runnable() { - @Override - public void run() { - // Run as simple Runnable, not Task - try { - prepareDrmTask.process(); - } catch (NoDrmSchemeException | IOException e) { - final String errMsg; - errMsg = "Unexpected Exception during prepareDrm"; - throw new RuntimeException(errMsg, e); - } - } - }); - } else { - Log.w(TAG, "No valid DrmPreparationInfo set"); - } - } else { - Log.w(TAG, "MEDIA_DRM_INFO msg.obj of unexpected type " + msg.obj); - } - return; - } - - case MEDIA_PLAYBACK_COMPLETE: - { - if (isCurrentSource(srcId)) { - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onInfo( - mMediaPlayer, dsd, MEDIA_INFO_DATA_SOURCE_END, 0); - } - }); - stayAwake(false); - - synchronized (mSrcLock) { - SourceInfo nextSourceInfo = mNextSourceInfos.peek(); - if (nextSourceInfo != null) { - nextSourceInfo.mPlayPendingAsNextSource = true; - } - Log.i(TAG, "MEDIA_PLAYBACK_COMPLETE: srcId=" + srcId - + ", curSrc=" + mCurrentSourceInfo - + ", nextSrc=" + nextSourceInfo); - } - - playNextDataSource(); - } - - return; - } - - case MEDIA_STOPPED: - case MEDIA_STARTED: - case MEDIA_PAUSED: - case MEDIA_SKIPPED: - case MEDIA_NOTIFY_TIME: - { - // Do nothing. The client should have enough information with - // {@link EventCallback#onMediaTimeDiscontinuity}. - break; - } - - case MEDIA_BUFFERING_UPDATE: - { - final int percent = msg.arg1; - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onInfo( - mMediaPlayer, dsd, MEDIA_INFO_BUFFERING_UPDATE, percent); - } - }); - - SourceInfo src = getSourceInfo(srcId); - if (src != null) { - src.mBufferedPercentage.set(percent); - } - - return; - } - - case MEDIA_SEEK_COMPLETE: - { - synchronized (mTaskLock) { - if (!mPendingTasks.isEmpty() - && mPendingTasks.get(0).mMediaCallType != CALL_COMPLETED_SEEK_TO - && getState() == PLAYER_STATE_PLAYING) { - mIsPreviousCommandSeekTo = false; - } - - if (mCurrentTask != null - && mCurrentTask.mMediaCallType == CALL_COMPLETED_SEEK_TO - && mCurrentTask.mNeedToWaitForEventToComplete) { - mCurrentTask.sendCompleteNotification(CALL_STATUS_NO_ERROR); - mCurrentTask = null; - processPendingTask_l(); - } - } - return; - } - - case MEDIA_SET_VIDEO_SIZE: - { - final int width = msg.arg1; - final int height = msg.arg2; - - mVideoSize = new Size(width, height); - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onVideoSizeChanged( - mMediaPlayer, dsd, mVideoSize); - } - }); - return; - } - - case MEDIA_ERROR: - { - Log.e(TAG, "Error (" + msg.arg1 + "," + msg.arg2 + ")"); - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onError( - mMediaPlayer, dsd, what, extra); - } - }); - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onInfo( - mMediaPlayer, dsd, MEDIA_INFO_DATA_SOURCE_END, 0); - } - }); - stayAwake(false); - return; - } - - case MEDIA_INFO: - { - switch (msg.arg1) { - case MEDIA_INFO_VIDEO_TRACK_LAGGING: - Log.i(TAG, "Info (" + msg.arg1 + "," + msg.arg2 + ")"); - break; - } - - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onInfo( - mMediaPlayer, dsd, what, extra); - } - }); - - if (msg.arg1 == MEDIA_INFO_DATA_SOURCE_START) { - if (isCurrentSource(srcId)) { - prepareNextDataSource(); - } - } - - // No real default action so far. - return; - } - - case MEDIA_TIMED_TEXT: - { - final TimedText text; - if (msg.obj instanceof byte[]) { - PlayerMessage playerMsg; - try { - playerMsg = PlayerMessage.parseFrom((byte[]) msg.obj); - } catch (InvalidProtocolBufferException e) { - Log.w(TAG, "Failed to parse timed text.", e); - return; - } - text = TimedTextUtil.parsePlayerMessage(playerMsg); - } else { - text = null; - } - - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onTimedText( - mMediaPlayer, dsd, text); - } - }); - return; - } - - case MEDIA_SUBTITLE_DATA: - { - if (msg.obj instanceof byte[]) { - PlayerMessage playerMsg; - try { - playerMsg = PlayerMessage.parseFrom((byte[]) msg.obj); - } catch (InvalidProtocolBufferException e) { - Log.w(TAG, "Failed to parse subtitle data.", e); - return; - } - Iterator<Value> in = playerMsg.getValuesList().iterator(); - final int trackIndex = in.next().getInt32Value(); - TrackInfo trackInfo = getTrackInfo(dsd).get(trackIndex); - final long startTimeUs = in.next().getInt64Value(); - final long durationTimeUs = in.next().getInt64Value(); - final byte[] subData = in.next().getBytesValue().toByteArray(); - SubtitleData data = new SubtitleData(trackInfo, - startTimeUs, durationTimeUs, subData); - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onSubtitleData( - mMediaPlayer, dsd, data); - } - }); - } - return; - } - - case MEDIA_META_DATA: - { - final TimedMetaData data; - if (msg.obj instanceof byte[]) { - PlayerMessage playerMsg; - try { - playerMsg = PlayerMessage.parseFrom((byte[]) msg.obj); - } catch (InvalidProtocolBufferException e) { - Log.w(TAG, "Failed to parse timed meta data.", e); - return; - } - Iterator<Value> in = playerMsg.getValuesList().iterator(); - data = new TimedMetaData( - in.next().getInt64Value(), // timestampUs - in.next().getBytesValue().toByteArray()); // metaData - } else { - data = null; - } - - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onTimedMetaDataAvailable( - mMediaPlayer, dsd, data); - } - }); - return; - } - - case MEDIA_NOP: // interface test message - ignore - { - break; - } - - default: - { - Log.e(TAG, "Unknown message type " + msg.what); - return; - } - } - } - } - - /* - * Called from native code when an interesting event happens. This method - * just uses the TaskHandler system to post the event back to the main app thread. - * We use a weak reference to the original MediaPlayer2 object so that the native - * code is safe from the object disappearing from underneath it. (This is - * the cookie passed to native_setup().) - */ - private static void postEventFromNative(Object mediaplayer2Ref, long srcId, - int what, int arg1, int arg2, byte[] obj) { - final MediaPlayer2 mp = (MediaPlayer2) ((WeakReference) mediaplayer2Ref).get(); - if (mp == null) { - return; - } - - final SourceInfo sourceInfo = mp.getSourceInfo(srcId); - switch (what) { - case MEDIA_DRM_INFO: - // We need to derive mDrmInfo before prepare() returns so processing it here - // before the notification is sent to TaskHandler below. TaskHandler runs in the - // notification looper so its handleMessage might process the event after prepare() - // has returned. - Log.v(TAG, "postEventFromNative MEDIA_DRM_INFO"); - if (obj != null && sourceInfo != null) { - PlayerMessage playerMsg; - try { - playerMsg = PlayerMessage.parseFrom(obj); - } catch (InvalidProtocolBufferException e) { - Log.w(TAG, "MEDIA_DRM_INFO failed to parse msg.obj " + obj); - break; - } - DrmInfo drmInfo = DrmInfo.create(playerMsg); - synchronized (sourceInfo) { - sourceInfo.mDrmInfo = drmInfo; - } - } else { - Log.w(TAG, "MEDIA_DRM_INFO sourceInfo " + sourceInfo - + " msg.obj of unexpected type " + obj); - } - break; - - case MEDIA_PREPARED: - // By this time, we've learned about DrmInfo's presence or absence. This is meant - // mainly for prepare() use case. For prepare(), this still can run to a race - // condition b/c MediaPlayerNative releases the prepare() lock before calling notify - // so we also set mDrmInfoResolved in prepare(). - if (sourceInfo != null) { - synchronized (sourceInfo) { - sourceInfo.mDrmInfoResolved = true; - } - } - break; - } - - if (mp.mTaskHandler != null) { - Message m = mp.mTaskHandler.obtainMessage(what, arg1, arg2, obj); - - mp.mTaskHandler.post(new Runnable() { - @Override - public void run() { - mp.mTaskHandler.handleMessage(m, srcId); - } - }); - } - } - - /** - * Class encapsulating subtitle data, as received through the - * {@link EventCallback#onSubtitleData} interface. - * <p> - * A {@link SubtitleData} object includes: - * <ul> - * <li> track metadadta in a {@link TrackInfo} object</li> - * <li> the start time (in microseconds) of the data</li> - * <li> the duration (in microseconds) of the data</li> - * <li> the actual data.</li> - * </ul> - * The data is stored in a byte-array, and is encoded in one of the supported in-band - * subtitle formats. The subtitle encoding is determined by the MIME type of the - * {@link TrackInfo} of the subtitle track, one of - * {@link MediaFormat#MIMETYPE_TEXT_CEA_608}, {@link MediaFormat#MIMETYPE_TEXT_CEA_708}, - * {@link MediaFormat#MIMETYPE_TEXT_VTT}. - */ - public static final class SubtitleData { - - private TrackInfo mTrackInfo; - private long mStartTimeUs; - private long mDurationUs; - private byte[] mData; - - private SubtitleData(TrackInfo trackInfo, long startTimeUs, long durationUs, byte[] data) { - mTrackInfo = trackInfo; - mStartTimeUs = startTimeUs; - mDurationUs = durationUs; - mData = (data != null ? data : new byte[0]); - } - - /** - * @return metadata of track which contains this subtitle data - */ - @NonNull - public TrackInfo getTrackInfo() { - return mTrackInfo; - } - - /** - * @return media time at which the subtitle should start to be displayed in microseconds - */ - public long getStartTimeUs() { - return mStartTimeUs; - } - - /** - * @return the duration in microsecond during which the subtitle should be displayed - */ - public long getDurationUs() { - return mDurationUs; - } - - /** - * Returns the encoded data for the subtitle content. - * Encoding format depends on the subtitle type, refer to - * <a href="https://en.wikipedia.org/wiki/CEA-708">CEA 708</a>, - * <a href="https://en.wikipedia.org/wiki/EIA-608">CEA/EIA 608</a> and - * <a href="https://www.w3.org/TR/webvtt1/">WebVTT</a>, defined by the MIME type - * of the subtitle track. - * @return the encoded subtitle data - */ - @NonNull - public byte[] getData() { - return mData; - } - } - - /** - * Interface definition for callbacks to be invoked when the player has the corresponding - * events. - */ - public static class EventCallback { - /** - * Called to indicate the video size - * - * The video size (width and height) could be 0 if there was no video, - * or the value was not determined yet. - * - * @param mp the MediaPlayer2 associated with this callback - * @param dsd the DataSourceDesc of this data source - * @param size the size of the video - */ - public void onVideoSizeChanged( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, @NonNull Size size) { } - - /** - * Called to indicate an avaliable timed text - * - * @param mp the MediaPlayer2 associated with this callback - * @param dsd the DataSourceDesc of this data source - * @param text the timed text sample which contains the text - * needed to be displayed and the display format. - * @hide - */ - public void onTimedText( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, @NonNull TimedText text) { } - - /** - * Called to indicate avaliable timed metadata - * <p> - * This method will be called as timed metadata is extracted from the media, - * in the same order as it occurs in the media. The timing of this event is - * not controlled by the associated timestamp. - * <p> - * Currently only HTTP live streaming data URI's embedded with timed ID3 tags generates - * {@link TimedMetaData}. - * - * @see MediaPlayer2#selectTrack - * @see MediaPlayer2.OnTimedMetaDataAvailableListener - * @see TimedMetaData - * - * @param mp the MediaPlayer2 associated with this callback - * @param dsd the DataSourceDesc of this data source - * @param data the timed metadata sample associated with this event - */ - public void onTimedMetaDataAvailable( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, - @NonNull TimedMetaData data) { } - - /** - * Called to indicate an error. - * - * @param mp the MediaPlayer2 the error pertains to - * @param dsd the DataSourceDesc of this data source - * @param what the type of error that has occurred. - * @param extra an extra code, specific to the error. Typically - * implementation dependent. - */ - public void onError( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, - @MediaError int what, int extra) { } - - /** - * Called to indicate an info or a warning. - * - * @param mp the MediaPlayer2 the info pertains to. - * @param dsd the DataSourceDesc of this data source - * @param what the type of info or warning. - * @param extra an extra code, specific to the info. Typically - * implementation dependent. - */ - public void onInfo( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, - @MediaInfo int what, int extra) { } - - /** - * Called to acknowledge an API call. - * - * @param mp the MediaPlayer2 the call was made on. - * @param dsd the DataSourceDesc of this data source - * @param what the enum for the API call. - * @param status the returned status code for the call. - */ - public void onCallCompleted( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, @CallCompleted int what, - @CallStatus int status) { } - - /** - * Called to indicate media clock has changed. - * - * @param mp the MediaPlayer2 the media time pertains to. - * @param dsd the DataSourceDesc of this data source - * @param timestamp the new media clock. - */ - public void onMediaTimeDiscontinuity( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, - @NonNull MediaTimestamp timestamp) { } - - /** - * Called to indicate {@link #notifyWhenCommandLabelReached(Object)} has been processed. - * - * @param mp the MediaPlayer2 {@link #notifyWhenCommandLabelReached(Object)} was called on. - * @param label the application specific Object given by - * {@link #notifyWhenCommandLabelReached(Object)}. - */ - public void onCommandLabelReached(@NonNull MediaPlayer2 mp, @NonNull Object label) { } - - /** - * Called when when a player subtitle track has new subtitle data available. - * @param mp the player that reports the new subtitle data - * @param dsd the DataSourceDesc of this data source - * @param data the subtitle data - */ - public void onSubtitleData( - @NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, - @NonNull SubtitleData data) { } - } - - private final Object mEventCbLock = new Object(); - private ArrayList<Pair<Executor, EventCallback>> mEventCallbackRecords = - new ArrayList<Pair<Executor, EventCallback>>(); - - /** - * Registers the callback to be invoked for various events covered by {@link EventCallback}. - * - * @param executor the executor through which the callback should be invoked - * @param eventCallback the callback that will be run - */ - // This is a synchronous call. - public void registerEventCallback(@NonNull @CallbackExecutor Executor executor, - @NonNull EventCallback eventCallback) { - if (eventCallback == null) { - throw new IllegalArgumentException("Illegal null EventCallback"); - } - if (executor == null) { - throw new IllegalArgumentException( - "Illegal null Executor for the EventCallback"); - } - synchronized (mEventCbLock) { - for (Pair<Executor, EventCallback> cb : mEventCallbackRecords) { - if (cb.first == executor && cb.second == eventCallback) { - Log.w(TAG, "The callback has been registered before."); - return; - } - } - mEventCallbackRecords.add(new Pair(executor, eventCallback)); - } - } - - /** - * Unregisters the {@link EventCallback}. - * - * @param eventCallback the callback to be unregistered - */ - // This is a synchronous call. - public void unregisterEventCallback(@NonNull EventCallback eventCallback) { - synchronized (mEventCbLock) { - for (Pair<Executor, EventCallback> cb : mEventCallbackRecords) { - if (cb.second == eventCallback) { - mEventCallbackRecords.remove(cb); - } - } - } - } - - private void sendEvent(final EventNotifier notifier) { - synchronized (mEventCbLock) { - try { - for (Pair<Executor, EventCallback> cb : mEventCallbackRecords) { - cb.first.execute(() -> notifier.notify(cb.second)); - } - } catch (RejectedExecutionException e) { - // The executor has been shut down. - Log.w(TAG, "The executor has been shut down. Ignoring event."); - } - } - } - - private void sendDrmEvent(final DrmEventNotifier notifier) { - synchronized (mDrmEventCallbackLock) { - try { - Pair<Executor, DrmEventCallback> cb = mDrmEventCallback; - if (cb != null) { - cb.first.execute(() -> notifier.notify(cb.second)); - } - } catch (RejectedExecutionException e) { - // The executor has been shut down. - Log.w(TAG, "The executor has been shut down. Ignoring drm event."); - } - } - } - - private <T> T sendDrmEventWait(final DrmEventNotifier<T> notifier) - throws InterruptedException, ExecutionException, TimeoutException { - return sendDrmEventWait(notifier, 0); - } - - private <T> T sendDrmEventWait(final DrmEventNotifier<T> notifier, final long timeoutMs) - throws InterruptedException, ExecutionException, TimeoutException { - synchronized (mDrmEventCallbackLock) { - Pair<Executor, DrmEventCallback> cb = mDrmEventCallback; - if (cb != null) { - CompletableFuture<T> ret = new CompletableFuture<>(); - cb.first.execute(() -> ret.complete(notifier.notifyWait(cb.second))); - return timeoutMs <= 0 ? ret.get() : ret.get(timeoutMs, TimeUnit.MILLISECONDS); - } - } - return null; - } - - private interface EventNotifier { - void notify(EventCallback callback); - } - - private interface DrmEventNotifier<T> { - default void notify(DrmEventCallback callback) { } - default T notifyWait(DrmEventCallback callback) { - return null; - } - } - - /* Do not change these values without updating their counterparts - * in include/media/MediaPlayer2Types.h! - */ - /** Unspecified media player error. - * @see EventCallback#onError - */ - public static final int MEDIA_ERROR_UNKNOWN = 1; - - /** - * The video is streamed and its container is not valid for progressive - * playback i.e the video's index (e.g moov atom) is not at the start of the - * file. - * @see EventCallback#onError - */ - public static final int MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK = 200; - - /** File or network related operation errors. */ - public static final int MEDIA_ERROR_IO = -1004; - /** Bitstream is not conforming to the related coding standard or file spec. */ - public static final int MEDIA_ERROR_MALFORMED = -1007; - /** Bitstream is conforming to the related coding standard or file spec, but - * the media framework does not support the feature. */ - public static final int MEDIA_ERROR_UNSUPPORTED = -1010; - /** Some operation takes too long to complete, usually more than 3-5 seconds. */ - public static final int MEDIA_ERROR_TIMED_OUT = -110; - - /** Unspecified low-level system error. This value originated from UNKNOWN_ERROR in - * system/core/include/utils/Errors.h - * @see EventCallback#onError - * @hide - */ - public static final int MEDIA_ERROR_SYSTEM = -2147483648; - - /** - * @hide - */ - @IntDef(flag = false, prefix = "MEDIA_ERROR", value = { - MEDIA_ERROR_UNKNOWN, - MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK, - MEDIA_ERROR_IO, - MEDIA_ERROR_MALFORMED, - MEDIA_ERROR_UNSUPPORTED, - MEDIA_ERROR_TIMED_OUT, - MEDIA_ERROR_SYSTEM - }) - @Retention(RetentionPolicy.SOURCE) - public @interface MediaError {} - - /* Do not change these values without updating their counterparts - * in include/media/MediaPlayer2Types.h! - */ - /** Unspecified media player info. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_UNKNOWN = 1; - - /** The player just started the playback of this datas source. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_DATA_SOURCE_START = 2; - - /** The player just pushed the very first video frame for rendering. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; - - /** The player just rendered the very first audio sample. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_AUDIO_RENDERING_START = 4; - - /** The player just completed the playback of this data source. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_DATA_SOURCE_END = 5; - - /** The player just completed the playback of all data sources set by {@link #setDataSource}, - * {@link #setNextDataSource} and {@link #setNextDataSources}. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_DATA_SOURCE_LIST_END = 6; - - /** The player just completed an iteration of playback loop. This event is sent only when - * looping is enabled by {@link #loopCurrent}. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_DATA_SOURCE_REPEAT = 7; - - /** The player just prepared a data source. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_PREPARED = 100; - - /** The video is too complex for the decoder: it can't decode frames fast - * enough. Possibly only the audio plays fine at this stage. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; - - /** MediaPlayer2 is temporarily pausing playback internally in order to - * buffer more data. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_BUFFERING_START = 701; - - /** MediaPlayer2 is resuming playback after filling buffers. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_BUFFERING_END = 702; - - /** Estimated network bandwidth information (kbps) is available; currently this event fires - * simultaneously as {@link #MEDIA_INFO_BUFFERING_START} and {@link #MEDIA_INFO_BUFFERING_END} - * when playing network files. - * @see EventCallback#onInfo - * @hide - */ - public static final int MEDIA_INFO_NETWORK_BANDWIDTH = 703; - - /** - * Update status in buffering a media source received through progressive downloading. - * The received buffering percentage indicates how much of the content has been buffered - * or played. For example a buffering update of 80 percent when half the content - * has already been played indicates that the next 30 percent of the - * content to play has been buffered. - * - * The {@code extra} parameter in {@code EventCallback.onInfo} is the - * percentage (0-100) of the content that has been buffered or played thus far. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_BUFFERING_UPDATE = 704; - - /** Bad interleaving means that a media has been improperly interleaved or - * not interleaved at all, e.g has all the video samples first then all the - * audio ones. Video is playing but a lot of disk seeks may be happening. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; - - /** The media cannot be seeked (e.g live stream) - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_NOT_SEEKABLE = 801; - - /** A new set of metadata is available. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_METADATA_UPDATE = 802; - - /** Informs that audio is not playing. Note that playback of the video - * is not interrupted. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_AUDIO_NOT_PLAYING = 804; - - /** Informs that video is not playing. Note that playback of the audio - * is not interrupted. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_VIDEO_NOT_PLAYING = 805; - - /** Failed to handle timed text track properly. - * @see EventCallback#onInfo - * - * {@hide} - */ - public static final int MEDIA_INFO_TIMED_TEXT_ERROR = 900; - - /** Subtitle track was not supported by the media framework. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_UNSUPPORTED_SUBTITLE = 901; - - /** Reading the subtitle track takes too long. - * @see EventCallback#onInfo - */ - public static final int MEDIA_INFO_SUBTITLE_TIMED_OUT = 902; - - /** - * @hide - */ - @IntDef(flag = false, prefix = "MEDIA_INFO", value = { - MEDIA_INFO_UNKNOWN, - MEDIA_INFO_DATA_SOURCE_START, - MEDIA_INFO_VIDEO_RENDERING_START, - MEDIA_INFO_AUDIO_RENDERING_START, - MEDIA_INFO_DATA_SOURCE_END, - MEDIA_INFO_DATA_SOURCE_LIST_END, - MEDIA_INFO_PREPARED, - MEDIA_INFO_VIDEO_TRACK_LAGGING, - MEDIA_INFO_BUFFERING_START, - MEDIA_INFO_BUFFERING_END, - MEDIA_INFO_NETWORK_BANDWIDTH, - MEDIA_INFO_BUFFERING_UPDATE, - MEDIA_INFO_BAD_INTERLEAVING, - MEDIA_INFO_NOT_SEEKABLE, - MEDIA_INFO_METADATA_UPDATE, - MEDIA_INFO_AUDIO_NOT_PLAYING, - MEDIA_INFO_VIDEO_NOT_PLAYING, - MEDIA_INFO_TIMED_TEXT_ERROR, - MEDIA_INFO_UNSUPPORTED_SUBTITLE, - MEDIA_INFO_SUBTITLE_TIMED_OUT - }) - @Retention(RetentionPolicy.SOURCE) - public @interface MediaInfo {} - - //-------------------------------------------------------------------------- - /** The player just completed a call {@link #attachAuxEffect}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_ATTACH_AUX_EFFECT = 1; - - /** The player just completed a call {@link #deselectTrack}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_DESELECT_TRACK = 2; - - /** The player just completed a call {@link #loopCurrent}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_LOOP_CURRENT = 3; - - /** The player just completed a call {@link #pause}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_PAUSE = 4; - - /** The player just completed a call {@link #play}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_PLAY = 5; - - /** The player just completed a call {@link #prepare}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_PREPARE = 6; - - /** The player just completed a call {@link #seekTo}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SEEK_TO = 14; - - /** The player just completed a call {@link #selectTrack}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SELECT_TRACK = 15; - - /** The player just completed a call {@link #setAudioAttributes}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_AUDIO_ATTRIBUTES = 16; - - /** The player just completed a call {@link #setAudioSessionId}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_AUDIO_SESSION_ID = 17; - - /** The player just completed a call {@link #setAuxEffectSendLevel}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_AUX_EFFECT_SEND_LEVEL = 18; - - /** The player just completed a call {@link #setDataSource}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_DATA_SOURCE = 19; - - /** The player just completed a call {@link #setNextDataSource}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_NEXT_DATA_SOURCE = 22; - - /** The player just completed a call {@link #setNextDataSources}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_NEXT_DATA_SOURCES = 23; - - /** The player just completed a call {@link #setPlaybackParams}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_PLAYBACK_PARAMS = 24; - - /** The player just completed a call {@link #setPlayerVolume}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_PLAYER_VOLUME = 26; - - /** The player just completed a call {@link #setSurface}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_SURFACE = 27; - - /** The player just completed a call {@link #setSyncParams}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_SYNC_PARAMS = 28; - - /** The player just completed a call {@link #skipToNext}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SKIP_TO_NEXT = 29; - - /** The player just completed a call {@link #clearNextDataSources}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_CLEAR_NEXT_DATA_SOURCES = 30; - - /** The player just completed a call {@link #setBufferingParams}. - * @see EventCallback#onCallCompleted - * @hide - */ - public static final int CALL_COMPLETED_SET_BUFFERING_PARAMS = 31; - - /** The player just completed a call {@link #setDisplay}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_DISPLAY = 33; - - /** The player just completed a call {@link #setWakeLock}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_WAKE_LOCK = 34; - - /** The player just completed a call {@link #setScreenOnWhilePlaying}. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_COMPLETED_SET_SCREEN_ON_WHILE_PLAYING = 35; - - /** - * The start of the methods which have separate call complete callback. - * @hide - */ - public static final int SEPARATE_CALL_COMPLETED_CALLBACK_START = 1000; - - /** The player just completed a call {@link #notifyWhenCommandLabelReached}. - * @see EventCallback#onCommandLabelReached - * @hide - */ - public static final int CALL_COMPLETED_NOTIFY_WHEN_COMMAND_LABEL_REACHED = - SEPARATE_CALL_COMPLETED_CALLBACK_START; - - /** The player just completed a call {@link #prepareDrm}. - * @see DrmEventCallback#onDrmPrepared - * @hide - */ - public static final int CALL_COMPLETED_PREPARE_DRM = - SEPARATE_CALL_COMPLETED_CALLBACK_START + 1; - - /** - * @hide - */ - @IntDef(flag = false, prefix = "CALL_COMPLETED", value = { - CALL_COMPLETED_ATTACH_AUX_EFFECT, - CALL_COMPLETED_DESELECT_TRACK, - CALL_COMPLETED_LOOP_CURRENT, - CALL_COMPLETED_PAUSE, - CALL_COMPLETED_PLAY, - CALL_COMPLETED_PREPARE, - CALL_COMPLETED_SEEK_TO, - CALL_COMPLETED_SELECT_TRACK, - CALL_COMPLETED_SET_AUDIO_ATTRIBUTES, - CALL_COMPLETED_SET_AUDIO_SESSION_ID, - CALL_COMPLETED_SET_AUX_EFFECT_SEND_LEVEL, - CALL_COMPLETED_SET_DATA_SOURCE, - CALL_COMPLETED_SET_NEXT_DATA_SOURCE, - CALL_COMPLETED_SET_NEXT_DATA_SOURCES, - CALL_COMPLETED_SET_PLAYBACK_PARAMS, - CALL_COMPLETED_SET_PLAYER_VOLUME, - CALL_COMPLETED_SET_SURFACE, - CALL_COMPLETED_SET_SYNC_PARAMS, - CALL_COMPLETED_SKIP_TO_NEXT, - CALL_COMPLETED_CLEAR_NEXT_DATA_SOURCES, - CALL_COMPLETED_SET_BUFFERING_PARAMS, - CALL_COMPLETED_SET_DISPLAY, - CALL_COMPLETED_SET_WAKE_LOCK, - CALL_COMPLETED_SET_SCREEN_ON_WHILE_PLAYING, - CALL_COMPLETED_NOTIFY_WHEN_COMMAND_LABEL_REACHED, - CALL_COMPLETED_PREPARE_DRM, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface CallCompleted {} - - /** Status code represents that call is completed without an error. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_STATUS_NO_ERROR = 0; - - /** Status code represents that call is ended with an unknown error. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_STATUS_ERROR_UNKNOWN = Integer.MIN_VALUE; - - /** Status code represents that the player is not in valid state for the operation. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_STATUS_INVALID_OPERATION = 1; - - /** Status code represents that the argument is illegal. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_STATUS_BAD_VALUE = 2; - - /** Status code represents that the operation is not allowed. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_STATUS_PERMISSION_DENIED = 3; - - /** Status code represents a file or network related operation error. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_STATUS_ERROR_IO = 4; - - /** Status code represents that the call has been skipped. For example, a {@link #seekTo} - * request may be skipped if it is followed by another {@link #seekTo} request. - * @see EventCallback#onCallCompleted - */ - public static final int CALL_STATUS_SKIPPED = 5; - - /** Status code represents that DRM operation is called before preparing a DRM scheme through - * {@code prepareDrm}. - * @see EventCallback#onCallCompleted - */ - // TODO: change @code to @link when DRM is unhidden - public static final int CALL_STATUS_NO_DRM_SCHEME = 6; - - /** - * @hide - */ - @IntDef(flag = false, prefix = "CALL_STATUS", value = { - CALL_STATUS_NO_ERROR, - CALL_STATUS_ERROR_UNKNOWN, - CALL_STATUS_INVALID_OPERATION, - CALL_STATUS_BAD_VALUE, - CALL_STATUS_PERMISSION_DENIED, - CALL_STATUS_ERROR_IO, - CALL_STATUS_SKIPPED, - CALL_STATUS_NO_DRM_SCHEME}) - @Retention(RetentionPolicy.SOURCE) - public @interface CallStatus {} - - // Modular DRM begin - - /** - * An immutable structure per {@link DataSourceDesc} with settings required to initiate a DRM - * protected playback session. - * - * @see DrmPreparationInfo.Builder - */ - public static final class DrmPreparationInfo { - - /** - * Mutable builder to create a {@link MediaPlayer2.DrmPreparationInfo} object. - * - * {@link Builder#Builder(UUID) UUID} must not be null; {@link #setKeyType keyType} - * must be one of {@link MediaDrm#KEY_TYPE_STREAMING} or {@link MediaDrm#KEY_TYPE_OFFLINE}. - * <p> - * When {@link #setKeyType keyType} is {@link MediaDrm#KEY_TYPE_STREAMING}, - * {@link #setInitData(byte[]) initData} and {@link #setMimeType(String) mimeType} - * must not be null; When {@link #setKeyType keyType} is {@link MediaDrm#KEY_TYPE_OFFLINE}, - * {@link #setKeySetId(byte[]) keySetId} must not be null. - */ - public static final class Builder { - - private final UUID mUUID; - private byte[] mKeySetId; - private byte[] mInitData; - private String mMimeType; - private int mKeyType; - private Map<String, String> mOptionalParameters; - - /** - * @param uuid UUID of the crypto scheme selected to decrypt content. An UUID can be - * retrieved from the source listening to {@link DrmEventCallback#onDrmInfo}. - */ - public Builder(@NonNull UUID uuid) { - this.mUUID = uuid; - } - - /** - * Set identifier of a persisted offline key obtained from - * {@link MediaPlayer2.DrmEventCallback#onDrmPrepared}. - * - * A {@code keySetId} can be used to restore persisted offline keys into a new playback - * session of a DRM protected data source. When {@code keySetId} is set, - * {@code initData}, {@code mimeType}, {@code keyType}, {@code optionalParameters} are - * ignored. - * - * @param keySetId identifier of a persisted offline key - * @return this - */ - public @NonNull Builder setKeySetId(@Nullable byte[] keySetId) { - this.mKeySetId = keySetId; - return this; - } - - /** - * Set container-specific DRM initialization data. Its meaning is interpreted based on - * {@code mimeType}. For example, it could contain the content ID, key ID or other data - * obtained from the content metadata that is required to generate a - * {@link MediaDrm.KeyRequest}. - * - * @param initData container-specific DRM initialization data - * @return this - */ - public @NonNull Builder setInitData(@Nullable byte[] initData) { - this.mInitData = initData; - return this; - } - - /** - * Set mime type of the content - * - * @param mimeType mime type to the content - * @return this - */ - public @NonNull Builder setMimeType(@Nullable String mimeType) { - this.mMimeType = mimeType; - return this; - } - - /** - * Set type of the key request. The request may be to acquire keys - * for streaming, {@link MediaDrm#KEY_TYPE_STREAMING}, or for offline content, - * {@link MediaDrm#KEY_TYPE_OFFLINE}. Releasing previously acquired keys - * ({@link MediaDrm#KEY_TYPE_RELEASE}) is not allowed. - * - * @param keyType type of the key request - * @return this - */ - public @NonNull Builder setKeyType(@MediaPlayer2.MediaDrmKeyType int keyType) { - this.mKeyType = keyType; - return this; - } - - /** - * Set optional parameters to be included in a {@link MediaDrm.KeyRequest} message sent - * to the license server. - * - * @param optionalParameters optional parameters to be included in a key request - * @return this - */ - public @NonNull Builder setOptionalParameters( - @Nullable Map<String, String> optionalParameters) { - this.mOptionalParameters = optionalParameters; - return this; - } - - /** - * @return an immutable {@link DrmPreparationInfo} based on settings of this builder - */ - @NonNull - public DrmPreparationInfo build() { - final DrmPreparationInfo info = new DrmPreparationInfo(mUUID, mKeySetId, mInitData, - mMimeType, mKeyType, mOptionalParameters); - if (!info.isValid()) { - throw new IllegalArgumentException("invalid DrmPreparationInfo"); - } - return info; - } - - } - - private final UUID mUUID; - private final byte[] mKeySetId; - private final byte[] mInitData; - private final String mMimeType; - private final int mKeyType; - private final Map<String, String> mOptionalParameters; - - private DrmPreparationInfo(UUID mUUID, byte[] mKeySetId, byte[] mInitData, String mMimeType, - int mKeyType, Map<String, String> optionalParameters) { - this.mUUID = mUUID; - this.mKeySetId = mKeySetId; - this.mInitData = mInitData; - this.mMimeType = mMimeType; - this.mKeyType = mKeyType; - this.mOptionalParameters = optionalParameters; - } - - boolean isValid() { - if (mUUID == null) { - return false; - } - if (mKeySetId != null) { - // offline restore case - return true; - } - if (mInitData != null && mMimeType != null) { - // new streaming license case - return true; - } - return false; - } - - /** - * @return UUID of the crypto scheme selected to decrypt content. - */ - @NonNull - public UUID getUuid() { - return mUUID; - } - - /** - * @return identifier of the persisted offline key. - */ - @Nullable - public byte[] getKeySetId() { - return mKeySetId; - } - - /** - * @return container-specific DRM initialization data. - */ - @Nullable - public byte[] getInitData() { - return mInitData; - } - - /** - * @return mime type of the content - */ - @Nullable - public String getMimeType() { - return mMimeType; - } - - /** - * @return type of the key request. - */ - @MediaPlayer2.MediaDrmKeyType - public int getKeyType() { - return mKeyType; - } - - /** - * @return optional parameters to be included in the {@link MediaDrm.KeyRequest}. - */ - @Nullable - public Map<String, String> getOptionalParameters() { - return mOptionalParameters; - } - } - - /** - * Interface definition for callbacks to be invoked when the player has the corresponding - * DRM events. - */ - public static abstract class DrmEventCallback { - - /** - * Called to indicate DRM info is available. Return a {@link DrmPreparationInfo} object that - * bundles DRM initialization parameters. - * - * @param mp the {@code MediaPlayer2} associated with this callback - * @param dsd the {@link DataSourceDesc} of this data source - * @param drmInfo DRM info of the source including PSSH, and subset of crypto schemes - * supported by this device - * @return a {@link DrmPreparationInfo} object to initialize DRM playback, or null to skip - * DRM initialization - */ - @Nullable - public abstract DrmPreparationInfo onDrmInfo(@NonNull MediaPlayer2 mp, - @NonNull DataSourceDesc dsd, @NonNull DrmInfo drmInfo); - - /** - * Called to give the app the opportunity to configure DRM before the session is created. - * - * This facilitates configuration of the properties, like 'securityLevel', which - * has to be set after DRM scheme creation but before the DRM session is opened. - * - * The only allowed DRM calls in this listener are - * {@link MediaDrm#getPropertyString(String)}, - * {@link MediaDrm#getPropertyByteArray(String)}, - * {@link MediaDrm#setPropertyString(String, String)}, - * {@link MediaDrm#setPropertyByteArray(String, byte[])}, - * {@link MediaDrm#setOnExpirationUpdateListener}, - * and {@link MediaDrm#setOnKeyStatusChangeListener}. - * - * @param mp the {@code MediaPlayer2} associated with this callback - * @param dsd the {@link DataSourceDesc} of this data source - * @param drm handle to get/set DRM properties and listeners for this data source - */ - public void onDrmConfig(@NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, - @NonNull MediaDrm drm) { } - - /** - * Called to indicate the DRM session for {@code dsd} is ready for key request/response - * - * @param mp the {@code MediaPlayer2} associated with this callback - * @param dsd the {@link DataSourceDesc} of this data source - * @param request a {@link MediaDrm.KeyRequest} prepared using the - * {@link DrmPreparationInfo} returned from - * {@link #onDrmInfo(MediaPlayer2, DataSourceDesc, DrmInfo)} - * @return the response to {@code request} (from license server); returning {@code null} or - * throwing an {@link RuntimeException} from this callback would trigger an - * {@link EventCallback#onError}. - */ - @NonNull - public abstract byte[] onDrmKeyRequest(@NonNull MediaPlayer2 mp, - @NonNull DataSourceDesc dsd, @NonNull MediaDrm.KeyRequest request); - - /** - * Called to notify the client that {@code mp} is ready to decrypt DRM protected data source - * {@code dsd} or if there is an error during DRM preparation - * - * @param mp the {@code MediaPlayer2} associated with this callback - * @param dsd the {@link DataSourceDesc} of this data source - * @param status the result of DRM preparation. - * @param keySetId optional identifier that can be used to restore DRM playback initiated - * with a {@link MediaDrm#KEY_TYPE_OFFLINE} key request. - * - * @see DrmPreparationInfo.Builder#setKeySetId(byte[]) - */ - public void onDrmPrepared(@NonNull MediaPlayer2 mp, @NonNull DataSourceDesc dsd, - @PrepareDrmStatusCode int status, @Nullable byte[] keySetId) { } - - } - - private final Object mDrmEventCallbackLock = new Object(); - private Pair<Executor, DrmEventCallback> mDrmEventCallback; - - /** - * Registers the callback to be invoked for various DRM events. - * - * This is a synchronous call. - * - * @param eventCallback the callback that will be run - * @param executor the executor through which the callback should be invoked - */ - public void setDrmEventCallback(@NonNull @CallbackExecutor Executor executor, - @NonNull DrmEventCallback eventCallback) { - if (eventCallback == null) { - throw new IllegalArgumentException("Illegal null EventCallback"); - } - if (executor == null) { - throw new IllegalArgumentException( - "Illegal null Executor for the EventCallback"); - } - synchronized (mDrmEventCallbackLock) { - mDrmEventCallback = new Pair<Executor, DrmEventCallback>(executor, eventCallback); - } - } - - /** - * Clear the {@link DrmEventCallback}. - * - * This is a synchronous call. - */ - public void clearDrmEventCallback() { - synchronized (mDrmEventCallbackLock) { - mDrmEventCallback = null; - } - } - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * DRM preparation has succeeded. - */ - public static final int PREPARE_DRM_STATUS_SUCCESS = 0; - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * The device required DRM provisioning but couldn't reach the provisioning server. - */ - public static final int PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR = 1; - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * The device required DRM provisioning but the provisioning server denied the request. - */ - public static final int PREPARE_DRM_STATUS_PROVISIONING_SERVER_ERROR = 2; - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * The DRM preparation has failed . - */ - public static final int PREPARE_DRM_STATUS_PREPARATION_ERROR = 3; - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * The crypto scheme UUID is not supported by the device. - */ - public static final int PREPARE_DRM_STATUS_UNSUPPORTED_SCHEME = 4; - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * The hardware resources are not available, due to being in use. - */ - public static final int PREPARE_DRM_STATUS_RESOURCE_BUSY = 5; - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * Restoring persisted offline keys failed. - */ - public static final int PREPARE_DRM_STATUS_RESTORE_ERROR = 6; - - /** - * A status code for {@link DrmEventCallback#onDrmPrepared} listener. - * <p> - * - * Error during key request/response exchange with license server. - */ - public static final int PREPARE_DRM_STATUS_KEY_EXCHANGE_ERROR = 7; - - /** @hide */ - @IntDef(flag = false, prefix = "PREPARE_DRM_STATUS", value = { - PREPARE_DRM_STATUS_SUCCESS, - PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR, - PREPARE_DRM_STATUS_PROVISIONING_SERVER_ERROR, - PREPARE_DRM_STATUS_PREPARATION_ERROR, - PREPARE_DRM_STATUS_UNSUPPORTED_SCHEME, - PREPARE_DRM_STATUS_RESOURCE_BUSY, - PREPARE_DRM_STATUS_RESTORE_ERROR, - PREPARE_DRM_STATUS_KEY_EXCHANGE_ERROR, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface PrepareDrmStatusCode {} - - /** @hide */ - @IntDef({ - MediaDrm.KEY_TYPE_STREAMING, - MediaDrm.KEY_TYPE_OFFLINE, - MediaDrm.KEY_TYPE_RELEASE, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface MediaDrmKeyType {} - - /** @hide */ - @StringDef({ - MediaDrm.PROPERTY_VENDOR, - MediaDrm.PROPERTY_VERSION, - MediaDrm.PROPERTY_DESCRIPTION, - MediaDrm.PROPERTY_ALGORITHMS, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface MediaDrmStringProperty {} - - /** - * Retrieves the DRM Info associated with the given source - * - * @param dsd The DRM protected data source - * - * @throws IllegalStateException if called before being prepared - * @hide - */ - @TestApi - public DrmInfo getDrmInfo(@NonNull DataSourceDesc dsd) { - final SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo != null) { - DrmInfo drmInfo = null; - - // there is not much point if the app calls getDrmInfo within an OnDrmInfoListener; - // regardless below returns drmInfo anyway instead of raising an exception - synchronized (sourceInfo) { - if (!sourceInfo.mDrmInfoResolved && sourceInfo.mDrmInfo == null) { - final String msg = "The Player has not been prepared yet"; - Log.v(TAG, msg); - throw new IllegalStateException(msg); - } - - if (sourceInfo.mDrmInfo != null) { - drmInfo = sourceInfo.mDrmInfo.makeCopy(); - } - } // synchronized - - return drmInfo; - } - return null; - } - - /** - * Prepares the DRM for the given data source - * <p> - * If {@link DrmEventCallback} is registered, it will be called during - * preparation to allow configuration of the DRM properties before opening the - * DRM session. It should be used only for a series of - * {@link #getDrmPropertyString(DataSourceDesc, String)} and - * {@link #setDrmPropertyString(DataSourceDesc, String, String)} calls - * and refrain from any lengthy operation. - * <p> - * If the device has not been provisioned before, this call also provisions the device - * which involves accessing the provisioning server and can take a variable time to - * complete depending on the network connectivity. - * When needed, the provisioning will be launched in the background. - * The listener {@link DrmEventCallback#onDrmPrepared} - * will be called when provisioning and preparation are finished. The application should - * check the status code returned with {@link DrmEventCallback#onDrmPrepared} to proceed. - * <p> - * The registered {@link DrmEventCallback#onDrmPrepared} is called to indicate the DRM - * session being ready. The application should not make any assumption about its call - * sequence (e.g., before or after prepareDrm returns). - * <p> - * - * @param dsd The DRM protected data source - * - * @param uuid The UUID of the crypto scheme. If not known beforehand, it can be retrieved - * from the source listening to {@link DrmEventCallback#onDrmInfo}. - * - * @return a token which can be used to cancel the operation later with {@link #cancelCommand}. - * @hide - */ - // This is an asynchronous call. - @TestApi - public @NonNull Object prepareDrm(@NonNull DataSourceDesc dsd, @NonNull UUID uuid) { - return addTask(newPrepareDrmTask(dsd, uuid)); - } - - private Task newPrepareDrmTask(DataSourceDesc dsd, UUID uuid) { - return new Task(CALL_COMPLETED_PREPARE_DRM, true) { - @Override - void process() { - final SourceInfo sourceInfo = getSourceInfo(dsd); - int status = PREPARE_DRM_STATUS_PREPARATION_ERROR; - boolean finishPrepare = true; - - if (sourceInfo == null) { - Log.e(TAG, "prepareDrm(): DataSource not found."); - } else if (sourceInfo.mDrmInfo == null) { - // only allowing if tied to a protected source; - // might relax for releasing offline keys - Log.e(TAG, "prepareDrm(): Wrong usage: The player must be prepared and " - + "DRM info be retrieved before this call."); - } else { - status = PREPARE_DRM_STATUS_SUCCESS; - } - - try { - if (status == PREPARE_DRM_STATUS_SUCCESS) { - sourceInfo.mDrmHandle.prepare(uuid); - } - } catch (ResourceBusyException e) { - status = PREPARE_DRM_STATUS_RESOURCE_BUSY; - } catch (UnsupportedSchemeException e) { - status = PREPARE_DRM_STATUS_UNSUPPORTED_SCHEME; - } catch (NotProvisionedException e) { - Log.w(TAG, "prepareDrm: NotProvisionedException"); - - // handle provisioning internally; it'll reset mPrepareDrmInProgress - status = sourceInfo.mDrmHandle.handleProvisioninig(uuid, mTaskId); - - if (status == PREPARE_DRM_STATUS_SUCCESS) { - // License will be setup in provisioning - finishPrepare = false; - } else { - synchronized (sourceInfo.mDrmHandle) { - sourceInfo.mDrmHandle.cleanDrmObj(); - } - - switch (status) { - case PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR: - Log.e(TAG, "prepareDrm: Provisioning was required but failed " - + "due to a network error."); - break; - - case PREPARE_DRM_STATUS_PROVISIONING_SERVER_ERROR: - Log.e(TAG, "prepareDrm: Provisioning was required but the request " - + "was denied by the server."); - break; - - case PREPARE_DRM_STATUS_PREPARATION_ERROR: - default: - Log.e(TAG, "prepareDrm: Post-provisioning preparation failed."); - break; - } - } - } catch (Exception e) { - status = PREPARE_DRM_STATUS_PREPARATION_ERROR; - } - - if (finishPrepare) { - sourceInfo.mDrmHandle.finishPrepare(status); - synchronized (mTaskLock) { - mCurrentTask = null; - processPendingTask_l(); - } - } - - } - }; - } - - /** - * Releases the DRM session for the given data source - * <p> - * The player has to have an active DRM session and be in stopped, or prepared - * state before this call is made. - * A {@link #reset()} call will release the DRM session implicitly. - * - * @param dsd The DRM protected data source - * - * @throws NoDrmSchemeException if there is no active DRM session to release - * @hide - */ - // This is a synchronous call. - @TestApi - public void releaseDrm(@NonNull DataSourceDesc dsd) - throws NoDrmSchemeException { - final SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo != null) { - sourceInfo.mDrmHandle.release(); - } - } - - private native void native_releaseDrm(long mSrcId); - - /** - * A key request/response exchange occurs between the app and a license server - * to obtain or release keys used to decrypt the given data source. - * <p> - * {@code getDrmKeyRequest()} is used to obtain an opaque key request byte array that is - * delivered to the license server. The opaque key request byte array is returned - * in KeyRequest.data. The recommended URL to deliver the key request to is - * returned in {@code KeyRequest.defaultUrl}. - * <p> - * After the app has received the key request response from the server, - * it should deliver to the response to the DRM engine plugin using the method - * {@link #provideDrmKeyResponse(DataSourceDesc, byte[], byte[])}. - * - * @param dsd the DRM protected data source - * - * @param keySetId is the key-set identifier of the offline keys being released when keyType is - * {@link MediaDrm#KEY_TYPE_RELEASE}. It should be set to null for other key requests, when - * keyType is {@link MediaDrm#KEY_TYPE_STREAMING} or {@link MediaDrm#KEY_TYPE_OFFLINE}. - * - * @param initData is the container-specific initialization data when the keyType is - * {@link MediaDrm#KEY_TYPE_STREAMING} or {@link MediaDrm#KEY_TYPE_OFFLINE}. Its meaning is - * interpreted based on the mime type provided in the mimeType parameter. It could - * contain, for example, the content ID, key ID or other data obtained from the content - * metadata that is required in generating the key request. - * When the keyType is {@link MediaDrm#KEY_TYPE_RELEASE}, it should be set to null. - * - * @param mimeType identifies the mime type of the content - * - * @param keyType specifies the type of the request. The request may be to acquire - * keys for streaming, {@link MediaDrm#KEY_TYPE_STREAMING}, or for offline content - * {@link MediaDrm#KEY_TYPE_OFFLINE}, or to release previously acquired - * keys ({@link MediaDrm#KEY_TYPE_RELEASE}), which are identified by a keySetId. - * - * @param optionalParameters are included in the key request message to - * allow a client application to provide additional message parameters to the server. - * This may be {@code null} if no additional parameters are to be sent. - * - * @throws NoDrmSchemeException if there is no active DRM session - * @hide - */ - @TestApi - public MediaDrm.KeyRequest getDrmKeyRequest( - @NonNull DataSourceDesc dsd, - @Nullable byte[] keySetId, @Nullable byte[] initData, - @Nullable String mimeType, @MediaDrmKeyType int keyType, - @Nullable Map<String, String> optionalParameters) - throws NoDrmSchemeException { - Log.v(TAG, "getDrmKeyRequest: " + - " keySetId: " + keySetId + " initData:" + initData + " mimeType: " + mimeType + - " keyType: " + keyType + " optionalParameters: " + optionalParameters); - - final SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo != null) { - return sourceInfo.mDrmHandle.getDrmKeyRequest( - keySetId, initData, mimeType, keyType, optionalParameters); - } - return null; - } - - /** - * A key response is received from the license server by the app for the given DRM protected - * data source, then provided to the DRM engine plugin using {@code provideDrmKeyResponse}. - * <p> - * When the response is for an offline key request, a key-set identifier is returned that - * can be used to later restore the keys to a new session with the method - * {@link #restoreDrmKeys(DataSourceDesc, byte[])}. - * When the response is for a streaming or release request, null is returned. - * - * @param dsd the DRM protected data source - * - * @param keySetId When the response is for a release request, keySetId identifies the saved - * key associated with the release request (i.e., the same keySetId passed to the earlier - * {@link # getDrmKeyRequest(DataSourceDesc, byte[], byte[], String, int, Map)} call). - * It MUST be null when the response is for either streaming or offline key requests. - * - * @param response the byte array response from the server - * - * @throws NoDrmSchemeException if there is no active DRM session - * @throws DeniedByServerException if the response indicates that the - * server rejected the request - * @hide - */ - // This is a synchronous call. - @TestApi - public byte[] provideDrmKeyResponse( - @NonNull DataSourceDesc dsd, - @Nullable byte[] keySetId, @NonNull byte[] response) - throws NoDrmSchemeException, DeniedByServerException { - Log.v(TAG, "provideDrmKeyResponse: keySetId: " + keySetId + " response: " + response); - - final SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo != null) { - return sourceInfo.mDrmHandle.provideDrmKeyResponse(keySetId, response); - } - return null; - } - - /** - * Restore persisted offline keys into a new session for the given DRM protected data source. - * {@code keySetId} identifies the keys to load, obtained from a prior call to - * {@link #provideDrmKeyResponse(DataSourceDesc, byte[], byte[])}. - * - * @param dsd the DRM protected data source - * - * @param keySetId identifies the saved key set to restore - * - * @throws NoDrmSchemeException if there is no active DRM session - * @hide - */ - // This is a synchronous call. - @TestApi - public void restoreDrmKeys( - @NonNull DataSourceDesc dsd, - @NonNull byte[] keySetId) - throws NoDrmSchemeException { - Log.v(TAG, "restoreDrmKeys: keySetId: " + keySetId); - - final SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo != null) { - sourceInfo.mDrmHandle.restoreDrmKeys(keySetId); - } - } - - /** - * Read a DRM engine plugin String property value, given the DRM protected data source - * and property name string. - * - * @param dsd the DRM protected data source - * - * @param propertyName the property name - * - * Standard fields names are: - * {@link MediaDrm#PROPERTY_VENDOR}, {@link MediaDrm#PROPERTY_VERSION}, - * {@link MediaDrm#PROPERTY_DESCRIPTION}, {@link MediaDrm#PROPERTY_ALGORITHMS} - * - * @throws NoDrmSchemeException if there is no active DRM session - * @hide - */ - @TestApi - public String getDrmPropertyString( - @NonNull DataSourceDesc dsd, - @NonNull @MediaDrmStringProperty String propertyName) - throws NoDrmSchemeException { - Log.v(TAG, "getDrmPropertyString: propertyName: " + propertyName); - - final SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo != null) { - return sourceInfo.mDrmHandle.getDrmPropertyString(propertyName); - } - return null; - } - - /** - * Set a DRM engine plugin String property value for the given data source. - * - * @param dsd the DRM protected data source - * @param propertyName the property name - * @param value the property value - * - * Standard fields names are: - * {@link MediaDrm#PROPERTY_VENDOR}, {@link MediaDrm#PROPERTY_VERSION}, - * {@link MediaDrm#PROPERTY_DESCRIPTION}, {@link MediaDrm#PROPERTY_ALGORITHMS} - * - * @throws NoDrmSchemeException if there is no active DRM session - * @hide - */ - // This is a synchronous call. - @TestApi - public void setDrmPropertyString( - @NonNull DataSourceDesc dsd, - @NonNull @MediaDrmStringProperty String propertyName, @NonNull String value) - throws NoDrmSchemeException { - // TODO: this implementation only works when dsd is the only data source - Log.v(TAG, "setDrmPropertyString: propertyName: " + propertyName + " value: " + value); - - final SourceInfo sourceInfo = getSourceInfo(dsd); - if (sourceInfo != null) { - sourceInfo.mDrmHandle.setDrmPropertyString(propertyName, value); - } - } - - /** - * Encapsulates the DRM properties of the source. - */ - public static final class DrmInfo { - private Map<UUID, byte[]> mMapPssh; - private UUID[] mSupportedSchemes; - - /** - * Returns the PSSH info of the data source for each supported DRM scheme. - */ - public @NonNull Map<UUID, byte[]> getPssh() { - return mMapPssh; - } - - /** - * Returns the intersection of the data source and the device DRM schemes. - * It effectively identifies the subset of the source's DRM schemes which - * are supported by the device too. - */ - public @NonNull List<UUID> getSupportedSchemes() { - return Arrays.asList(mSupportedSchemes); - } - - private DrmInfo(Map<UUID, byte[]> pssh, UUID[] supportedSchemes) { - mMapPssh = pssh; - mSupportedSchemes = supportedSchemes; - } - - private static DrmInfo create(PlayerMessage msg) { - Log.v(TAG, "DrmInfo.create(" + msg + ")"); - - Iterator<Value> in = msg.getValuesList().iterator(); - byte[] pssh = in.next().getBytesValue().toByteArray(); - - Log.v(TAG, "DrmInfo.create() PSSH: " + DrmInfo.arrToHex(pssh)); - Map<UUID, byte[]> mapPssh = DrmInfo.parsePSSH(pssh, pssh.length); - Log.v(TAG, "DrmInfo.create() PSSH: " + mapPssh); - - int supportedDRMsCount = in.next().getInt32Value(); - UUID[] supportedSchemes = new UUID[supportedDRMsCount]; - for (int i = 0; i < supportedDRMsCount; i++) { - byte[] uuid = new byte[16]; - in.next().getBytesValue().copyTo(uuid, 0); - - supportedSchemes[i] = DrmInfo.bytesToUUID(uuid); - - Log.v(TAG, "DrmInfo() supportedScheme[" + i + "]: " + supportedSchemes[i]); - } - - Log.v(TAG, "DrmInfo.create() psshsize: " + pssh.length - + " supportedDRMsCount: " + supportedDRMsCount); - return new DrmInfo(mapPssh, supportedSchemes); - } - - private DrmInfo makeCopy() { - return new DrmInfo(this.mMapPssh, this.mSupportedSchemes); - } - - private static String arrToHex(byte[] bytes) { - String out = "0x"; - for (int i = 0; i < bytes.length; i++) { - out += String.format("%02x", bytes[i]); - } - - return out; - } - - private static UUID bytesToUUID(byte[] uuid) { - long msb = 0, lsb = 0; - for (int i = 0; i < 8; i++) { - msb |= (((long) uuid[i] & 0xff) << (8 * (7 - i))); - lsb |= (((long) uuid[i + 8] & 0xff) << (8 * (7 - i))); - } - - return new UUID(msb, lsb); - } - - private static Map<UUID, byte[]> parsePSSH(byte[] pssh, int psshsize) { - Map<UUID, byte[]> result = new HashMap<UUID, byte[]>(); - - final int uuidSize = 16; - final int dataLenSize = 4; - - int len = psshsize; - int numentries = 0; - int i = 0; - - while (len > 0) { - if (len < uuidSize) { - Log.w(TAG, String.format("parsePSSH: len is too short to parse " - + "UUID: (%d < 16) pssh: %d", len, psshsize)); - return null; - } - - byte[] subset = Arrays.copyOfRange(pssh, i, i + uuidSize); - UUID uuid = bytesToUUID(subset); - i += uuidSize; - len -= uuidSize; - - // get data length - if (len < 4) { - Log.w(TAG, String.format("parsePSSH: len is too short to parse " - + "datalen: (%d < 4) pssh: %d", len, psshsize)); - return null; - } - - subset = Arrays.copyOfRange(pssh, i, i + dataLenSize); - int datalen = (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) - ? ((subset[3] & 0xff) << 24) | ((subset[2] & 0xff) << 16) - | ((subset[1] & 0xff) << 8) | (subset[0] & 0xff) : - ((subset[0] & 0xff) << 24) | ((subset[1] & 0xff) << 16) - | ((subset[2] & 0xff) << 8) | (subset[3] & 0xff); - i += dataLenSize; - len -= dataLenSize; - - if (len < datalen) { - Log.w(TAG, String.format("parsePSSH: len is too short to parse " - + "data: (%d < %d) pssh: %d", len, datalen, psshsize)); - return null; - } - - byte[] data = Arrays.copyOfRange(pssh, i, i + datalen); - - // skip the data - i += datalen; - len -= datalen; - - Log.v(TAG, String.format("parsePSSH[%d]: <%s, %s> pssh: %d", - numentries, uuid, arrToHex(data), psshsize)); - numentries++; - result.put(uuid, data); - } - - return result; - } - }; // DrmInfo - - /** - * Thrown when a DRM method is called when there is no active DRM session. - * Extends MediaDrm.MediaDrmException - */ - public static final class NoDrmSchemeException extends MediaDrmException { - public NoDrmSchemeException(@Nullable String detailMessage) { - super(detailMessage); - } - } - - private native void native_prepareDrm( - long srcId, @NonNull byte[] uuid, @NonNull byte[] drmSessionId); - - // Instantiated from the native side - @SuppressWarnings("unused") - private static class StreamEventCallback extends AudioTrack.StreamEventCallback { - public long mJAudioTrackPtr; - public long mNativeCallbackPtr; - public long mUserDataPtr; - - StreamEventCallback(long jAudioTrackPtr, long nativeCallbackPtr, long userDataPtr) { - super(); - mJAudioTrackPtr = jAudioTrackPtr; - mNativeCallbackPtr = nativeCallbackPtr; - mUserDataPtr = userDataPtr; - } - - @Override - public void onTearDown(AudioTrack track) { - native_stream_event_onTearDown(mNativeCallbackPtr, mUserDataPtr); - } - - @Override - public void onPresentationEnded(AudioTrack track) { - native_stream_event_onStreamPresentationEnd(mNativeCallbackPtr, mUserDataPtr); - } - - @Override - public void onDataRequest(AudioTrack track, int size) { - native_stream_event_onStreamDataRequest( - mJAudioTrackPtr, mNativeCallbackPtr, mUserDataPtr); - } - } - - /** - * Returns a byte[] containing the remainder of 'in', closing it when done. - */ - private static byte[] readInputStreamFully(InputStream in) throws IOException { - try { - return readInputStreamFullyNoClose(in); - } finally { - in.close(); - } - } - - /** - * Returns a byte[] containing the remainder of 'in'. - */ - private static byte[] readInputStreamFullyNoClose(InputStream in) throws IOException { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - byte[] buffer = new byte[1024]; - int count; - while ((count = in.read(buffer)) != -1) { - bytes.write(buffer, 0, count); - } - return bytes.toByteArray(); - } - - private static byte[] getByteArrayFromUUID(@NonNull UUID uuid) { - long msb = uuid.getMostSignificantBits(); - long lsb = uuid.getLeastSignificantBits(); - - byte[] uuidBytes = new byte[16]; - for (int i = 0; i < 8; ++i) { - uuidBytes[i] = (byte) (msb >>> (8 * (7 - i))); - uuidBytes[8 + i] = (byte) (lsb >>> (8 * (7 - i))); - } - - return uuidBytes; - } - - private static class TimedTextUtil { - // These keys must be in sync with the keys in TextDescription2.h - private static final int KEY_START_TIME = 7; // int - private static final int KEY_STRUCT_TEXT_POS = 14; // TextPos - private static final int KEY_STRUCT_TEXT = 16; // Text - private static final int KEY_GLOBAL_SETTING = 101; - private static final int KEY_LOCAL_SETTING = 102; - - private static TimedText parsePlayerMessage(PlayerMessage playerMsg) { - if (playerMsg.getValuesCount() == 0) { - return null; - } - - String textChars = null; - Rect textBounds = null; - Iterator<Value> in = playerMsg.getValuesList().iterator(); - int type = in.next().getInt32Value(); - if (type == KEY_LOCAL_SETTING) { - type = in.next().getInt32Value(); - if (type != KEY_START_TIME) { - return null; - } - int startTimeMs = in.next().getInt32Value(); - - type = in.next().getInt32Value(); - if (type != KEY_STRUCT_TEXT) { - return null; - } - - byte[] text = in.next().getBytesValue().toByteArray(); - if (text == null || text.length == 0) { - textChars = null; - } else { - textChars = new String(text); - } - - } else if (type != KEY_GLOBAL_SETTING) { - Log.w(TAG, "Invalid timed text key found: " + type); - return null; - } - if (in.hasNext()) { - type = in.next().getInt32Value(); - if (type == KEY_STRUCT_TEXT_POS) { - int top = in.next().getInt32Value(); - int left = in.next().getInt32Value(); - int bottom = in.next().getInt32Value(); - int right = in.next().getInt32Value(); - textBounds = new Rect(left, top, right, bottom); - } - } - return null; - /* TimedText c-tor usage is temporarily commented out. - * TODO(b/117527789): use SUBTITLE path for MEDIA_MIMETYPE_TEXT_3GPP track - * and remove TimedText path from MediaPlayer2. - return new TimedText(textChars, textBounds); - */ - } - } - - private Object addTask(Task task) { - synchronized (mTaskLock) { - mPendingTasks.add(task); - processPendingTask_l(); - } - return task; - } - - @GuardedBy("mTaskLock") - private void processPendingTask_l() { - if (mCurrentTask != null) { - return; - } - if (!mPendingTasks.isEmpty()) { - Task task = mPendingTasks.remove(0); - mCurrentTask = task; - mTaskHandler.post(task); - } - } - - private abstract class Task implements Runnable { - final long mTaskId = mTaskIdGenerator.getAndIncrement(); - private final int mMediaCallType; - private final boolean mNeedToWaitForEventToComplete; - private DataSourceDesc mDSD; - - Task(int mediaCallType, boolean needToWaitForEventToComplete) { - mMediaCallType = mediaCallType; - mNeedToWaitForEventToComplete = needToWaitForEventToComplete; - } - - abstract void process() throws IOException, NoDrmSchemeException; - - @Override - public void run() { - int status = CALL_STATUS_NO_ERROR; - try { - if (mMediaCallType != CALL_COMPLETED_NOTIFY_WHEN_COMMAND_LABEL_REACHED - && getState() == PLAYER_STATE_ERROR) { - status = CALL_STATUS_INVALID_OPERATION; - } else { - if (mMediaCallType == CALL_COMPLETED_SEEK_TO) { - synchronized (mTaskLock) { - if (!mPendingTasks.isEmpty()) { - Task nextTask = mPendingTasks.get(0); - if (nextTask.mMediaCallType == mMediaCallType) { - throw new CommandSkippedException( - "consecutive seekTo is skipped except last one"); - } - } - } - } - process(); - } - } catch (IllegalStateException e) { - status = CALL_STATUS_INVALID_OPERATION; - } catch (IllegalArgumentException e) { - status = CALL_STATUS_BAD_VALUE; - } catch (SecurityException e) { - status = CALL_STATUS_PERMISSION_DENIED; - } catch (IOException e) { - status = CALL_STATUS_ERROR_IO; - } catch (NoDrmSchemeException e) { - status = CALL_STATUS_NO_DRM_SCHEME; - } catch (CommandSkippedException e) { - status = CALL_STATUS_SKIPPED; - } catch (Exception e) { - status = CALL_STATUS_ERROR_UNKNOWN; - } - mDSD = getCurrentDataSource(); - - if (mMediaCallType != CALL_COMPLETED_SEEK_TO) { - synchronized (mTaskLock) { - mIsPreviousCommandSeekTo = false; - } - } - - // TODO: Make native implementations asynchronous and let them send notifications. - if (!mNeedToWaitForEventToComplete || status != CALL_STATUS_NO_ERROR) { - - sendCompleteNotification(status); - - synchronized (mTaskLock) { - mCurrentTask = null; - processPendingTask_l(); - } - } - } - - private void sendCompleteNotification(int status) { - // In {@link #notifyWhenCommandLabelReached} case, a separate callback - // {@link #onCommandLabelReached} is already called in {@code process()}. - // CALL_COMPLETED_PREPARE_DRM is sent via DrmEventCallback#onDrmPrepared - if (mMediaCallType == CALL_COMPLETED_NOTIFY_WHEN_COMMAND_LABEL_REACHED - || mMediaCallType == CALL_COMPLETED_PREPARE_DRM) { - return; - } - sendEvent(new EventNotifier() { - @Override - public void notify(EventCallback callback) { - callback.onCallCompleted( - MediaPlayer2.this, mDSD, mMediaCallType, status); - } - }); - } - }; - - private final class CommandSkippedException extends RuntimeException { - CommandSkippedException(String detailMessage) { - super(detailMessage); - } - }; - - // Modular DRM - private final Map<UUID, MediaDrm> mDrmObjs = Collections.synchronizedMap(new HashMap<>()); - private class DrmHandle { - - static final int PROVISION_TIMEOUT_MS = 60000; - - final DataSourceDesc mDSD; - final long mSrcId; - - //--- guarded by |this| start - MediaDrm mDrmObj; - byte[] mDrmSessionId; - UUID mActiveDrmUUID; - boolean mDrmConfigAllowed; - boolean mDrmProvisioningInProgress; - boolean mPrepareDrmInProgress; - Future<?> mProvisionResult; - DrmPreparationInfo mPrepareInfo; - //--- guarded by |this| end - - DrmHandle(DataSourceDesc dsd, long srcId) { - mDSD = dsd; - mSrcId = srcId; - } - - void prepare(UUID uuid) throws UnsupportedSchemeException, - ResourceBusyException, NotProvisionedException, InterruptedException, - ExecutionException, TimeoutException { - Log.v(TAG, "prepareDrm: uuid: " + uuid); - - synchronized (this) { - if (mActiveDrmUUID != null) { - final String msg = "prepareDrm(): Wrong usage: There is already " - + "an active DRM scheme with " + uuid; - Log.e(TAG, msg); - throw new IllegalStateException(msg); - } - - if (mPrepareDrmInProgress) { - final String msg = "prepareDrm(): Wrong usage: There is already " - + "a pending prepareDrm call."; - Log.e(TAG, msg); - throw new IllegalStateException(msg); - } - - if (mDrmProvisioningInProgress) { - final String msg = "prepareDrm(): Unexpectd: Provisioning already in progress"; - Log.e(TAG, msg); - throw new IllegalStateException(msg); - } - - // shouldn't need this; just for safeguard - cleanDrmObj(); - - mPrepareDrmInProgress = true; - - try { - // only creating the DRM object to allow pre-openSession configuration - prepareDrm_createDrmStep(uuid); - } catch (Exception e) { - Log.w(TAG, "prepareDrm(): Exception ", e); - mPrepareDrmInProgress = false; - throw e; - } - - mDrmConfigAllowed = true; - } // synchronized - - // call the callback outside the lock - sendDrmEventWait(new DrmEventNotifier<Void>() { - @Override - public Void notifyWait(DrmEventCallback callback) { - callback.onDrmConfig(MediaPlayer2.this, mDSD, mDrmObj); - return null; - } - }); - - synchronized (this) { - mDrmConfigAllowed = false; - boolean earlyExit = false; - - try { - prepareDrm_openSessionStep(uuid); - - this.mActiveDrmUUID = uuid; - mPrepareDrmInProgress = false; - } catch (IllegalStateException e) { - final String msg = "prepareDrm(): Wrong usage: The player must be " - + "in the prepared state to call prepareDrm()."; - Log.e(TAG, msg); - earlyExit = true; - mPrepareDrmInProgress = false; - throw new IllegalStateException(msg); - } catch (NotProvisionedException e) { - Log.w(TAG, "prepareDrm: NotProvisionedException", e); - throw e; - } catch (Exception e) { - Log.e(TAG, "prepareDrm: Exception " + e); - earlyExit = true; - mPrepareDrmInProgress = false; - throw e; - } finally { - if (earlyExit) { // clean up object if didn't succeed - cleanDrmObj(); - } - } // finally - } // synchronized - } - - void prepareDrm_createDrmStep(UUID uuid) - throws UnsupportedSchemeException { - Log.v(TAG, "prepareDrm_createDrmStep: UUID: " + uuid); - - try { - mDrmObj = mDrmObjs.computeIfAbsent(uuid, scheme -> { - try { - return new MediaDrm(scheme); - } catch (UnsupportedSchemeException e) { - throw new IllegalArgumentException(e); - } - }); - Log.v(TAG, "prepareDrm_createDrmStep: Created mDrmObj=" + mDrmObj); - } catch (Exception e) { // UnsupportedSchemeException - Log.e(TAG, "prepareDrm_createDrmStep: MediaDrm failed with " + e); - throw e; - } - } - - void prepareDrm_openSessionStep(UUID uuid) - throws NotProvisionedException, ResourceBusyException { - Log.v(TAG, "prepareDrm_openSessionStep: uuid: " + uuid); - - // TODO: - // don't need an open session for a future specialKeyReleaseDrm mode but we should do - // it anyway so it raises provisioning error if needed. We'd rather handle provisioning - // at prepareDrm/openSession rather than getDrmKeyRequest/provideDrmKeyResponse - try { - mDrmSessionId = mDrmObj.openSession(); - Log.v(TAG, "prepareDrm_openSessionStep: mDrmSessionId=" + mDrmSessionId); - - // Sending it down to native/mediaserver to create the crypto object - // This call could simply fail due to bad player state, e.g., after play(). - final MediaPlayer2 mp2 = MediaPlayer2.this; - mp2.native_prepareDrm(mSrcId, getByteArrayFromUUID(uuid), mDrmSessionId); - Log.v(TAG, "prepareDrm_openSessionStep: native_prepareDrm/Crypto succeeded"); - - } catch (Exception e) { //ResourceBusyException, NotProvisionedException - Log.e(TAG, "prepareDrm_openSessionStep: open/crypto failed with " + e); - throw e; - } - - } - - int handleProvisioninig(UUID uuid, long taskId) { - synchronized (this) { - if (mDrmProvisioningInProgress) { - Log.e(TAG, "handleProvisioninig: Unexpected mDrmProvisioningInProgress"); - return PREPARE_DRM_STATUS_PREPARATION_ERROR; - } - - MediaDrm.ProvisionRequest provReq = mDrmObj.getProvisionRequest(); - if (provReq == null) { - Log.e(TAG, "handleProvisioninig: getProvisionRequest returned null."); - return PREPARE_DRM_STATUS_PREPARATION_ERROR; - } - - Log.v(TAG, "handleProvisioninig provReq " - + " data: " + provReq.getData() + " url: " + provReq.getDefaultUrl()); - - // networking in a background thread - mDrmProvisioningInProgress = true; - - mProvisionResult = sDrmThreadPool.submit(newProvisioningTask(uuid, taskId)); - - return PREPARE_DRM_STATUS_SUCCESS; - } - } - - void provision(UUID uuid, long taskId) { - - MediaDrm.ProvisionRequest provReq = mDrmObj.getProvisionRequest(); - String urlStr = provReq.getDefaultUrl(); - urlStr += "&signedRequest=" + new String(provReq.getData()); - Log.v(TAG, "handleProvisioninig: Thread is initialised url: " + urlStr); - - byte[] response = null; - boolean provisioningSucceeded = false; - int status = PREPARE_DRM_STATUS_PREPARATION_ERROR; - try { - URL url = new URL(urlStr); - final HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - try { - connection.setRequestMethod("POST"); - connection.setDoOutput(false); - connection.setDoInput(true); - connection.setConnectTimeout(PROVISION_TIMEOUT_MS); - connection.setReadTimeout(PROVISION_TIMEOUT_MS); - - connection.connect(); - response = readInputStreamFully(connection.getInputStream()); - - Log.v(TAG, "handleProvisioninig: Thread run: response " + - response.length + " " + response); - } catch (Exception e) { - status = PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR; - Log.w(TAG, "handleProvisioninig: Thread run: connect " + e + " url: " + url); - } finally { - connection.disconnect(); - } - } catch (Exception e) { - status = PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR; - Log.w(TAG, "handleProvisioninig: Thread run: openConnection " + e); - } - - if (response != null) { - try { - mDrmObj.provideProvisionResponse(response); - Log.v(TAG, "handleProvisioninig: Thread run: " + - "provideProvisionResponse SUCCEEDED!"); - - provisioningSucceeded = true; - } catch (Exception e) { - status = PREPARE_DRM_STATUS_PROVISIONING_SERVER_ERROR; - Log.w(TAG, "handleProvisioninig: Thread run: " + - "provideProvisionResponse " + e); - } - } - - boolean succeeded = false; - - synchronized (this) { - // continuing with prepareDrm - if (provisioningSucceeded) { - succeeded = resumePrepare(uuid); - status = (succeeded) ? - PREPARE_DRM_STATUS_SUCCESS : - PREPARE_DRM_STATUS_PREPARATION_ERROR; - } - mDrmProvisioningInProgress = false; - mPrepareDrmInProgress = false; - if (!succeeded) { - cleanDrmObj(); // cleaning up if it hasn't gone through while in the lock - } - } // synchronized - - // calling the callback outside the lock - finishPrepare(status); - - synchronized (mTaskLock) { - if (mCurrentTask != null - && mCurrentTask.mTaskId == taskId - && mCurrentTask.mMediaCallType == CALL_COMPLETED_PREPARE_DRM - && mCurrentTask.mNeedToWaitForEventToComplete) { - mCurrentTask = null; - processPendingTask_l(); - } - } - } - - Runnable newProvisioningTask(UUID uuid, long taskId) { - return new Runnable() { - @Override - public void run() { - provision(uuid, taskId); - } - }; - } - - boolean resumePrepare(UUID uuid) { - Log.v(TAG, "resumePrepareDrm: uuid: " + uuid); - - // mDrmLock is guaranteed to be held - boolean success = false; - try { - // resuming - prepareDrm_openSessionStep(uuid); - - this.mActiveDrmUUID = uuid; - - success = true; - } catch (Exception e) { - Log.w(TAG, "handleProvisioninig: Thread run native_prepareDrm resume failed:" + e); - // mDrmObj clean up is done by the caller - } - - return success; - } - - synchronized boolean setPreparationInfo(DrmPreparationInfo prepareInfo) { - if (prepareInfo == null || !prepareInfo.isValid() || mPrepareInfo != null) { - return false; - } - mPrepareInfo = prepareInfo; - return true; - } - - void finishPrepare(int status) { - if (status != PREPARE_DRM_STATUS_SUCCESS) { - notifyPrepared(status, null); - return; - } - - if (mPrepareInfo == null) { - // Deprecated: this can only happen when using MediaPlayer Version 1 APIs - notifyPrepared(status, null); - return; - } - - final byte[] keySetId = mPrepareInfo.mKeySetId; - if (keySetId != null) { - try { - mDrmObj.restoreKeys(mDrmSessionId, keySetId); - notifyPrepared(PREPARE_DRM_STATUS_SUCCESS, keySetId); - } catch (Exception e) { - notifyPrepared(PREPARE_DRM_STATUS_RESTORE_ERROR, keySetId); - } - return; - } - - sDrmThreadPool.submit(newKeyExchangeTask()); - } - - Runnable newKeyExchangeTask() { - return new Runnable() { - @Override - public void run() { - final byte[] initData = mPrepareInfo.mInitData; - final String mimeType = mPrepareInfo.mMimeType; - final int keyType = mPrepareInfo.mKeyType; - final Map<String, String> optionalParams = mPrepareInfo.mOptionalParameters; - byte[] keySetId = null; - try { - KeyRequest req; - req = getDrmKeyRequest(null, initData, mimeType, keyType, optionalParams); - byte[] response = sendDrmEventWait(new DrmEventNotifier<byte[]>() { - @Override - public byte[] notifyWait(DrmEventCallback callback) { - final MediaPlayer2 mp = MediaPlayer2.this; - return callback.onDrmKeyRequest(mp, mDSD, req); - } - }); - keySetId = provideDrmKeyResponse(null, response); - } catch (Exception e) { - } - if (keySetId == null) { - notifyPrepared(PREPARE_DRM_STATUS_KEY_EXCHANGE_ERROR, null); - } else { - notifyPrepared(PREPARE_DRM_STATUS_SUCCESS, keySetId); - } - } - }; - } - - void notifyPrepared(final int status, byte[] keySetId) { - - Message msg; - if (status == PREPARE_DRM_STATUS_SUCCESS) { - msg = mTaskHandler.obtainMessage( - MEDIA_DRM_PREPARED, 0, 0, null); - } else { - msg = mTaskHandler.obtainMessage( - MEDIA_ERROR, status, MEDIA_ERROR_UNKNOWN, null); - } - mTaskHandler.post(new Runnable() { - @Override - public void run() { - mTaskHandler.handleMessage(msg, mSrcId); - } - }); - - sendDrmEvent(new DrmEventNotifier() { - @Override - public void notify(DrmEventCallback callback) { - callback.onDrmPrepared(MediaPlayer2.this, mDSD, status, - keySetId); - } - }); - - } - - void cleanDrmObj() { - // the caller holds mDrmLock - Log.v(TAG, "cleanDrmObj: mDrmObj=" + mDrmObj + " mDrmSessionId=" + mDrmSessionId); - - if (mDrmSessionId != null) { - mDrmObj.closeSession(mDrmSessionId); - mDrmSessionId = null; - } - } - - void release() throws NoDrmSchemeException { - synchronized (this) { - Log.v(TAG, "releaseDrm:"); - - if (mActiveDrmUUID == null) { - Log.e(TAG, "releaseDrm(): No active DRM scheme to release."); - throw new NoDrmSchemeException( - "releaseDrm: No active DRM scheme to release."); - } - - try { - // we don't have the player's state in this layer. The below call raises - // exception if we're in a non-stopped/prepared state. - - // for cleaning native/mediaserver crypto object - native_releaseDrm(mSrcId); - - // for cleaning client-side MediaDrm object; only called if above has succeeded - cleanDrmObj(); - - this.mActiveDrmUUID = null; - } catch (IllegalStateException e) { - Log.w(TAG, "releaseDrm: Exception ", e); - throw new IllegalStateException( - "releaseDrm: The player is not in a valid state."); - } catch (Exception e) { - Log.e(TAG, "releaseDrm: Exception ", e); - } - } // synchronized - } - - void cleanup() { - synchronized (this) { - Log.v(TAG, "cleanupDrm: " + - " mProvisioningTask=" + mProvisionResult + - " mPrepareDrmInProgress=" + mPrepareDrmInProgress + - " mActiveDrmScheme=" + mActiveDrmUUID); - - if (mProvisionResult != null) { - // timeout; relying on HttpUrlConnection - try { - mProvisionResult.get(); - } - catch (InterruptedException | ExecutionException e) { - Log.w(TAG, "resetDrmState: ProvThread.join Exception " + e); - } - } - - // set to false to avoid duplicate release calls - this.mActiveDrmUUID = null; - - native_releaseDrm(mSrcId); - cleanDrmObj(); - } // synchronized - } - - Runnable newCleanupTask() { - return new Runnable() { - @Override - public void run() { - cleanup(); - } - }; - } - - MediaDrm.KeyRequest getDrmKeyRequest( - byte[] keySetId, byte[] initData, - String mimeType, int keyType, - Map<String, String> optionalParameters) - throws NoDrmSchemeException { - synchronized (this) { - if (mActiveDrmUUID == null) { - Log.e(TAG, "getDrmKeyRequest NoDrmSchemeException"); - throw new NoDrmSchemeException( - "getDrmKeyRequest: Has to set a DRM scheme first."); - } - - try { - byte[] scope = (keyType != MediaDrm.KEY_TYPE_RELEASE) ? - mDrmSessionId : // sessionId for KEY_TYPE_STREAMING/OFFLINE - keySetId; // keySetId for KEY_TYPE_RELEASE - - HashMap<String, String> hmapOptionalParameters = - (optionalParameters != null) - ? new HashMap<String, String>(optionalParameters) - : null; - - MediaDrm.KeyRequest request = mDrmObj.getKeyRequest( - scope, initData, mimeType, keyType, hmapOptionalParameters); - Log.v(TAG, "getDrmKeyRequest: --> request: " + request); - - return request; - - } catch (NotProvisionedException e) { - Log.w(TAG, "getDrmKeyRequest NotProvisionedException: " + - "Unexpected. Shouldn't have reached here."); - throw new IllegalStateException("getDrmKeyRequest: provisioning error."); - } catch (Exception e) { - Log.w(TAG, "getDrmKeyRequest Exception " + e); - throw e; - } - - } - } - - byte[] provideDrmKeyResponse(byte[] keySetId, byte[] response) - throws NoDrmSchemeException, DeniedByServerException { - synchronized (this) { - - if (mActiveDrmUUID == null) { - Log.e(TAG, "getDrmKeyRequest NoDrmSchemeException"); - throw new NoDrmSchemeException( - "getDrmKeyRequest: Has to set a DRM scheme first."); - } - - try { - byte[] scope = (keySetId == null) ? - mDrmSessionId : // sessionId for KEY_TYPE_STREAMING/OFFLINE - keySetId; // keySetId for KEY_TYPE_RELEASE - - byte[] keySetResult = mDrmObj.provideKeyResponse(scope, response); - - Log.v(TAG, "provideDrmKeyResponse: keySetId: " + keySetId - + " response: " + response + " --> " + keySetResult); - - - return keySetResult; - - } catch (NotProvisionedException e) { - Log.w(TAG, "provideDrmKeyResponse NotProvisionedException: " + - "Unexpected. Shouldn't have reached here."); - throw new IllegalStateException("provideDrmKeyResponse: " + - "Unexpected provisioning error."); - } catch (Exception e) { - Log.w(TAG, "provideDrmKeyResponse Exception " + e); - throw e; - } - } - } - - void restoreDrmKeys(byte[] keySetId) - throws NoDrmSchemeException { - synchronized (this) { - if (mActiveDrmUUID == null) { - Log.w(TAG, "restoreDrmKeys NoDrmSchemeException"); - throw new NoDrmSchemeException( - "restoreDrmKeys: Has to set a DRM scheme first."); - } - - try { - mDrmObj.restoreKeys(mDrmSessionId, keySetId); - } catch (Exception e) { - Log.w(TAG, "restoreKeys Exception " + e); - throw e; - } - } - } - - String getDrmPropertyString(String propertyName) - throws NoDrmSchemeException { - String v; - synchronized (this) { - - if (mActiveDrmUUID == null && !mDrmConfigAllowed) { - Log.w(TAG, "getDrmPropertyString NoDrmSchemeException"); - throw new NoDrmSchemeException( - "getDrmPropertyString: Has to prepareDrm() first."); - } - - try { - v = mDrmObj.getPropertyString(propertyName); - } catch (Exception e) { - Log.w(TAG, "getDrmPropertyString Exception " + e); - throw e; - } - } // synchronized - - Log.v(TAG, "getDrmPropertyString: propertyName: " + propertyName + " --> value: " + v); - - return v; - } - - void setDrmPropertyString(String propertyName, String value) - throws NoDrmSchemeException { - synchronized (this) { - - if ( mActiveDrmUUID == null && !mDrmConfigAllowed ) { - Log.w(TAG, "setDrmPropertyString NoDrmSchemeException"); - throw new NoDrmSchemeException( - "setDrmPropertyString: Has to prepareDrm() first."); - } - - try { - mDrmObj.setPropertyString(propertyName, value); - } catch ( Exception e ) { - Log.w(TAG, "setDrmPropertyString Exception " + e); - throw e; - } - } - } - - } - - final class SourceInfo { - final DataSourceDesc mDSD; - final long mId = mSrcIdGenerator.getAndIncrement(); - AtomicInteger mBufferedPercentage = new AtomicInteger(0); - boolean mClosed = false; - int mPrepareBarrier = 1; - - // m*AsNextSource (below) only applies to pending data sources in the playlist; - // the meanings of mCurrentSourceInfo.{mStateAsNextSource,mPlayPendingAsNextSource} - // are undefined. - int mStateAsNextSource = NEXT_SOURCE_STATE_INIT; - boolean mPlayPendingAsNextSource = false; - - // Modular DRM - final DrmHandle mDrmHandle; - DrmInfo mDrmInfo; - boolean mDrmInfoResolved; - - SourceInfo(DataSourceDesc dsd) { - this.mDSD = dsd; - mDrmHandle = new DrmHandle(dsd, mId); - } - - void close() { - synchronized (this) { - if (!mClosed) { - if (mDSD != null) { - mDSD.close(); - } - mClosed = true; - } - } - } - - @Override - public String toString() { - return String.format("%s(%d)", SourceInfo.class.getName(), mId); - } - - } - - private SourceInfo getSourceInfo(long srcId) { - synchronized (mSrcLock) { - if (isCurrentSource(srcId)) { - return mCurrentSourceInfo; - } - if (isNextSource(srcId)) { - return mNextSourceInfos.peek(); - } - } - return null; - } - - private SourceInfo getSourceInfo(DataSourceDesc dsd) { - synchronized (mSrcLock) { - if (isCurrentSource(dsd)) { - return mCurrentSourceInfo; - } - if (isNextSource(dsd)) { - return mNextSourceInfos.peek(); - } - } - return null; - } - - private boolean isCurrentSource(long srcId) { - synchronized (mSrcLock) { - return mCurrentSourceInfo != null && mCurrentSourceInfo.mId == srcId; - } - } - - private boolean isCurrentSource(DataSourceDesc dsd) { - synchronized (mSrcLock) { - return mCurrentSourceInfo != null && mCurrentSourceInfo.mDSD == dsd; - } - } - - private boolean isNextSource(long srcId) { - SourceInfo nextSourceInfo = mNextSourceInfos.peek(); - return nextSourceInfo != null && nextSourceInfo.mId == srcId; - } - - private boolean isNextSource(DataSourceDesc dsd) { - SourceInfo nextSourceInfo = mNextSourceInfos.peek(); - return nextSourceInfo != null && nextSourceInfo.mDSD == dsd; - } - - @GuardedBy("mSrcLock") - private void setCurrentSourceInfo_l(SourceInfo sourceInfo) { - cleanupSourceInfo(mCurrentSourceInfo); - mCurrentSourceInfo = sourceInfo; - } - - @GuardedBy("mSrcLock") - private void clearNextSourceInfos_l() { - while (!mNextSourceInfos.isEmpty()) { - cleanupSourceInfo(mNextSourceInfos.poll()); - } - } - - private void cleanupSourceInfo(SourceInfo sourceInfo) { - if (sourceInfo != null) { - sourceInfo.close(); - Runnable task = sourceInfo.mDrmHandle.newCleanupTask(); - sDrmThreadPool.submit(task); - } - } - - private void clearSourceInfos() { - synchronized (mSrcLock) { - setCurrentSourceInfo_l(null); - clearNextSourceInfos_l(); - } - } - - public static final class MetricsConstants { - private MetricsConstants() {} - - /** - * Key to extract the MIME type of the video track - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is a String. - */ - public static final String MIME_TYPE_VIDEO = "android.media.mediaplayer.video.mime"; - - /** - * Key to extract the codec being used to decode the video track - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is a String. - */ - public static final String CODEC_VIDEO = "android.media.mediaplayer.video.codec"; - - /** - * Key to extract the width (in pixels) of the video track - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is an integer. - */ - public static final String WIDTH = "android.media.mediaplayer.width"; - - /** - * Key to extract the height (in pixels) of the video track - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is an integer. - */ - public static final String HEIGHT = "android.media.mediaplayer.height"; - - /** - * Key to extract the count of video frames played - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is an integer. - */ - public static final String FRAMES = "android.media.mediaplayer.frames"; - - /** - * Key to extract the count of video frames dropped - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is an integer. - */ - public static final String FRAMES_DROPPED = "android.media.mediaplayer.dropped"; - - /** - * Key to extract the MIME type of the audio track - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is a String. - */ - public static final String MIME_TYPE_AUDIO = "android.media.mediaplayer.audio.mime"; - - /** - * Key to extract the codec being used to decode the audio track - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is a String. - */ - public static final String CODEC_AUDIO = "android.media.mediaplayer.audio.codec"; - - /** - * Key to extract the duration (in milliseconds) of the - * media being played - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is a long. - */ - public static final String DURATION = "android.media.mediaplayer.durationMs"; - - /** - * Key to extract the playing time (in milliseconds) of the - * media being played - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is a long. - */ - public static final String PLAYING = "android.media.mediaplayer.playingMs"; - - /** - * Key to extract the count of errors encountered while - * playing the media - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is an integer. - */ - public static final String ERRORS = "android.media.mediaplayer.err"; - - /** - * Key to extract an (optional) error code detected while - * playing the media - * from the {@link MediaPlayer2#getMetrics} return value. - * The value is an integer. - */ - public static final String ERROR_CODE = "android.media.mediaplayer.errcode"; - - } - - private void keepAudioSessionIdAlive(int sessionId) { - synchronized (mSessionIdLock) { - if (mDummyAudioTrack != null) { - if (mDummyAudioTrack.getAudioSessionId() == sessionId) { - return; - } - mDummyAudioTrack.release(); - } - // TODO: parameters can be optimized - mDummyAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, 44100, - AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT, 2, - AudioTrack.MODE_STATIC, sessionId); - } - } - - private void keepAudioSessionIdAlive(AudioTrack at) { - synchronized (mSessionIdLock) { - if (mDummyAudioTrack != null) { - if (mDummyAudioTrack.getAudioSessionId() == at.getAudioSessionId()) { - at.release(); - return; - } - mDummyAudioTrack.release(); - } - mDummyAudioTrack = at; - } - } -} diff --git a/media/apex/java/android/media/MediaPlayer2Utils.java b/media/apex/java/android/media/MediaPlayer2Utils.java deleted file mode 100644 index ac34260f9bcf..000000000000 --- a/media/apex/java/android/media/MediaPlayer2Utils.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -/** - * Helper class used by native code to reduce JNI calls from native side. - * @hide - */ -public class MediaPlayer2Utils { - /** - * Returns whether audio offloading is supported for the given audio format. - * - * @param encoding the type of encoding defined in {@link AudioFormat} - * @param sampleRate the sampling rate of the stream - * @param channelMask the channel mask defined in {@link AudioFormat} - */ - // @CalledByNative - public static boolean isOffloadedAudioPlaybackSupported( - int encoding, int sampleRate, int channelMask) { - final AudioFormat format = new AudioFormat.Builder() - .setEncoding(encoding) - .setSampleRate(sampleRate) - .setChannelMask(channelMask) - .build(); - //TODO MP2 needs to pass AudioAttributes for this query, instead of using default attr - return AudioManager.isOffloadedPlaybackSupported(format, - (new AudioAttributes.Builder()).build()); - } -} diff --git a/media/apex/java/android/media/UriDataSourceDesc.java b/media/apex/java/android/media/UriDataSourceDesc.java deleted file mode 100644 index adf7a7ddddb9..000000000000 --- a/media/apex/java/android/media/UriDataSourceDesc.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.net.Uri; - -import java.net.HttpCookie; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Structure of data source descriptor for sources using URI. - * - * Used by {@link MediaPlayer2#setDataSource}, {@link MediaPlayer2#setNextDataSource} and - * {@link MediaPlayer2#setNextDataSources} to set data source for playback. - * - * <p>Users should use {@link Builder} to change {@link UriDataSourceDesc}. - * @hide - */ -public class UriDataSourceDesc extends DataSourceDesc { - private Uri mUri; - private Map<String, String> mHeader; - private List<HttpCookie> mCookies; - - UriDataSourceDesc(String mediaId, long startPositionMs, long endPositionMs, - Uri uri, Map<String, String> header, List<HttpCookie> cookies) { - super(mediaId, startPositionMs, endPositionMs); - mUri = uri; - mHeader = header; - mCookies = cookies; - } - - /** - * Return the Uri of this data source. - * @return the Uri of this data source - */ - public @NonNull Uri getUri() { - return mUri; - } - - /** - * Return the Uri headers of this data source. - * @return the Uri headers of this data source - */ - public @Nullable Map<String, String> getHeaders() { - if (mHeader == null) { - return null; - } - return new HashMap<String, String>(mHeader); - } - - /** - * Return the Uri cookies of this data source. - * @return the Uri cookies of this data source - */ - public @Nullable List<HttpCookie> getCookies() { - if (mCookies == null) { - return null; - } - return new ArrayList<HttpCookie>(mCookies); - } -} diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index 5b535651abd9..53babcb32e4d 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -494,6 +494,19 @@ public class ExifInterface { // See http://www.exiv2.org/makernote.html#R11 private static final int PEF_MAKER_NOTE_SKIP_SIZE = 6; + // See PNG (Portable Network Graphics) Specification, Version 1.2, + // 3.1. PNG file signature + private static final byte[] PNG_SIGNATURE = new byte[] {(byte) 0x89, (byte) 0x50, (byte) 0x4e, + (byte) 0x47, (byte) 0x0d, (byte) 0x0a, (byte) 0x1a, (byte) 0x0a}; + // See PNG (Portable Network Graphics) Specification, Version 1.2, + // 3.7. eXIf Exchangeable Image File (Exif) Profile + private static final byte[] PNG_CHUNK_TYPE_EXIF = new byte[]{(byte) 0x65, (byte) 0x58, + (byte) 0x49, (byte) 0x66}; + private static final byte[] PNG_CHUNK_TYPE_IEND = new byte[]{(byte) 0x49, (byte) 0x45, + (byte) 0x4e, (byte) 0x44}; + private static final int PNG_CHUNK_LENGTH_BYTE_LENGTH = 4; + private static final int PNG_CHUNK_CRC_BYTE_LENGTH = 4; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static SimpleDateFormat sFormatter; private static SimpleDateFormat sFormatterTz; @@ -1311,6 +1324,7 @@ public class ExifInterface { private static final int IMAGE_TYPE_RW2 = 10; private static final int IMAGE_TYPE_SRW = 11; private static final int IMAGE_TYPE_HEIF = 12; + private static final int IMAGE_TYPE_PNG = 13; static { sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss"); @@ -1811,6 +1825,10 @@ public class ExifInterface { getRw2Attributes(inputStream); break; } + case IMAGE_TYPE_PNG: { + getPngAttributes(inputStream); + break; + } case IMAGE_TYPE_ARW: case IMAGE_TYPE_CR2: case IMAGE_TYPE_DNG: @@ -2024,6 +2042,7 @@ public class ExifInterface { if (in.skip(mThumbnailOffset) != mThumbnailOffset) { throw new IOException("Corrupted image"); } + // TODO: Need to handle potential OutOfMemoryError byte[] buffer = new byte[mThumbnailLength]; if (in.read(buffer) != mThumbnailLength) { throw new IOException("Corrupted image"); @@ -2363,6 +2382,8 @@ public class ExifInterface { return IMAGE_TYPE_ORF; } else if (isRw2Format(signatureCheckBytes)) { return IMAGE_TYPE_RW2; + } else if (isPngFormat(signatureCheckBytes)) { + return IMAGE_TYPE_PNG; } // Certain file formats (PEF) are identified in readImageFileDirectory() return IMAGE_TYPE_UNKNOWN; @@ -2478,16 +2499,24 @@ public class ExifInterface { * http://fileformats.archiveteam.org/wiki/Olympus_ORF */ private boolean isOrfFormat(byte[] signatureCheckBytes) throws IOException { - ByteOrderedDataInputStream signatureInputStream = - new ByteOrderedDataInputStream(signatureCheckBytes); - // Read byte order - mExifByteOrder = readByteOrder(signatureInputStream); - // Set byte order - signatureInputStream.setByteOrder(mExifByteOrder); + ByteOrderedDataInputStream signatureInputStream = null; - short orfSignature = signatureInputStream.readShort(); - if (orfSignature == ORF_SIGNATURE_1 || orfSignature == ORF_SIGNATURE_2) { - return true; + try { + signatureInputStream = new ByteOrderedDataInputStream(signatureCheckBytes); + + // Read byte order + mExifByteOrder = readByteOrder(signatureInputStream); + // Set byte order + signatureInputStream.setByteOrder(mExifByteOrder); + + short orfSignature = signatureInputStream.readShort(); + return orfSignature == ORF_SIGNATURE_1 || orfSignature == ORF_SIGNATURE_2; + } catch (Exception e) { + // Do nothing + } finally { + if (signatureInputStream != null) { + signatureInputStream.close(); + } } return false; } @@ -2497,21 +2526,43 @@ public class ExifInterface { * See http://lclevy.free.fr/raw/ */ private boolean isRw2Format(byte[] signatureCheckBytes) throws IOException { - ByteOrderedDataInputStream signatureInputStream = - new ByteOrderedDataInputStream(signatureCheckBytes); - // Read byte order - mExifByteOrder = readByteOrder(signatureInputStream); - // Set byte order - signatureInputStream.setByteOrder(mExifByteOrder); + ByteOrderedDataInputStream signatureInputStream = null; - short signatureByte = signatureInputStream.readShort(); - if (signatureByte == RW2_SIGNATURE) { - return true; + try { + signatureInputStream = new ByteOrderedDataInputStream(signatureCheckBytes); + + // Read byte order + mExifByteOrder = readByteOrder(signatureInputStream); + // Set byte order + signatureInputStream.setByteOrder(mExifByteOrder); + + short signatureByte = signatureInputStream.readShort(); + signatureInputStream.close(); + return signatureByte == RW2_SIGNATURE; + } catch (Exception e) { + // Do nothing + } finally { + if (signatureInputStream != null) { + signatureInputStream.close(); + } } return false; } /** + * PNG's file signature is first 8 bytes. + * See PNG (Portable Network Graphics) Specification, Version 1.2, 3.1. PNG file signature + */ + private boolean isPngFormat(byte[] signatureCheckBytes) throws IOException { + for (int i = 0; i < PNG_SIGNATURE.length; i++) { + if (signatureCheckBytes[i] != PNG_SIGNATURE[i]) { + return false; + } + } + return true; + } + + /** * Loads EXIF attributes from a JPEG input stream. * * @param in The input stream that starts with the JPEG data. @@ -2585,7 +2636,7 @@ public class ExifInterface { readExifSegment(value, imageType); - // Save offset values for createJpegThumbnailBitmap() function + // Save offset values for handleThumbnailFromJfif() function mExifOffset = (int) offset; } else if (ArrayUtils.startsWith(bytes, IDENTIFIER_XMP_APP1)) { // See XMP Specification Part 3: Storage in Files, 1.1.3 JPEG, Table 6 @@ -2886,6 +2937,7 @@ public class ExifInterface { throw new IOException("Invalid identifier"); } + // TODO: Need to handle potential OutOfMemoryError byte[] bytes = new byte[length]; if (in.read(bytes) != length) { throw new IOException("Can't read exif"); @@ -3012,6 +3064,64 @@ public class ExifInterface { } } + // PNG contains the EXIF data as a Special-Purpose Chunk + private void getPngAttributes(ByteOrderedDataInputStream in) throws IOException { + if (DEBUG) { + Log.d(TAG, "getPngAttributes starting with: " + in); + } + + // PNG uses Big Endian by default. + // See PNG (Portable Network Graphics) Specification, Version 1.2, + // 2.1. Integers and byte order + in.setByteOrder(ByteOrder.BIG_ENDIAN); + + // Skip the signature bytes + in.seek(PNG_SIGNATURE.length); + + try { + while (true) { + // Each chunk is made up of four parts: + // 1) Length: 4-byte unsigned integer indicating the number of bytes in the + // Chunk Data field. Excludes Chunk Type and CRC bytes. + // 2) Chunk Type: 4-byte chunk type code. + // 3) Chunk Data: The data bytes. Can be zero-length. + // 4) CRC: 4-byte data calculated on the preceding bytes in the chunk. Always + // present. + // --> 4 (length bytes) + 4 (type bytes) + X (data bytes) + 4 (CRC bytes) + // See PNG (Portable Network Graphics) Specification, Version 1.2, + // 3.2. Chunk layout + int length = in.readInt(); + + byte[] type = new byte[PNG_CHUNK_LENGTH_BYTE_LENGTH]; + if (in.read(type) != type.length) { + throw new IOException("Encountered invalid length while parsing PNG chunk" + + "type"); + } + + if (Arrays.equals(type, PNG_CHUNK_TYPE_IEND)) { + // IEND marks the end of the image. + break; + } else if (Arrays.equals(type, PNG_CHUNK_TYPE_EXIF)) { + // TODO: Need to handle potential OutOfMemoryError + byte[] data = new byte[length]; + if (in.read(data) != length) { + throw new IOException("Failed to read given length for given PNG chunk " + + "type: " + byteArrayToHexString(type)); + } + readExifSegment(data, IFD_TYPE_PRIMARY); + break; + } else { + // Skip to next chunk + in.skipBytes(length + PNG_CHUNK_CRC_BYTE_LENGTH); + } + } + } catch (EOFException e) { + // Should not reach here. Will only reach here if the file is corrupted or + // does not follow the PNG specifications + throw new IOException("Encountered corrupt PNG file."); + } + } + // Stores a new JPEG image with EXIF attributes into a given output stream. private void saveJpegAttributes(InputStream inputStream, OutputStream outputStream) throws IOException { @@ -3517,6 +3627,7 @@ public class ExifInterface { if (mFilename == null && mAssetInputStream == null && mSeekableFileDescriptor == null) { + // TODO: Need to handle potential OutOfMemoryError // Save the thumbnail in memory if the input doesn't support reading again. byte[] thumbnailBytes = new byte[thumbnailLength]; in.seek(thumbnailOffset); @@ -3550,6 +3661,7 @@ public class ExifInterface { return; } + // TODO: Need to handle potential OutOfMemoryError // Set thumbnail byte array data for non-consecutive strip bytes byte[] totalStripBytes = new byte[(int) Arrays.stream(stripByteCounts).sum()]; @@ -3568,6 +3680,7 @@ public class ExifInterface { in.seek(skipBytes); bytesRead += skipBytes; + // TODO: Need to handle potential OutOfMemoryError // Read strip bytes byte[] stripBytes = new byte[stripByteCount]; in.read(stripBytes); @@ -4367,4 +4480,12 @@ public class ExifInterface { } return null; } + + private static String byteArrayToHexString(byte[] bytes) { + StringBuilder sb = new StringBuilder(bytes.length * 2); + for (int i = 0; i < bytes.length; i++) { + sb.append(String.format("%02x", bytes[i])); + } + return sb.toString(); + } } diff --git a/media/jni/Android.bp b/media/jni/Android.bp index 84fe27de15ab..378064d63af4 100644 --- a/media/jni/Android.bp +++ b/media/jni/Android.bp @@ -113,88 +113,6 @@ cc_library_shared { ], } -cc_library_shared { - name: "libmedia2_jni", - - srcs: [ - "android_media_DataSourceCallback.cpp", - "android_media_MediaMetricsJNI.cpp", - "android_media_MediaPlayer2.cpp", - "android_media_SyncParams.cpp", - ], - - shared_libs: [ - // NDK or LLNDK or NDK-compliant - "libandroid", - "libbinder_ndk", - "libcgrouprc", - "libmediandk", - "libmediametrics", - "libnativehelper_compat_libc++", - "liblog", - "libvndksupport", - ], - - header_libs: [ - "libhardware_headers", - "libnativewindow_headers", - ], - - static_libs: [ - // MediaCas - "android.hidl.allocator@1.0", - "android.hidl.memory@1.0", - "libhidlbase", - "libhidlmemory", - "libbinderthreadstate", - - // MediaPlayer2 implementation - "libbase", - "libcrypto", - "libcutils", - "libjsoncpp", - "libmedia_player2_util", - "libmediaplayer2", - "libmediaplayer2-protos", - "libmediandk_utils", - "libmediautils", - "libprocessgroup", - "libprotobuf-cpp-lite", - "libstagefright_esds", - "libstagefright_foundation_without_imemory", - "libstagefright_httplive", - "libstagefright_id3", - "libstagefright_mpeg2support", - "libstagefright_nuplayer2", - "libstagefright_player2", - "libstagefright_rtsp_player2", - "libstagefright_timedtext2", - "libutils", - "libmedia2_jni_core", - ], - - group_static_libs: true, - - include_dirs: [ - "frameworks/base/core/jni", - "frameworks/native/include/media/openmax", - "system/media/camera/include", - ], - - export_include_dirs: ["."], - - cflags: [ - "-Wall", - "-Werror", - "-Wno-error=deprecated-declarations", - "-Wunused", - "-Wunreachable-code", - "-fvisibility=hidden", - ], - - ldflags: ["-Wl,--exclude-libs=ALL,-error-limit=0"], -} - subdirs = [ "audioeffect", "soundpool", diff --git a/media/jni/android_media_DataSourceCallback.cpp b/media/jni/android_media_DataSourceCallback.cpp deleted file mode 100644 index c91d4095a32f..000000000000 --- a/media/jni/android_media_DataSourceCallback.cpp +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright 2017, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -//#define LOG_NDEBUG 0 -#define LOG_TAG "JDataSourceCallback-JNI" -#include <utils/Log.h> - -#include "android_media_DataSourceCallback.h" - -#include "log/log.h" -#include "jni.h" -#include <nativehelper/JNIHelp.h> - -#include <drm/drm_framework_common.h> -#include <mediaplayer2/JavaVMHelper.h> -#include <media/stagefright/foundation/ADebug.h> -#include <nativehelper/ScopedLocalRef.h> - -namespace android { - -static const size_t kBufferSize = 64 * 1024; - -JDataSourceCallback::JDataSourceCallback(JNIEnv* env, jobject source) - : mJavaObjStatus(OK), - mSizeIsCached(false), - mCachedSize(0) { - mDataSourceCallbackObj = env->NewGlobalRef(source); - CHECK(mDataSourceCallbackObj != NULL); - - ScopedLocalRef<jclass> media2DataSourceClass(env, env->GetObjectClass(mDataSourceCallbackObj)); - CHECK(media2DataSourceClass.get() != NULL); - - mReadAtMethod = env->GetMethodID(media2DataSourceClass.get(), "readAt", "(J[BII)I"); - CHECK(mReadAtMethod != NULL); - mGetSizeMethod = env->GetMethodID(media2DataSourceClass.get(), "getSize", "()J"); - CHECK(mGetSizeMethod != NULL); - mCloseMethod = env->GetMethodID(media2DataSourceClass.get(), "close", "()V"); - CHECK(mCloseMethod != NULL); - - ScopedLocalRef<jbyteArray> tmp(env, env->NewByteArray(kBufferSize)); - mByteArrayObj = (jbyteArray)env->NewGlobalRef(tmp.get()); - CHECK(mByteArrayObj != NULL); -} - -JDataSourceCallback::~JDataSourceCallback() { - JNIEnv* env = JavaVMHelper::getJNIEnv(); - env->DeleteGlobalRef(mDataSourceCallbackObj); - env->DeleteGlobalRef(mByteArrayObj); -} - -status_t JDataSourceCallback::initCheck() const { - return OK; -} - -ssize_t JDataSourceCallback::readAt(off64_t offset, void *data, size_t size) { - Mutex::Autolock lock(mLock); - - if (mJavaObjStatus != OK) { - return -1; - } - if (size > kBufferSize) { - size = kBufferSize; - } - - JNIEnv* env = JavaVMHelper::getJNIEnv(); - jint numread = env->CallIntMethod(mDataSourceCallbackObj, mReadAtMethod, - (jlong)offset, mByteArrayObj, (jint)0, (jint)size); - if (env->ExceptionCheck()) { - ALOGW("An exception occurred in readAt()"); - jniLogException(env, ANDROID_LOG_WARN, LOG_TAG); - env->ExceptionClear(); - mJavaObjStatus = UNKNOWN_ERROR; - return -1; - } - if (numread < 0) { - if (numread != -1) { - ALOGW("An error occurred in readAt()"); - mJavaObjStatus = UNKNOWN_ERROR; - return -1; - } else { - // numread == -1 indicates EOF - return 0; - } - } - if ((size_t)numread > size) { - ALOGE("readAt read too many bytes."); - mJavaObjStatus = UNKNOWN_ERROR; - return -1; - } - - ALOGV("readAt %lld / %zu => %d.", (long long)offset, size, numread); - env->GetByteArrayRegion(mByteArrayObj, 0, numread, (jbyte*)data); - return numread; -} - -status_t JDataSourceCallback::getSize(off64_t* size) { - Mutex::Autolock lock(mLock); - - if (mJavaObjStatus != OK) { - return UNKNOWN_ERROR; - } - if (mSizeIsCached) { - *size = mCachedSize; - return OK; - } - - JNIEnv* env = JavaVMHelper::getJNIEnv(); - *size = env->CallLongMethod(mDataSourceCallbackObj, mGetSizeMethod); - if (env->ExceptionCheck()) { - ALOGW("An exception occurred in getSize()"); - jniLogException(env, ANDROID_LOG_WARN, LOG_TAG); - env->ExceptionClear(); - // After returning an error, size shouldn't be used by callers. - *size = UNKNOWN_ERROR; - mJavaObjStatus = UNKNOWN_ERROR; - return UNKNOWN_ERROR; - } - - // The minimum size should be -1, which indicates unknown size. - if (*size < 0) { - *size = -1; - } - - mCachedSize = *size; - mSizeIsCached = true; - return OK; -} - -void JDataSourceCallback::close() { - Mutex::Autolock lock(mLock); - - JNIEnv* env = JavaVMHelper::getJNIEnv(); - env->CallVoidMethod(mDataSourceCallbackObj, mCloseMethod); - // The closed state is effectively the same as an error state. - mJavaObjStatus = UNKNOWN_ERROR; -} - -String8 JDataSourceCallback::toString() { - return String8::format("JDataSourceCallback(pid %d, uid %d)", getpid(), getuid()); -} - -String8 JDataSourceCallback::getMIMEType() const { - return String8("application/octet-stream"); -} - -} // namespace android diff --git a/media/jni/android_media_DataSourceCallback.h b/media/jni/android_media_DataSourceCallback.h deleted file mode 100644 index 5bde682754f3..000000000000 --- a/media/jni/android_media_DataSourceCallback.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2017, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _ANDROID_MEDIA_DATASOURCECALLBACK_H_ -#define _ANDROID_MEDIA_DATASOURCECALLBACK_H_ - -#include "jni.h" - -#include <media/DataSource.h> -#include <media/stagefright/foundation/ABase.h> -#include <utils/Errors.h> -#include <utils/Mutex.h> - -namespace android { - -// The native counterpart to a Java android.media.DataSourceCallback. It inherits from -// DataSource. -// -// If the java DataSource returns an error or throws an exception it -// will be considered to be in a broken state, and the only further call this -// will make is to close(). -class JDataSourceCallback : public DataSource { -public: - JDataSourceCallback(JNIEnv *env, jobject source); - virtual ~JDataSourceCallback(); - - virtual status_t initCheck() const override; - virtual ssize_t readAt(off64_t offset, void *data, size_t size) override; - virtual status_t getSize(off64_t *size) override; - - virtual String8 toString() override; - virtual String8 getMIMEType() const override; - virtual void close() override; -private: - // Protect all member variables with mLock because this object will be - // accessed on different threads. - Mutex mLock; - - // The status of the java DataSource. Set to OK unless an error occurred or - // close() was called. - status_t mJavaObjStatus; - // Only call the java getSize() once so the app can't change the size on us. - bool mSizeIsCached; - off64_t mCachedSize; - - jobject mDataSourceCallbackObj; - jmethodID mReadAtMethod; - jmethodID mGetSizeMethod; - jmethodID mCloseMethod; - jbyteArray mByteArrayObj; - - DISALLOW_EVIL_CONSTRUCTORS(JDataSourceCallback); -}; - -} // namespace android - -#endif // _ANDROID_MEDIA_DATASOURCECALLBACK_H_ diff --git a/media/jni/android_media_MediaMetricsJNI.cpp b/media/jni/android_media_MediaMetricsJNI.cpp index de60b085b87d..e7487c3cbc67 100644 --- a/media/jni/android_media_MediaMetricsJNI.cpp +++ b/media/jni/android_media_MediaMetricsJNI.cpp @@ -23,9 +23,8 @@ #include <media/MediaAnalyticsItem.h> -// This source file is compiled and linked into both: +// This source file is compiled and linked into: // core/jni/ (libandroid_runtime.so) -// media/jni (libmedia2_jni.so) namespace android { diff --git a/media/jni/android_media_MediaPlayer2.cpp b/media/jni/android_media_MediaPlayer2.cpp deleted file mode 100644 index 306916121740..000000000000 --- a/media/jni/android_media_MediaPlayer2.cpp +++ /dev/null @@ -1,1477 +0,0 @@ -/* -** -** Copyright 2017, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -//#define LOG_NDEBUG 0 -#define LOG_TAG "MediaPlayer2-JNI" -#include "utils/Log.h" - -#include <sys/stat.h> - -#include <media/AudioResamplerPublic.h> -#include <media/DataSourceDesc.h> -#include <media/MediaHTTPService.h> -#include <media/MediaAnalyticsItem.h> -#include <media/NdkWrapper.h> -#include <media/stagefright/Utils.h> -#include <media/stagefright/foundation/ByteUtils.h> // for FOURCC definition -#include <mediaplayer2/JAudioTrack.h> -#include <mediaplayer2/JavaVMHelper.h> -#include <mediaplayer2/JMedia2HTTPService.h> -#include <mediaplayer2/mediaplayer2.h> -#include <stdio.h> -#include <assert.h> -#include <limits.h> -#include <unistd.h> -#include <fcntl.h> -#include <utils/threads.h> -#include "jni.h" -#include <nativehelper/JNIHelp.h> -#include "android/native_window_jni.h" -#include "log/log.h" -#include "utils/Errors.h" // for status_t -#include "utils/KeyedVector.h" -#include "utils/String8.h" -#include "android_media_BufferingParams.h" -#include "android_media_DataSourceCallback.h" -#include "android_media_MediaMetricsJNI.h" -#include "android_media_PlaybackParams.h" -#include "android_media_SyncParams.h" -#include "android_media_VolumeShaper.h" - -#include "android_os_Parcel.h" -#include "android_util_Binder.h" -#include <binder/Parcel.h> - -#include "mediaplayer2.pb.h" - -using android::media::MediaPlayer2Proto::PlayerMessage; - -// Modular DRM begin -#define FIND_CLASS(var, className) \ -var = env->FindClass(className); \ -LOG_FATAL_IF(! (var), "Unable to find class " className); - -#define GET_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \ -var = env->GetMethodID(clazz, fieldName, fieldDescriptor); \ -LOG_FATAL_IF(! (var), "Unable to find method " fieldName); - -struct StateExceptionFields { - jmethodID init; - jclass classId; -}; - -static StateExceptionFields gStateExceptionFields; -// Modular DRM end - -// ---------------------------------------------------------------------------- - -using namespace android; - -using media::VolumeShaper; - -// ---------------------------------------------------------------------------- - -struct fields_t { - jfieldID context; // passed from Java to native, used for creating JWakeLock - jfieldID nativeContext; // mNativeContext in MediaPlayer2.java - jfieldID surface_texture; - - jmethodID post_event; - - jmethodID proxyConfigGetHost; - jmethodID proxyConfigGetPort; - jmethodID proxyConfigGetExclusionList; -}; -static fields_t fields; - -static BufferingParams::fields_t gBufferingParamsFields; -static PlaybackParams::fields_t gPlaybackParamsFields; -static SyncParams::fields_t gSyncParamsFields; -static VolumeShaperHelper::fields_t gVolumeShaperFields; - -static Mutex sLock; - -static bool ConvertKeyValueArraysToKeyedVector( - JNIEnv *env, jobjectArray keys, jobjectArray values, - KeyedVector<String8, String8>* keyedVector) { - - int nKeyValuePairs = 0; - bool failed = false; - if (keys != NULL && values != NULL) { - nKeyValuePairs = env->GetArrayLength(keys); - failed = (nKeyValuePairs != env->GetArrayLength(values)); - } - - if (!failed) { - failed = ((keys != NULL && values == NULL) || - (keys == NULL && values != NULL)); - } - - if (failed) { - ALOGE("keys and values arrays have different length"); - jniThrowException(env, "java/lang/IllegalArgumentException", NULL); - return false; - } - - for (int i = 0; i < nKeyValuePairs; ++i) { - // No need to check on the ArrayIndexOutOfBoundsException, since - // it won't happen here. - jstring key = (jstring) env->GetObjectArrayElement(keys, i); - jstring value = (jstring) env->GetObjectArrayElement(values, i); - - const char* keyStr = env->GetStringUTFChars(key, NULL); - if (!keyStr) { // OutOfMemoryError - return false; - } - - const char* valueStr = env->GetStringUTFChars(value, NULL); - if (!valueStr) { // OutOfMemoryError - env->ReleaseStringUTFChars(key, keyStr); - return false; - } - - keyedVector->add(String8(keyStr), String8(valueStr)); - - env->ReleaseStringUTFChars(key, keyStr); - env->ReleaseStringUTFChars(value, valueStr); - env->DeleteLocalRef(key); - env->DeleteLocalRef(value); - } - return true; -} - -// ---------------------------------------------------------------------------- -// ref-counted object for callbacks -class JNIMediaPlayer2Listener: public MediaPlayer2Listener -{ -public: - JNIMediaPlayer2Listener(JNIEnv* env, jobject thiz, jobject weak_thiz); - ~JNIMediaPlayer2Listener(); - virtual void notify(int64_t srcId, int msg, int ext1, int ext2, - const PlayerMessage *obj = NULL) override; -private: - JNIMediaPlayer2Listener(); - jclass mClass; // Reference to MediaPlayer2 class - jobject mObject; // Weak ref to MediaPlayer2 Java object to call on -}; - -JNIMediaPlayer2Listener::JNIMediaPlayer2Listener(JNIEnv* env, jobject thiz, jobject weak_thiz) -{ - - // Hold onto the MediaPlayer2 class for use in calling the static method - // that posts events to the application thread. - jclass clazz = env->GetObjectClass(thiz); - if (clazz == NULL) { - ALOGE("Can't find android/media/MediaPlayer2"); - jniThrowException(env, "java/lang/Exception", NULL); - return; - } - mClass = (jclass)env->NewGlobalRef(clazz); - - // We use a weak reference so the MediaPlayer2 object can be garbage collected. - // The reference is only used as a proxy for callbacks. - mObject = env->NewGlobalRef(weak_thiz); -} - -JNIMediaPlayer2Listener::~JNIMediaPlayer2Listener() -{ - // remove global references - JNIEnv *env = JavaVMHelper::getJNIEnv(); - env->DeleteGlobalRef(mObject); - env->DeleteGlobalRef(mClass); -} - -void JNIMediaPlayer2Listener::notify(int64_t srcId, int msg, int ext1, int ext2, - const PlayerMessage* obj) -{ - JNIEnv *env = JavaVMHelper::getJNIEnv(); - if (obj != NULL) { - int size = obj->ByteSize(); - jbyte* temp = new jbyte[size]; - obj->SerializeToArray(temp, size); - - // return the response as a byte array. - jbyteArray out = env->NewByteArray(size); - env->SetByteArrayRegion(out, 0, size, temp); - env->CallStaticVoidMethod(mClass, fields.post_event, mObject, - srcId, msg, ext1, ext2, out); - delete[] temp; - } else { - env->CallStaticVoidMethod(mClass, fields.post_event, mObject, - srcId, msg, ext1, ext2, NULL); - } - if (env->ExceptionCheck()) { - ALOGW("An exception occurred while notifying an event."); - jniLogException(env, ANDROID_LOG_WARN, LOG_TAG); - env->ExceptionClear(); - } -} - -// ---------------------------------------------------------------------------- - -static sp<MediaPlayer2> getMediaPlayer(JNIEnv* env, jobject thiz) -{ - Mutex::Autolock l(sLock); - MediaPlayer2* const p = (MediaPlayer2*)env->GetLongField(thiz, fields.nativeContext); - return sp<MediaPlayer2>(p); -} - -static sp<MediaPlayer2> setMediaPlayer(JNIEnv* env, jobject thiz, const sp<MediaPlayer2>& player) -{ - Mutex::Autolock l(sLock); - sp<MediaPlayer2> old = (MediaPlayer2*)env->GetLongField(thiz, fields.nativeContext); - if (player.get()) { - player->incStrong((void*)setMediaPlayer); - } - if (old != 0) { - old->decStrong((void*)setMediaPlayer); - } - env->SetLongField(thiz, fields.nativeContext, (jlong)player.get()); - return old; -} - -// If exception is NULL and opStatus is not OK, this method sends an error -// event to the client application; otherwise, if exception is not NULL and -// opStatus is not OK, this method throws the given exception to the client -// application. -static void process_media_player_call( - JNIEnv *env, jobject thiz, status_t opStatus, const char* exception, const char *message) -{ - if (exception == NULL) { // Don't throw exception. Instead, send an event. - if (opStatus != (status_t) OK) { - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp != 0) { - int64_t srcId = 0; - mp->getSrcId(&srcId); - mp->notify(srcId, MEDIA2_ERROR, opStatus, 0); - } - } - } else { // Throw exception! - if ( opStatus == (status_t) INVALID_OPERATION ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - } else if ( opStatus == (status_t) BAD_VALUE ) { - jniThrowException(env, "java/lang/IllegalArgumentException", NULL); - } else if ( opStatus == (status_t) PERMISSION_DENIED ) { - jniThrowException(env, "java/lang/SecurityException", NULL); - } else if ( opStatus != (status_t) OK ) { - if (strlen(message) > 230) { - // if the message is too long, don't bother displaying the status code - jniThrowException( env, exception, message); - } else { - char msg[256]; - // append the status code to the message - sprintf(msg, "%s: status=0x%X", message, opStatus); - jniThrowException( env, exception, msg); - } - } - } -} - -static void -android_media_MediaPlayer2_handleDataSourceUrl( - JNIEnv *env, jobject thiz, jboolean isCurrent, jlong srcId, - jobject httpServiceObj, jstring path, jobjectArray keys, jobjectArray values, - jlong startPos, jlong endPos) { - - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - if (path == NULL) { - jniThrowException(env, "java/lang/IllegalArgumentException", NULL); - return; - } - - const char *tmp = env->GetStringUTFChars(path, NULL); - if (tmp == NULL) { // Out of memory - return; - } - ALOGV("handleDataSourceUrl: path %s, srcId %lld, start %lld, end %lld", - tmp, (long long)srcId, (long long)startPos, (long long)endPos); - - if (strncmp(tmp, "content://", 10) == 0) { - ALOGE("handleDataSourceUrl: content scheme is not supported in native code"); - jniThrowException(env, "java/io/IOException", - "content scheme is not supported in native code"); - return; - } - - sp<DataSourceDesc> dsd = new DataSourceDesc(); - dsd->mId = srcId; - dsd->mType = DataSourceDesc::TYPE_URL; - dsd->mUrl = tmp; - dsd->mStartPositionMs = startPos; - dsd->mEndPositionMs = endPos; - - env->ReleaseStringUTFChars(path, tmp); - tmp = NULL; - - // We build a KeyedVector out of the key and val arrays - if (!ConvertKeyValueArraysToKeyedVector( - env, keys, values, &dsd->mHeaders)) { - return; - } - - sp<MediaHTTPService> httpService; - if (httpServiceObj != NULL) { - httpService = new JMedia2HTTPService(env, httpServiceObj); - } - dsd->mHttpService = httpService; - - status_t err; - if (isCurrent) { - err = mp->setDataSource(dsd); - } else { - err = mp->prepareNextDataSource(dsd); - } - process_media_player_call(env, thiz, err, - "java/io/IOException", "handleDataSourceUrl failed." ); -} - -static void -android_media_MediaPlayer2_handleDataSourceFD( - JNIEnv *env, jobject thiz, jboolean isCurrent, jlong srcId, - jobject fileDescriptor, jlong offset, jlong length, - jlong startPos, jlong endPos) { - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - if (fileDescriptor == NULL) { - jniThrowException(env, "java/lang/IllegalArgumentException", NULL); - return; - } - int fd = jniGetFDFromFileDescriptor(env, fileDescriptor); - ALOGV("handleDataSourceFD: srcId=%lld, fd=%d (%s), offset=%lld, length=%lld, " - "start=%lld, end=%lld", - (long long)srcId, fd, nameForFd(fd).c_str(), (long long)offset, (long long)length, - (long long)startPos, (long long)endPos); - - struct stat sb; - int ret = fstat(fd, &sb); - if (ret != 0) { - ALOGE("handleDataSourceFD: fstat(%d) failed: %d, %s", fd, ret, strerror(errno)); - jniThrowException(env, "java/io/IOException", "handleDataSourceFD failed fstat"); - return; - } - - ALOGV("st_dev = %llu", static_cast<unsigned long long>(sb.st_dev)); - ALOGV("st_mode = %u", sb.st_mode); - ALOGV("st_uid = %lu", static_cast<unsigned long>(sb.st_uid)); - ALOGV("st_gid = %lu", static_cast<unsigned long>(sb.st_gid)); - ALOGV("st_size = %llu", static_cast<unsigned long long>(sb.st_size)); - - if (offset >= sb.st_size) { - ALOGE("handleDataSourceFD: offset is out of range"); - jniThrowException(env, "java/lang/IllegalArgumentException", - "handleDataSourceFD failed, offset is out of range."); - return; - } - if (offset + length > sb.st_size) { - length = sb.st_size - offset; - ALOGV("handleDataSourceFD: adjusted length = %lld", (long long)length); - } - - sp<DataSourceDesc> dsd = new DataSourceDesc(); - dsd->mId = srcId; - dsd->mType = DataSourceDesc::TYPE_FD; - dsd->mFD = fd; - dsd->mFDOffset = offset; - dsd->mFDLength = length; - dsd->mStartPositionMs = startPos; - dsd->mEndPositionMs = endPos; - - status_t err; - if (isCurrent) { - err = mp->setDataSource(dsd); - } else { - err = mp->prepareNextDataSource(dsd); - } - process_media_player_call(env, thiz, err, - "java/io/IOException", "handleDataSourceFD failed." ); -} - -static void -android_media_MediaPlayer2_handleDataSourceCallback( - JNIEnv *env, jobject thiz, jboolean isCurrent, jlong srcId, jobject dataSource, - jlong startPos, jlong endPos) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - if (dataSource == NULL) { - jniThrowException(env, "java/lang/IllegalArgumentException", NULL); - return; - } - sp<DataSource> callbackDataSource = new JDataSourceCallback(env, dataSource); - sp<DataSourceDesc> dsd = new DataSourceDesc(); - dsd->mId = srcId; - dsd->mType = DataSourceDesc::TYPE_CALLBACK; - dsd->mCallbackSource = callbackDataSource; - dsd->mStartPositionMs = startPos; - dsd->mEndPositionMs = endPos; - - status_t err; - if (isCurrent) { - err = mp->setDataSource(dsd); - } else { - err = mp->prepareNextDataSource(dsd); - } - process_media_player_call(env, thiz, err, - "java/lang/RuntimeException", "handleDataSourceCallback failed." ); -} - -static sp<ANativeWindowWrapper> -getVideoSurfaceTexture(JNIEnv* env, jobject thiz) { - ANativeWindow * const p = (ANativeWindow*)env->GetLongField(thiz, fields.surface_texture); - return new ANativeWindowWrapper(p); -} - -static void -decVideoSurfaceRef(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - return; - } - - ANativeWindow * const old_anw = (ANativeWindow*)env->GetLongField(thiz, fields.surface_texture); - if (old_anw != NULL) { - ANativeWindow_release(old_anw); - env->SetLongField(thiz, fields.surface_texture, (jlong)NULL); - } -} - -static void -setVideoSurface(JNIEnv *env, jobject thiz, jobject jsurface, jboolean mediaPlayerMustBeAlive) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - if (mediaPlayerMustBeAlive) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - } - return; - } - - decVideoSurfaceRef(env, thiz); - - ANativeWindow* anw = NULL; - if (jsurface) { - anw = ANativeWindow_fromSurface(env, jsurface); - if (anw == NULL) { - jniThrowException(env, "java/lang/IllegalArgumentException", - "The surface has been released"); - return; - } - } - - env->SetLongField(thiz, fields.surface_texture, (jlong)anw); - - // This will fail if the media player has not been initialized yet. This - // can be the case if setDisplay() on MediaPlayer2.java has been called - // before setDataSource(). The redundant call to setVideoSurfaceTexture() - // in prepare/prepare covers for this case. - mp->setVideoSurfaceTexture(new ANativeWindowWrapper(anw)); -} - -static void -android_media_MediaPlayer2_setVideoSurface(JNIEnv *env, jobject thiz, jobject jsurface) -{ - setVideoSurface(env, thiz, jsurface, true /* mediaPlayerMustBeAlive */); -} - -static jobject -android_media_MediaPlayer2_getBufferingParams(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return NULL; - } - - BufferingParams bp; - BufferingSettings &settings = bp.settings; - process_media_player_call( - env, thiz, mp->getBufferingSettings(&settings), - "java/lang/IllegalStateException", "unexpected error"); - if (env->ExceptionCheck()) { - return nullptr; - } - ALOGV("getBufferingSettings:{%s}", settings.toString().string()); - - return bp.asJobject(env, gBufferingParamsFields); -} - -static void -android_media_MediaPlayer2_setBufferingParams(JNIEnv *env, jobject thiz, jobject params) -{ - if (params == NULL) { - return; - } - - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - BufferingParams bp; - bp.fillFromJobject(env, gBufferingParamsFields, params); - ALOGV("setBufferingParams:{%s}", bp.settings.toString().string()); - - process_media_player_call( - env, thiz, mp->setBufferingSettings(bp.settings), - "java/lang/IllegalStateException", "unexpected error"); -} - -static void -android_media_MediaPlayer2_playNextDataSource(JNIEnv *env, jobject thiz, jlong srcId) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - process_media_player_call(env, thiz, mp->playNextDataSource((int64_t)srcId), - "java/io/IOException", "playNextDataSource failed." ); -} - -static void -android_media_MediaPlayer2_prepare(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - // Handle the case where the display surface was set before the mp was - // initialized. We try again to make it stick. - sp<ANativeWindowWrapper> st = getVideoSurfaceTexture(env, thiz); - mp->setVideoSurfaceTexture(st); - - process_media_player_call( env, thiz, mp->prepareAsync(), "java/io/IOException", "Prepare Async failed." ); -} - -static void -android_media_MediaPlayer2_start(JNIEnv *env, jobject thiz) -{ - ALOGV("start"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->start(), NULL, NULL ); -} - -static void -android_media_MediaPlayer2_pause(JNIEnv *env, jobject thiz) -{ - ALOGV("pause"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->pause(), NULL, NULL ); -} - -static void -android_media_MediaPlayer2_setPlaybackParams(JNIEnv *env, jobject thiz, jobject params) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - PlaybackParams pbp; - pbp.fillFromJobject(env, gPlaybackParamsFields, params); - ALOGV("setPlaybackParams: %d:%f %d:%f %d:%u %d:%u", - pbp.speedSet, pbp.audioRate.mSpeed, - pbp.pitchSet, pbp.audioRate.mPitch, - pbp.audioFallbackModeSet, pbp.audioRate.mFallbackMode, - pbp.audioStretchModeSet, pbp.audioRate.mStretchMode); - - AudioPlaybackRate rate; - status_t err = mp->getPlaybackSettings(&rate); - if (err == OK) { - bool updatedRate = false; - if (pbp.speedSet) { - rate.mSpeed = pbp.audioRate.mSpeed; - updatedRate = true; - } - if (pbp.pitchSet) { - rate.mPitch = pbp.audioRate.mPitch; - updatedRate = true; - } - if (pbp.audioFallbackModeSet) { - rate.mFallbackMode = pbp.audioRate.mFallbackMode; - updatedRate = true; - } - if (pbp.audioStretchModeSet) { - rate.mStretchMode = pbp.audioRate.mStretchMode; - updatedRate = true; - } - if (updatedRate) { - err = mp->setPlaybackSettings(rate); - } - } - process_media_player_call( - env, thiz, err, - "java/lang/IllegalStateException", "unexpected error"); -} - -static jobject -android_media_MediaPlayer2_getPlaybackParams(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return NULL; - } - - PlaybackParams pbp; - AudioPlaybackRate &audioRate = pbp.audioRate; - process_media_player_call( - env, thiz, mp->getPlaybackSettings(&audioRate), - "java/lang/IllegalStateException", "unexpected error"); - if (env->ExceptionCheck()) { - return nullptr; - } - ALOGV("getPlaybackSettings: %f %f %d %d", - audioRate.mSpeed, audioRate.mPitch, audioRate.mFallbackMode, audioRate.mStretchMode); - - pbp.speedSet = true; - pbp.pitchSet = true; - pbp.audioFallbackModeSet = true; - pbp.audioStretchModeSet = true; - - return pbp.asJobject(env, gPlaybackParamsFields); -} - -static void -android_media_MediaPlayer2_setSyncParams(JNIEnv *env, jobject thiz, jobject params) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - SyncParams scp; - scp.fillFromJobject(env, gSyncParamsFields, params); - ALOGV("setSyncParams: %d:%d %d:%d %d:%f %d:%f", - scp.syncSourceSet, scp.sync.mSource, - scp.audioAdjustModeSet, scp.sync.mAudioAdjustMode, - scp.toleranceSet, scp.sync.mTolerance, - scp.frameRateSet, scp.frameRate); - - AVSyncSettings avsync; - float videoFrameRate; - status_t err = mp->getSyncSettings(&avsync, &videoFrameRate); - if (err == OK) { - bool updatedSync = scp.frameRateSet; - if (scp.syncSourceSet) { - avsync.mSource = scp.sync.mSource; - updatedSync = true; - } - if (scp.audioAdjustModeSet) { - avsync.mAudioAdjustMode = scp.sync.mAudioAdjustMode; - updatedSync = true; - } - if (scp.toleranceSet) { - avsync.mTolerance = scp.sync.mTolerance; - updatedSync = true; - } - if (updatedSync) { - err = mp->setSyncSettings(avsync, scp.frameRateSet ? scp.frameRate : -1.f); - } - } - process_media_player_call( - env, thiz, err, - "java/lang/IllegalStateException", "unexpected error"); -} - -static jobject -android_media_MediaPlayer2_getSyncParams(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return NULL; - } - - SyncParams scp; - scp.frameRate = -1.f; - process_media_player_call( - env, thiz, mp->getSyncSettings(&scp.sync, &scp.frameRate), - "java/lang/IllegalStateException", "unexpected error"); - if (env->ExceptionCheck()) { - return nullptr; - } - - ALOGV("getSyncSettings: %d %d %f %f", - scp.sync.mSource, scp.sync.mAudioAdjustMode, scp.sync.mTolerance, scp.frameRate); - - // sanity check params - if (scp.sync.mSource >= AVSYNC_SOURCE_MAX - || scp.sync.mAudioAdjustMode >= AVSYNC_AUDIO_ADJUST_MODE_MAX - || scp.sync.mTolerance < 0.f - || scp.sync.mTolerance >= AVSYNC_TOLERANCE_MAX) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return NULL; - } - - scp.syncSourceSet = true; - scp.audioAdjustModeSet = true; - scp.toleranceSet = true; - scp.frameRateSet = scp.frameRate >= 0.f; - - return scp.asJobject(env, gSyncParamsFields); -} - -static void -android_media_MediaPlayer2_seekTo(JNIEnv *env, jobject thiz, jlong msec, jint mode) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - ALOGV("seekTo: %lld(msec), mode=%d", (long long)msec, mode); - process_media_player_call(env, thiz, mp->seekTo((int64_t)msec, (MediaPlayer2SeekMode)mode), - NULL, NULL); -} - -static jint -android_media_MediaPlayer2_getState(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - return MEDIAPLAYER2_STATE_IDLE; - } - return (jint)mp->getState(); -} - -static jobject -android_media_MediaPlayer2_native_getMetrics(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return 0; - } - - char *buffer = NULL; - size_t length = 0; - status_t status = mp->getMetrics(&buffer, &length); - if (status != OK) { - ALOGD("getMetrics() failed: %d", status); - return (jobject) NULL; - } - - jobject mybundle = MediaMetricsJNI::writeAttributesToBundle(env, NULL, buffer, length); - - free(buffer); - - return mybundle; -} - -static jlong -android_media_MediaPlayer2_getCurrentPosition(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return 0; - } - int64_t msec; - process_media_player_call( env, thiz, mp->getCurrentPosition(&msec), NULL, NULL ); - ALOGV("getCurrentPosition: %lld (msec)", (long long)msec); - return (jlong) msec; -} - -static jlong -android_media_MediaPlayer2_getDuration(JNIEnv *env, jobject thiz, jlong srcId) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return 0; - } - int64_t msec; - process_media_player_call( env, thiz, mp->getDuration(srcId, &msec), NULL, NULL ); - ALOGV("getDuration: %lld (msec)", (long long)msec); - return (jlong) msec; -} - -static void -android_media_MediaPlayer2_reset(JNIEnv *env, jobject thiz) -{ - ALOGV("reset"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->reset(), NULL, NULL ); -} - -static jboolean -android_media_MediaPlayer2_setAudioAttributes(JNIEnv *env, jobject thiz, jobject attributes) -{ - ALOGV("setAudioAttributes"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return false; - } - status_t err = mp->setAudioAttributes(attributes); - return err == OK; -} - -static jobject -android_media_MediaPlayer2_getAudioAttributes(JNIEnv *env, jobject thiz) -{ - ALOGV("getAudioAttributes"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return NULL; - } - - return mp->getAudioAttributes(); -} - -static void -android_media_MediaPlayer2_setLooping(JNIEnv *env, jobject thiz, jboolean looping) -{ - ALOGV("setLooping: %d", looping); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->setLooping(looping), NULL, NULL ); -} - -static jboolean -android_media_MediaPlayer2_isLooping(JNIEnv *env, jobject thiz) -{ - ALOGV("isLooping"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return JNI_FALSE; - } - return mp->isLooping() ? JNI_TRUE : JNI_FALSE; -} - -static void -android_media_MediaPlayer2_setVolume(JNIEnv *env, jobject thiz, jfloat volume) -{ - ALOGV("setVolume: volume %f", (float) volume); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->setVolume((float) volume), NULL, NULL ); -} - -static jbyteArray -android_media_MediaPlayer2_invoke(JNIEnv *env, jobject thiz, jbyteArray requestData) { - sp<MediaPlayer2> media_player = getMediaPlayer(env, thiz); - if (media_player == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return NULL; - } - - // Get the byte[] pointer and data length. - jbyte* pData = env->GetByteArrayElements(requestData, NULL); - jsize pDataLen = env->GetArrayLength(requestData); - - // Deserialize from the byte stream. - PlayerMessage request; - PlayerMessage response; - request.ParseFromArray(pData, pDataLen); - - process_media_player_call( env, thiz, media_player->invoke(request, &response), - "java.lang.RuntimeException", NULL ); - if (env->ExceptionCheck()) { - return NULL; - } - - int size = response.ByteSize(); - jbyte* temp = new jbyte[size]; - response.SerializeToArray(temp, size); - - // return the response as a byte array. - jbyteArray out = env->NewByteArray(size); - env->SetByteArrayRegion(out, 0, size, temp); - delete[] temp; - - return out; -} - -// This function gets some field IDs, which in turn causes class initialization. -// It is called from a static block in MediaPlayer2, which won't run until the -// first time an instance of this class is used. -static void -android_media_MediaPlayer2_native_init(JNIEnv *env) -{ - jclass clazz; - - clazz = env->FindClass("android/media/MediaPlayer2"); - if (clazz == NULL) { - return; - } - - fields.context = env->GetFieldID(clazz, "mContext", "Landroid/content/Context;"); - if (fields.context == NULL) { - return; - } - - fields.nativeContext = env->GetFieldID(clazz, "mNativeContext", "J"); - if (fields.nativeContext == NULL) { - return; - } - - fields.post_event = env->GetStaticMethodID(clazz, "postEventFromNative", - "(Ljava/lang/Object;JIII[B)V"); - if (fields.post_event == NULL) { - return; - } - - fields.surface_texture = env->GetFieldID(clazz, "mNativeSurfaceTexture", "J"); - if (fields.surface_texture == NULL) { - return; - } - - env->DeleteLocalRef(clazz); - - clazz = env->FindClass("android/net/ProxyInfo"); - if (clazz == NULL) { - return; - } - - fields.proxyConfigGetHost = - env->GetMethodID(clazz, "getHost", "()Ljava/lang/String;"); - - fields.proxyConfigGetPort = - env->GetMethodID(clazz, "getPort", "()I"); - - fields.proxyConfigGetExclusionList = - env->GetMethodID(clazz, "getExclusionListAsString", "()Ljava/lang/String;"); - - env->DeleteLocalRef(clazz); - - gBufferingParamsFields.init(env); - - // Modular DRM - FIND_CLASS(clazz, "android/media/MediaDrm$MediaDrmStateException"); - if (clazz) { - GET_METHOD_ID(gStateExceptionFields.init, clazz, "<init>", "(ILjava/lang/String;)V"); - gStateExceptionFields.classId = static_cast<jclass>(env->NewGlobalRef(clazz)); - - env->DeleteLocalRef(clazz); - } else { - ALOGE("JNI android_media_MediaPlayer2_native_init couldn't " - "get clazz android/media/MediaDrm$MediaDrmStateException"); - } - - gPlaybackParamsFields.init(env); - gSyncParamsFields.init(env); - gVolumeShaperFields.init(env); -} - -static void -android_media_MediaPlayer2_native_setup(JNIEnv *env, jobject thiz, - jint sessionId, jobject weak_this) -{ - ALOGV("native_setup"); - jobject context = env->GetObjectField(thiz, fields.context); - sp<MediaPlayer2> mp = MediaPlayer2::Create(sessionId, context); - if (mp == NULL) { - jniThrowException(env, "java/lang/RuntimeException", "Out of memory"); - return; - } - - // create new listener and give it to MediaPlayer2 - sp<JNIMediaPlayer2Listener> listener = new JNIMediaPlayer2Listener(env, thiz, weak_this); - mp->setListener(listener); - - // Stow our new C++ MediaPlayer2 in an opaque field in the Java object. - setMediaPlayer(env, thiz, mp); -} - -static void -android_media_MediaPlayer2_release(JNIEnv *env, jobject thiz) -{ - ALOGV("release"); - decVideoSurfaceRef(env, thiz); - sp<MediaPlayer2> mp = setMediaPlayer(env, thiz, 0); - if (mp != NULL) { - // this prevents native callbacks after the object is released - mp->setListener(0); - mp->disconnect(); - } -} - -static void -android_media_MediaPlayer2_native_finalize(JNIEnv *env, jobject thiz) -{ - ALOGV("native_finalize"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp != NULL) { - ALOGW("MediaPlayer2 finalized without being released"); - } - android_media_MediaPlayer2_release(env, thiz); -} - -static void android_media_MediaPlayer2_setAudioSessionId(JNIEnv *env, jobject thiz, - jint sessionId) { - ALOGV("setAudioSessionId(): %d", sessionId); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->setAudioSessionId((audio_session_t) sessionId), NULL, - NULL); -} - -static jint android_media_MediaPlayer2_getAudioSessionId(JNIEnv *env, jobject thiz) { - ALOGV("getAudioSessionId()"); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return 0; - } - - return (jint) mp->getAudioSessionId(); -} - -static void -android_media_MediaPlayer2_setAuxEffectSendLevel(JNIEnv *env, jobject thiz, jfloat level) -{ - ALOGV("setAuxEffectSendLevel: level %f", level); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->setAuxEffectSendLevel(level), NULL, NULL ); -} - -static void android_media_MediaPlayer2_attachAuxEffect(JNIEnv *env, jobject thiz, jint effectId) { - ALOGV("attachAuxEffect(): %d", effectId); - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - process_media_player_call( env, thiz, mp->attachAuxEffect(effectId), NULL, NULL ); -} - -///////////////////////////////////////////////////////////////////////////////////// -// Modular DRM begin - -// TODO: investigate if these can be shared with their MediaDrm counterparts -static void throwDrmStateException(JNIEnv *env, const char *msg, status_t err) -{ - ALOGE("Illegal DRM state exception: %s (%d)", msg, err); - - jobject exception = env->NewObject(gStateExceptionFields.classId, - gStateExceptionFields.init, static_cast<int>(err), - env->NewStringUTF(msg)); - env->Throw(static_cast<jthrowable>(exception)); -} - -// TODO: investigate if these can be shared with their MediaDrm counterparts -static bool throwDrmExceptionAsNecessary(JNIEnv *env, status_t err, const char *msg = NULL) -{ - const char *drmMessage = "Unknown DRM Msg"; - - switch (err) { - case ERROR_DRM_UNKNOWN: - drmMessage = "General DRM error"; - break; - case ERROR_DRM_NO_LICENSE: - drmMessage = "No license"; - break; - case ERROR_DRM_LICENSE_EXPIRED: - drmMessage = "License expired"; - break; - case ERROR_DRM_SESSION_NOT_OPENED: - drmMessage = "Session not opened"; - break; - case ERROR_DRM_DECRYPT_UNIT_NOT_INITIALIZED: - drmMessage = "Not initialized"; - break; - case ERROR_DRM_DECRYPT: - drmMessage = "Decrypt error"; - break; - case ERROR_DRM_CANNOT_HANDLE: - drmMessage = "Unsupported scheme or data format"; - break; - case ERROR_DRM_TAMPER_DETECTED: - drmMessage = "Invalid state"; - break; - default: - break; - } - - String8 vendorMessage; - if (err >= ERROR_DRM_VENDOR_MIN && err <= ERROR_DRM_VENDOR_MAX) { - vendorMessage = String8::format("DRM vendor-defined error: %d", err); - drmMessage = vendorMessage.string(); - } - - if (err == BAD_VALUE) { - jniThrowException(env, "java/lang/IllegalArgumentException", msg); - return true; - } else if (err == ERROR_DRM_NOT_PROVISIONED) { - jniThrowException(env, "android/media/NotProvisionedException", msg); - return true; - } else if (err == ERROR_DRM_RESOURCE_BUSY) { - jniThrowException(env, "android/media/ResourceBusyException", msg); - return true; - } else if (err == ERROR_DRM_DEVICE_REVOKED) { - jniThrowException(env, "android/media/DeniedByServerException", msg); - return true; - } else if (err == DEAD_OBJECT) { - jniThrowException(env, "android/media/MediaDrmResetException", - "mediaserver died"); - return true; - } else if (err != OK) { - String8 errbuf; - if (drmMessage != NULL) { - if (msg == NULL) { - msg = drmMessage; - } else { - errbuf = String8::format("%s: %s", msg, drmMessage); - msg = errbuf.string(); - } - } - throwDrmStateException(env, msg, err); - return true; - } - return false; -} - -static Vector<uint8_t> JByteArrayToVector(JNIEnv *env, jbyteArray const &byteArray) -{ - Vector<uint8_t> vector; - size_t length = env->GetArrayLength(byteArray); - vector.insertAt((size_t)0, length); - env->GetByteArrayRegion(byteArray, 0, length, (jbyte *)vector.editArray()); - return vector; -} - -static void android_media_MediaPlayer2_prepareDrm(JNIEnv *env, jobject thiz, - jlong srcId, jbyteArray uuidObj, jbyteArray drmSessionIdObj) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - if (uuidObj == NULL) { - jniThrowException(env, "java/lang/IllegalArgumentException", NULL); - return; - } - - Vector<uint8_t> uuid = JByteArrayToVector(env, uuidObj); - - if (uuid.size() != 16) { - jniThrowException( - env, - "java/lang/IllegalArgumentException", - "invalid UUID size, expected 16 bytes"); - return; - } - - Vector<uint8_t> drmSessionId = JByteArrayToVector(env, drmSessionIdObj); - - if (drmSessionId.size() == 0) { - jniThrowException( - env, - "java/lang/IllegalArgumentException", - "empty drmSessionId"); - return; - } - - status_t err = mp->prepareDrm(srcId, uuid.array(), drmSessionId); - if (err != OK) { - if (err == INVALID_OPERATION) { - jniThrowException( - env, - "java/lang/IllegalStateException", - "The player must be in prepared state."); - } else if (err == ERROR_DRM_CANNOT_HANDLE) { - jniThrowException( - env, - "android/media/UnsupportedSchemeException", - "Failed to instantiate drm object."); - } else { - throwDrmExceptionAsNecessary(env, err, "Failed to prepare DRM scheme"); - } - } -} - -static void android_media_MediaPlayer2_releaseDrm(JNIEnv *env, jobject thiz, jlong srcId) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL ) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - return; - } - - status_t err = mp->releaseDrm(srcId); - if (err != OK) { - if (err == INVALID_OPERATION) { - jniThrowException( - env, - "java/lang/IllegalStateException", - "Can not release DRM in an active player state."); - } - } -} -// Modular DRM end -// ---------------------------------------------------------------------------- - -///////////////////////////////////////////////////////////////////////////////////// -// AudioRouting begin -static jboolean android_media_MediaPlayer2_setPreferredDevice(JNIEnv *env, jobject thiz, jobject device) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - return false; - } - return mp->setPreferredDevice(device) == NO_ERROR; -} - -static jobject android_media_MediaPlayer2_getRoutedDevice(JNIEnv *env, jobject thiz) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - return nullptr; - } - return mp->getRoutedDevice(); -} - -static void android_media_MediaPlayer2_addDeviceCallback( - JNIEnv* env, jobject thiz, jobject routingDelegate) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - return; - } - - status_t status = mp->addAudioDeviceCallback(routingDelegate); - if (status != NO_ERROR) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - ALOGE("enable device callback failed: %d", status); - } -} - -static void android_media_MediaPlayer2_removeDeviceCallback( - JNIEnv* env, jobject thiz, jobject listener) -{ - sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); - if (mp == NULL) { - return; - } - - status_t status = mp->removeAudioDeviceCallback(listener); - if (status != NO_ERROR) { - jniThrowException(env, "java/lang/IllegalStateException", NULL); - ALOGE("enable device callback failed: %d", status); - } -} - -// AudioRouting end -// ---------------------------------------------------------------------------- - -///////////////////////////////////////////////////////////////////////////////////// -// AudioTrack.StreamEventCallback begin -static void android_media_MediaPlayer2_native_on_tear_down(JNIEnv *env __unused, - jobject thiz __unused, jlong callbackPtr, jlong userDataPtr) -{ - JAudioTrack::callback_t callback = (JAudioTrack::callback_t) callbackPtr; - if (callback != NULL) { - callback(JAudioTrack::EVENT_NEW_IAUDIOTRACK, (void *) userDataPtr, NULL); - } -} - -static void android_media_MediaPlayer2_native_on_stream_presentation_end(JNIEnv *env __unused, - jobject thiz __unused, jlong callbackPtr, jlong userDataPtr) -{ - JAudioTrack::callback_t callback = (JAudioTrack::callback_t) callbackPtr; - if (callback != NULL) { - callback(JAudioTrack::EVENT_STREAM_END, (void *) userDataPtr, NULL); - } -} - -static void android_media_MediaPlayer2_native_on_stream_data_request(JNIEnv *env __unused, - jobject thiz __unused, jlong jAudioTrackPtr, jlong callbackPtr, jlong userDataPtr) -{ - JAudioTrack::callback_t callback = (JAudioTrack::callback_t) callbackPtr; - JAudioTrack* track = (JAudioTrack *) jAudioTrackPtr; - if (callback != NULL && track != NULL) { - JAudioTrack::Buffer* buffer = new JAudioTrack::Buffer(); - - size_t bufferSizeInFrames = track->frameCount(); - audio_format_t format = track->format(); - - size_t bufferSizeInBytes; - if (audio_has_proportional_frames(format)) { - bufferSizeInBytes = - bufferSizeInFrames * audio_bytes_per_sample(format) * track->channelCount(); - } else { - // See Javadoc of AudioTrack::getBufferSizeInFrames(). - bufferSizeInBytes = bufferSizeInFrames; - } - - uint8_t* byteBuffer = new uint8_t[bufferSizeInBytes]; - buffer->mSize = bufferSizeInBytes; - buffer->mData = (void *) byteBuffer; - - callback(JAudioTrack::EVENT_MORE_DATA, (void *) userDataPtr, buffer); - - if (buffer->mSize > 0 && buffer->mData == byteBuffer) { - track->write(buffer->mData, buffer->mSize, true /* Blocking */); - } - - delete[] byteBuffer; - delete buffer; - } -} - - -// AudioTrack.StreamEventCallback end -// ---------------------------------------------------------------------------- - -static const JNINativeMethod gMethods[] = { - { - "nativeHandleDataSourceUrl", - "(ZJLandroid/media/Media2HTTPService;Ljava/lang/String;[Ljava/lang/String;" - "[Ljava/lang/String;JJ)V", - (void *)android_media_MediaPlayer2_handleDataSourceUrl - }, - { - "nativeHandleDataSourceFD", - "(ZJLjava/io/FileDescriptor;JJJJ)V", - (void *)android_media_MediaPlayer2_handleDataSourceFD - }, - { - "nativeHandleDataSourceCallback", - "(ZJLandroid/media/DataSourceCallback;JJ)V", - (void *)android_media_MediaPlayer2_handleDataSourceCallback - }, - {"nativePlayNextDataSource", "(J)V", (void *)android_media_MediaPlayer2_playNextDataSource}, - {"native_setVideoSurface", "(Landroid/view/Surface;)V", (void *)android_media_MediaPlayer2_setVideoSurface}, - {"getBufferingParams", "()Landroid/media/BufferingParams;", (void *)android_media_MediaPlayer2_getBufferingParams}, - {"native_setBufferingParams", "(Landroid/media/BufferingParams;)V", (void *)android_media_MediaPlayer2_setBufferingParams}, - {"native_prepare", "()V", (void *)android_media_MediaPlayer2_prepare}, - {"native_start", "()V", (void *)android_media_MediaPlayer2_start}, - {"native_getState", "()I", (void *)android_media_MediaPlayer2_getState}, - {"native_getMetrics", "()Landroid/os/PersistableBundle;", (void *)android_media_MediaPlayer2_native_getMetrics}, - {"native_setPlaybackParams", "(Landroid/media/PlaybackParams;)V", (void *)android_media_MediaPlayer2_setPlaybackParams}, - {"getPlaybackParams", "()Landroid/media/PlaybackParams;", (void *)android_media_MediaPlayer2_getPlaybackParams}, - {"native_setSyncParams", "(Landroid/media/SyncParams;)V", (void *)android_media_MediaPlayer2_setSyncParams}, - {"getSyncParams", "()Landroid/media/SyncParams;", (void *)android_media_MediaPlayer2_getSyncParams}, - {"native_seekTo", "(JI)V", (void *)android_media_MediaPlayer2_seekTo}, - {"native_pause", "()V", (void *)android_media_MediaPlayer2_pause}, - {"getCurrentPosition", "()J", (void *)android_media_MediaPlayer2_getCurrentPosition}, - {"native_getDuration", "(J)J", (void *)android_media_MediaPlayer2_getDuration}, - {"native_release", "()V", (void *)android_media_MediaPlayer2_release}, - {"native_reset", "()V", (void *)android_media_MediaPlayer2_reset}, - {"native_setAudioAttributes", "(Landroid/media/AudioAttributes;)Z", (void *)android_media_MediaPlayer2_setAudioAttributes}, - {"native_getAudioAttributes", "()Landroid/media/AudioAttributes;", (void *)android_media_MediaPlayer2_getAudioAttributes}, - {"setLooping", "(Z)V", (void *)android_media_MediaPlayer2_setLooping}, - {"isLooping", "()Z", (void *)android_media_MediaPlayer2_isLooping}, - {"native_setVolume", "(F)V", (void *)android_media_MediaPlayer2_setVolume}, - {"native_invoke", "([B)[B", (void *)android_media_MediaPlayer2_invoke}, - {"native_init", "()V", (void *)android_media_MediaPlayer2_native_init}, - {"native_setup", "(ILjava/lang/Object;)V", (void *)android_media_MediaPlayer2_native_setup}, - {"native_finalize", "()V", (void *)android_media_MediaPlayer2_native_finalize}, - {"getAudioSessionId", "()I", (void *)android_media_MediaPlayer2_getAudioSessionId}, - {"native_setAudioSessionId", "(I)V", (void *)android_media_MediaPlayer2_setAudioSessionId}, - {"native_setAuxEffectSendLevel", "(F)V", (void *)android_media_MediaPlayer2_setAuxEffectSendLevel}, - {"native_attachAuxEffect", "(I)V", (void *)android_media_MediaPlayer2_attachAuxEffect}, - // Modular DRM - { "native_prepareDrm", "(J[B[B)V", (void *)android_media_MediaPlayer2_prepareDrm }, - { "native_releaseDrm", "(J)V", (void *)android_media_MediaPlayer2_releaseDrm }, - - // AudioRouting - {"native_setPreferredDevice", "(Landroid/media/AudioDeviceInfo;)Z", (void *)android_media_MediaPlayer2_setPreferredDevice}, - {"getRoutedDevice", "()Landroid/media/AudioDeviceInfo;", (void *)android_media_MediaPlayer2_getRoutedDevice}, - {"native_addDeviceCallback", "(Landroid/media/RoutingDelegate;)V", (void *)android_media_MediaPlayer2_addDeviceCallback}, - {"native_removeDeviceCallback", "(Landroid/media/AudioRouting$OnRoutingChangedListener;)V", - (void *)android_media_MediaPlayer2_removeDeviceCallback}, - - // StreamEventCallback for JAudioTrack - {"native_stream_event_onTearDown", "(JJ)V", (void *)android_media_MediaPlayer2_native_on_tear_down}, - {"native_stream_event_onStreamPresentationEnd", "(JJ)V", (void *)android_media_MediaPlayer2_native_on_stream_presentation_end}, - {"native_stream_event_onStreamDataRequest", "(JJJ)V", (void *)android_media_MediaPlayer2_native_on_stream_data_request}, -}; - -// This function only registers the native methods -static int register_android_media_MediaPlayer2(JNIEnv *env) -{ - return jniRegisterNativeMethods(env, "android/media/MediaPlayer2", gMethods, NELEM(gMethods)); -} - -jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) -{ - JNIEnv* env = NULL; - jint result = -1; - - if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { - ALOGE("ERROR: GetEnv failed\n"); - goto bail; - } - assert(env != NULL); - - if (register_android_media_MediaPlayer2(env) < 0) { - ALOGE("ERROR: MediaPlayer2 native registration failed\n"); - goto bail; - } - - JavaVMHelper::setJavaVM(vm); - - /* success -- return valid version number */ - result = JNI_VERSION_1_4; - -bail: - return result; -} - -// KTHXBYE diff --git a/media/proto/Android.bp b/media/proto/Android.bp deleted file mode 100644 index 2dc0d579c0da..000000000000 --- a/media/proto/Android.bp +++ /dev/null @@ -1,20 +0,0 @@ -java_library_static { - name: "mediaplayer2-protos", - host_supported: true, - proto: { - type: "lite", - }, - srcs: ["mediaplayer2.proto"], - jarjar_rules: "jarjar-rules.txt", - sdk_version: "28", -} - -cc_library_static { - name: "libmediaplayer2-protos", - host_supported: true, - proto: { - export_proto_headers: true, - type: "lite", - }, - srcs: ["mediaplayer2.proto"], -} diff --git a/media/proto/jarjar-rules.txt b/media/proto/jarjar-rules.txt deleted file mode 100644 index e73f86dddac1..000000000000 --- a/media/proto/jarjar-rules.txt +++ /dev/null @@ -1,2 +0,0 @@ -rule com.google.protobuf.** android.media.protobuf.@1 - diff --git a/media/proto/mediaplayer2.proto b/media/proto/mediaplayer2.proto deleted file mode 100644 index 6287d6cd326d..000000000000 --- a/media/proto/mediaplayer2.proto +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -syntax = "proto2"; - -option optimize_for = LITE_RUNTIME; - -// C++ namespace: android::media:MediaPlayer2Proto: -package android.media.MediaPlayer2Proto; - -option java_package = "android.media"; -option java_outer_classname = "MediaPlayer2Proto"; - -message Value { - // The kind of value. - oneof kind { - // Represents a boolean value. - bool bool_value = 1; - // Represents an int32 value. - int32 int32_value = 2; - // Represents an uint32 value. - uint32 uint32_value = 3; - // Represents an int64 value. - int64 int64_value = 4; - // Represents an uint64 value. - uint64 uint64_value = 5; - // Represents a float value. - double float_value = 6; - // Represents a double value. - double double_value = 7; - // Represents a string value. - string string_value = 8; - // Represents a bytes value. - bytes bytes_value = 9; - } -} - -message PlayerMessage { - repeated Value values = 1; -} diff --git a/opengl/java/android/opengl/GLUtils.java b/opengl/java/android/opengl/GLUtils.java index ca8d5ac52021..cc46514ae96e 100644 --- a/opengl/java/android/opengl/GLUtils.java +++ b/opengl/java/android/opengl/GLUtils.java @@ -44,7 +44,7 @@ public final class GLUtils { if (bitmap.isRecycled()) { throw new IllegalArgumentException("bitmap is recycled"); } - int result = native_getInternalFormat(bitmap.getNativeInstance()); + int result = native_getInternalFormat(bitmap); if (result < 0) { throw new IllegalArgumentException("Unknown internalformat"); } @@ -66,7 +66,7 @@ public final class GLUtils { if (bitmap.isRecycled()) { throw new IllegalArgumentException("bitmap is recycled"); } - int result = native_getType(bitmap.getNativeInstance()); + int result = native_getType(bitmap); if (result < 0) { throw new IllegalArgumentException("Unknown type"); } @@ -103,8 +103,7 @@ public final class GLUtils { if (bitmap.isRecycled()) { throw new IllegalArgumentException("bitmap is recycled"); } - if (native_texImage2D(target, level, internalformat, bitmap.getNativeInstance(), -1, - border) != 0) { + if (native_texImage2D(target, level, internalformat, bitmap, -1, border) != 0) { throw new IllegalArgumentException("invalid Bitmap format"); } } @@ -130,8 +129,7 @@ public final class GLUtils { if (bitmap.isRecycled()) { throw new IllegalArgumentException("bitmap is recycled"); } - if (native_texImage2D(target, level, internalformat, bitmap.getNativeInstance(), type, - border) != 0) { + if (native_texImage2D(target, level, internalformat, bitmap, type, border) != 0) { throw new IllegalArgumentException("invalid Bitmap format"); } } @@ -153,7 +151,7 @@ public final class GLUtils { if (bitmap.isRecycled()) { throw new IllegalArgumentException("bitmap is recycled"); } - if (native_texImage2D(target, level, -1, bitmap.getNativeInstance(), -1, border) != 0) { + if (native_texImage2D(target, level, -1, bitmap, -1, border) != 0) { throw new IllegalArgumentException("invalid Bitmap format"); } } @@ -189,8 +187,7 @@ public final class GLUtils { throw new IllegalArgumentException("bitmap is recycled"); } int type = getType(bitmap); - if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap.getNativeInstance(), -1, - type) != 0) { + if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap, -1, type) != 0) { throw new IllegalArgumentException("invalid Bitmap format"); } } @@ -214,8 +211,7 @@ public final class GLUtils { if (bitmap.isRecycled()) { throw new IllegalArgumentException("bitmap is recycled"); } - if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap.getNativeInstance(), - format, type) != 0) { + if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap, format, type) != 0) { throw new IllegalArgumentException("invalid Bitmap format"); } } @@ -265,10 +261,10 @@ public final class GLUtils { } } - native private static int native_getInternalFormat(long bitmapHandle); - native private static int native_getType(long bitmapHandle); - native private static int native_texImage2D(int target, int level, int internalformat, - long bitmapHandle, int type, int border); - native private static int native_texSubImage2D(int target, int level, int xoffset, int yoffset, - long bitmapHandle, int format, int type); + private static native int native_getInternalFormat(Bitmap bitmap); + private static native int native_getType(Bitmap bitmap); + private static native int native_texImage2D(int target, int level, int internalformat, + Bitmap bitmap, int type, int border); + private static native int native_texSubImage2D(int target, int level, int xoffset, int yoffset, + Bitmap bitmap, int format, int type); } diff --git a/packages/BackupEncryption/Android.bp b/packages/BackupEncryption/Android.bp index 9bcd677538eb..342d796de402 100644 --- a/packages/BackupEncryption/Android.bp +++ b/packages/BackupEncryption/Android.bp @@ -18,6 +18,7 @@ android_app { name: "BackupEncryption", srcs: ["src/**/*.java"], libs: ["backup-encryption-protos"], + static_libs: ["backuplib"], optimize: { enabled: false }, platform_apis: true, certificate: "platform", diff --git a/packages/BackupEncryption/AndroidManifest.xml b/packages/BackupEncryption/AndroidManifest.xml index a705df5a425b..4d174e3b64d6 100644 --- a/packages/BackupEncryption/AndroidManifest.xml +++ b/packages/BackupEncryption/AndroidManifest.xml @@ -20,5 +20,14 @@ package="com.android.server.backup.encryption" android:sharedUserId="android.uid.system" > - <application android:allowBackup="false" /> + <application android:allowBackup="false" > + <!-- This service does not need to be exported because it shares uid with the system server + which is the only client. --> + <service android:name=".BackupEncryptionService" + android:exported="false"> + <intent-filter> + <action android:name="android.encryption.BACKUP_ENCRYPTION" /> + </intent-filter> + </service> + </application> </manifest> diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/BackupEncryptionService.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/BackupEncryptionService.java new file mode 100644 index 000000000000..84fb0e62dbca --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/BackupEncryptionService.java @@ -0,0 +1,63 @@ +/* + * 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.backup.encryption; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; + +import com.android.internal.backup.IBackupTransport; +import com.android.server.backup.encryption.transport.IntermediateEncryptingTransport; +import com.android.server.backup.encryption.transport.IntermediateEncryptingTransportManager; + +/** + * This service provides encryption of backup data. For an intent used to bind to this service, it + * provides an {@link IntermediateEncryptingTransport} which is an implementation of {@link + * IBackupTransport} that encrypts (or decrypts) the data when sending it (or receiving it) from the + * real {@link IBackupTransport}. + */ +public class BackupEncryptionService extends Service { + public static final String TAG = "BackupEncryption"; + private static IntermediateEncryptingTransportManager sTransportManager = null; + + @Override + public void onCreate() { + Log.i(TAG, "onCreate:" + this); + if (sTransportManager == null) { + Log.i(TAG, "Creating IntermediateEncryptingTransportManager"); + sTransportManager = new IntermediateEncryptingTransportManager(this); + } + } + + @Override + public void onDestroy() { + Log.i(TAG, "onDestroy:" + this); + } + + @Override + public IBinder onBind(Intent intent) { + // TODO (b141536117): Check connection with TransportClient.connect and return null on fail. + return sTransportManager.get(intent); + } + + @Override + public boolean onUnbind(Intent intent) { + sTransportManager.cleanup(intent); + return false; + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/FullRestoreDownloader.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/FullRestoreDownloader.java new file mode 100644 index 000000000000..afcca79a0027 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/FullRestoreDownloader.java @@ -0,0 +1,47 @@ +/* + * 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.backup.encryption; + +import java.io.IOException; + +/** Interface for classes which will provide backup data */ +public abstract class FullRestoreDownloader { + /** Enum to provide information on why a download finished */ + public enum FinishType { + UNKNOWN_FINISH(0), + // Finish the downloading and successfully write data to Android OS. + FINISHED(1), + // Download failed with any kind of exception. + TRANSFER_FAILURE(2), + // Download failed due to auth failure on the device. + AUTH_FAILURE(3), + // Aborted by Android Framework. + FRAMEWORK_ABORTED(4); + + private int mValue; + + FinishType(int value) { + mValue = value; + } + } + + /** Get the next data chunk from the backing store */ + public abstract int readNextChunk(byte[] buffer) throws IOException; + + /** Called when we've finished restoring the data */ + public abstract void finish(FinishType finishType); +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/BackupFileBuilder.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/BackupFileBuilder.java new file mode 100644 index 000000000000..3d3fb552bb58 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/BackupFileBuilder.java @@ -0,0 +1,232 @@ +/* + * 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.backup.encryption.chunking; + +import static com.android.internal.util.Preconditions.checkArgument; +import static com.android.internal.util.Preconditions.checkNotNull; +import static com.android.internal.util.Preconditions.checkState; + +import android.annotation.Nullable; +import android.util.Slog; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.chunk.ChunkListingMap; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Writes batches of {@link EncryptedChunk} to a diff script, and generates the associated {@link + * ChunksMetadataProto.ChunkListing} and {@link ChunksMetadataProto.ChunkOrdering}. + */ +public class BackupFileBuilder { + private static final String TAG = "BackupFileBuilder"; + + private static final int BYTES_PER_KILOBYTE = 1024; + + private final BackupWriter mBackupWriter; + private final EncryptedChunkEncoder mEncryptedChunkEncoder; + private final ChunkListingMap mOldChunkListing; + private final ChunksMetadataProto.ChunkListing mNewChunkListing; + private final ChunksMetadataProto.ChunkOrdering mChunkOrdering; + private final List<ChunksMetadataProto.Chunk> mKnownChunks = new ArrayList<>(); + private final List<Integer> mKnownStarts = new ArrayList<>(); + private final Map<ChunkHash, Long> mChunkStartPositions; + + private long mNewChunksSizeBytes; + private boolean mFinished; + + /** + * Constructs a new instance which writes raw data to the given {@link OutputStream}, without + * generating a diff. + * + * <p>This class never closes the output stream. + */ + public static BackupFileBuilder createForNonIncremental(OutputStream outputStream) { + return new BackupFileBuilder( + new RawBackupWriter(outputStream), new ChunksMetadataProto.ChunkListing()); + } + + /** + * Constructs a new instance which writes a diff script to the given {@link OutputStream} using + * a {@link SingleStreamDiffScriptWriter}. + * + * <p>This class never closes the output stream. + * + * @param oldChunkListing against which the diff will be generated. + */ + public static BackupFileBuilder createForIncremental( + OutputStream outputStream, ChunksMetadataProto.ChunkListing oldChunkListing) { + return new BackupFileBuilder( + DiffScriptBackupWriter.newInstance(outputStream), oldChunkListing); + } + + private BackupFileBuilder( + BackupWriter backupWriter, ChunksMetadataProto.ChunkListing oldChunkListing) { + this.mBackupWriter = backupWriter; + // TODO(b/77188289): Use InlineLengthsEncryptedChunkEncoder for key-value backups + this.mEncryptedChunkEncoder = new LengthlessEncryptedChunkEncoder(); + this.mOldChunkListing = ChunkListingMap.fromProto(oldChunkListing); + + mNewChunkListing = new ChunksMetadataProto.ChunkListing(); + mNewChunkListing.cipherType = ChunksMetadataProto.AES_256_GCM; + mNewChunkListing.chunkOrderingType = ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED; + + mChunkOrdering = new ChunksMetadataProto.ChunkOrdering(); + mChunkStartPositions = new HashMap<>(); + } + + /** + * Writes the given chunks to the output stream, and adds them to the new chunk listing and + * chunk ordering. + * + * <p>Sorts the chunks in lexicographical order before writing. + * + * @param allChunks The hashes of all the chunks, in the order they appear in the plaintext. + * @param newChunks A map from hash to {@link EncryptedChunk} containing the new chunks not + * present in the previous backup. + */ + public void writeChunks(List<ChunkHash> allChunks, Map<ChunkHash, EncryptedChunk> newChunks) + throws IOException { + checkState(!mFinished, "Cannot write chunks after flushing."); + + List<ChunkHash> sortedChunks = new ArrayList<>(allChunks); + Collections.sort(sortedChunks); + for (ChunkHash chunkHash : sortedChunks) { + // As we have already included this chunk in the backup file, don't add it again to + // deduplicate identical chunks. + if (!mChunkStartPositions.containsKey(chunkHash)) { + // getBytesWritten() gives us the start of the chunk. + mChunkStartPositions.put(chunkHash, mBackupWriter.getBytesWritten()); + + writeChunkToFileAndListing(chunkHash, newChunks); + } + } + + long totalSizeKb = mBackupWriter.getBytesWritten() / BYTES_PER_KILOBYTE; + long newChunksSizeKb = mNewChunksSizeBytes / BYTES_PER_KILOBYTE; + Slog.d( + TAG, + "Total backup size: " + + totalSizeKb + + " kb, new chunks size: " + + newChunksSizeKb + + " kb"); + + for (ChunkHash chunkHash : allChunks) { + mKnownStarts.add(mChunkStartPositions.get(chunkHash).intValue()); + } + } + + /** + * Returns a new listing for all of the chunks written so far, setting the given fingerprint + * mixer salt (this overrides the {@link ChunksMetadataProto.ChunkListing#fingerprintMixerSalt} + * in the old {@link ChunksMetadataProto.ChunkListing} passed into the + * {@link #BackupFileBuilder). + */ + public ChunksMetadataProto.ChunkListing getNewChunkListing( + @Nullable byte[] fingerprintMixerSalt) { + // TODO: b/141537803 Add check to ensure this is called only once per instance + mNewChunkListing.fingerprintMixerSalt = + fingerprintMixerSalt != null + ? Arrays.copyOf(fingerprintMixerSalt, fingerprintMixerSalt.length) + : new byte[0]; + mNewChunkListing.chunks = mKnownChunks.toArray(new ChunksMetadataProto.Chunk[0]); + return mNewChunkListing; + } + + /** Returns a new ordering for all of the chunks written so far, setting the given checksum. */ + public ChunksMetadataProto.ChunkOrdering getNewChunkOrdering(byte[] checksum) { + // TODO: b/141537803 Add check to ensure this is called only once per instance + mChunkOrdering.starts = new int[mKnownStarts.size()]; + for (int i = 0; i < mKnownStarts.size(); i++) { + mChunkOrdering.starts[i] = mKnownStarts.get(i).intValue(); + } + mChunkOrdering.checksum = Arrays.copyOf(checksum, checksum.length); + return mChunkOrdering; + } + + /** + * Finishes the backup file by writing the chunk metadata and metadata position. + * + * <p>Once this is called, calling {@link #writeChunks(List, Map)} will throw {@link + * IllegalStateException}. + */ + public void finish(ChunksMetadataProto.ChunksMetadata metadata) throws IOException { + checkNotNull(metadata, "Metadata cannot be null"); + + long startOfMetadata = mBackupWriter.getBytesWritten(); + mBackupWriter.writeBytes(ChunksMetadataProto.ChunksMetadata.toByteArray(metadata)); + mBackupWriter.writeBytes(toByteArray(startOfMetadata)); + + mBackupWriter.flush(); + mFinished = true; + } + + /** + * Checks if the given chunk hash references an existing chunk or a new chunk, and adds this + * chunk to the backup file and new chunk listing. + */ + private void writeChunkToFileAndListing( + ChunkHash chunkHash, Map<ChunkHash, EncryptedChunk> newChunks) throws IOException { + checkNotNull(chunkHash, "Hash cannot be null"); + + if (mOldChunkListing.hasChunk(chunkHash)) { + ChunkListingMap.Entry oldChunk = mOldChunkListing.getChunkEntry(chunkHash); + mBackupWriter.writeChunk(oldChunk.getStart(), oldChunk.getLength()); + + checkArgument(oldChunk.getLength() >= 0, "Chunk must have zero or positive length"); + addChunk(chunkHash.getHash(), oldChunk.getLength()); + } else if (newChunks.containsKey(chunkHash)) { + EncryptedChunk newChunk = newChunks.get(chunkHash); + mEncryptedChunkEncoder.writeChunkToWriter(mBackupWriter, newChunk); + int length = mEncryptedChunkEncoder.getEncodedLengthOfChunk(newChunk); + mNewChunksSizeBytes += length; + + checkArgument(length >= 0, "Chunk must have zero or positive length"); + addChunk(chunkHash.getHash(), length); + } else { + throw new IllegalArgumentException( + "Chunk did not exist in old chunks or new chunks: " + chunkHash); + } + } + + private void addChunk(byte[] chunkHash, int length) { + ChunksMetadataProto.Chunk chunk = new ChunksMetadataProto.Chunk(); + chunk.hash = Arrays.copyOf(chunkHash, chunkHash.length); + chunk.length = length; + mKnownChunks.add(chunk); + } + + private static byte[] toByteArray(long value) { + // Note that this code needs to stay compatible with GWT, which has known + // bugs when narrowing byte casts of long values occur. + byte[] result = new byte[8]; + for (int i = 7; i >= 0; i--) { + result[i] = (byte) (value & 0xffL); + value >>= 8; + } + return result; + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ProtoStore.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ProtoStore.java new file mode 100644 index 000000000000..3ba5f2b741b8 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ProtoStore.java @@ -0,0 +1,174 @@ +/* + * 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.backup.encryption.chunking; + +import static com.android.internal.util.Preconditions.checkNotNull; + +import android.content.Context; +import android.text.TextUtils; +import android.util.AtomicFile; +import android.util.Slog; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.protos.nano.KeyValueListingProto; + +import com.google.protobuf.nano.MessageNano; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.Optional; + +/** + * Stores a nano proto for each package, persisting the proto to disk. + * + * <p>This is used to store {@link ChunksMetadataProto.ChunkListing}. + * + * @param <T> the type of nano proto to store. + */ +public class ProtoStore<T extends MessageNano> { + private static final String CHUNK_LISTING_FOLDER = "backup_chunk_listings"; + private static final String KEY_VALUE_LISTING_FOLDER = "backup_kv_listings"; + + private static final String TAG = "BupEncProtoStore"; + + private final File mStoreFolder; + private final Class<T> mClazz; + + /** Creates a new instance which stores chunk listings at the default location. */ + public static ProtoStore<ChunksMetadataProto.ChunkListing> createChunkListingStore( + Context context) throws IOException { + return new ProtoStore<>( + ChunksMetadataProto.ChunkListing.class, + new File(context.getFilesDir().getAbsoluteFile(), CHUNK_LISTING_FOLDER)); + } + + /** Creates a new instance which stores key value listings in the default location. */ + public static ProtoStore<KeyValueListingProto.KeyValueListing> createKeyValueListingStore( + Context context) throws IOException { + return new ProtoStore<>( + KeyValueListingProto.KeyValueListing.class, + new File(context.getFilesDir().getAbsoluteFile(), KEY_VALUE_LISTING_FOLDER)); + } + + /** + * Creates a new instance which stores protos in the given folder. + * + * @param storeFolder The location where the serialized form is stored. + */ + @VisibleForTesting + ProtoStore(Class<T> clazz, File storeFolder) throws IOException { + mClazz = checkNotNull(clazz); + mStoreFolder = ensureDirectoryExistsOrThrow(storeFolder); + } + + private static File ensureDirectoryExistsOrThrow(File directory) throws IOException { + if (directory.exists() && !directory.isDirectory()) { + throw new IOException("Store folder already exists, but isn't a directory."); + } + + if (!directory.exists() && !directory.mkdir()) { + throw new IOException("Unable to create store folder."); + } + + return directory; + } + + /** + * Returns the chunk listing for the given package, or {@link Optional#empty()} if no listing + * exists. + */ + public Optional<T> loadProto(String packageName) + throws IOException, IllegalAccessException, InstantiationException, + NoSuchMethodException, InvocationTargetException { + File file = getFileForPackage(packageName); + + if (!file.exists()) { + Slog.d( + TAG, + "No chunk listing existed for " + packageName + ", returning empty listing."); + return Optional.empty(); + } + + AtomicFile protoStore = new AtomicFile(file); + byte[] data = protoStore.readFully(); + + Constructor<T> constructor = mClazz.getDeclaredConstructor(); + T proto = constructor.newInstance(); + MessageNano.mergeFrom(proto, data); + return Optional.of(proto); + } + + /** Saves a proto to disk, associating it with the given package. */ + public void saveProto(String packageName, T proto) throws IOException { + checkNotNull(proto); + File file = getFileForPackage(packageName); + + try (FileOutputStream os = new FileOutputStream(file)) { + os.write(MessageNano.toByteArray(proto)); + } catch (IOException e) { + Slog.e( + TAG, + "Exception occurred when saving the listing for " + + packageName + + ", deleting saved listing.", + e); + + // If a problem occurred when writing the listing then it might be corrupt, so delete + // it. + file.delete(); + + throw e; + } + } + + /** Deletes the proto for the given package, or does nothing if the package has no proto. */ + public void deleteProto(String packageName) { + File file = getFileForPackage(packageName); + file.delete(); + } + + /** Deletes every proto of this type, for all package names. */ + public void deleteAllProtos() { + File[] files = mStoreFolder.listFiles(); + + // We ensure that the storeFolder exists in the constructor, but check just in case it has + // mysteriously disappeared. + if (files == null) { + return; + } + + for (File file : files) { + file.delete(); + } + } + + private File getFileForPackage(String packageName) { + checkPackageName(packageName); + return new File(mStoreFolder, packageName); + } + + private static void checkPackageName(String packageName) { + if (TextUtils.isEmpty(packageName) || packageName.contains("/")) { + throw new IllegalArgumentException( + "Package name must not contain '/' or be empty: " + packageName); + } + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/client/CryptoBackupServer.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/client/CryptoBackupServer.java new file mode 100644 index 000000000000..d7f7dc7d0472 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/client/CryptoBackupServer.java @@ -0,0 +1,67 @@ +/* + * 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.backup.encryption.client; + +import com.android.server.backup.encryption.protos.nano.WrappedKeyProto; + +import java.util.Map; + +/** + * Contains methods for communicating with the parts of the backup server relevant to encryption. + */ +public interface CryptoBackupServer { + /** + * Uploads an incremental backup to the server. + * + * <p>Handles setting up and tearing down the connection. + * + * @param packageName the package to associate the data with + * @param oldDocId the id of the previous backup doc in Drive + * @param diffScript containing the actual backup data + * @param tertiaryKey the wrapped key used to encrypt this backup + * @return the id of the new backup doc in Drive. + */ + String uploadIncrementalBackup( + String packageName, + String oldDocId, + byte[] diffScript, + WrappedKeyProto.WrappedKey tertiaryKey); + + /** + * Uploads non-incremental backup to the server. + * + * <p>Handles setting up and tearing down the connection. + * + * @param packageName the package to associate the data with + * @param data the actual backup data + * @param tertiaryKey the wrapped key used to encrypt this backup + * @return the id of the new backup doc in Drive. + */ + String uploadNonIncrementalBackup( + String packageName, byte[] data, WrappedKeyProto.WrappedKey tertiaryKey); + + /** + * Sets the alias of the active secondary key. This is the alias used to refer to the key in the + * {@link java.security.KeyStore}. It is also used to key storage for tertiary keys on the + * backup server. Also has to upload all existing tertiary keys, wrapped with the new key. + * + * @param keyAlias The ID of the secondary key. + * @param tertiaryKeys The tertiary keys, wrapped with the new secondary key. + */ + void setActiveSecondaryKeyAlias( + String keyAlias, Map<String, WrappedKeyProto.WrappedKey> tertiaryKeys); +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupFileDecryptorTask.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupFileDecryptorTask.java new file mode 100644 index 000000000000..9bf148ddc901 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupFileDecryptorTask.java @@ -0,0 +1,378 @@ +/* + * 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.backup.encryption.tasks; + +import android.util.Slog; +import android.util.SparseIntArray; + +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunkOrdering; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunksMetadata; + +import com.google.protobuf.nano.InvalidProtocolBufferNanoException; + +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import java.util.Locale; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.GCMParameterSpec; + +/** + * A backup file consists of, in order: + * + * <ul> + * <li>A randomly ordered sequence of encrypted chunks + * <li>A plaintext {@link ChunksMetadata} proto, containing the bytes of an encrypted {@link + * ChunkOrdering} proto. + * <li>A 64-bit long denoting the offset of the file at which the ChunkOrdering proto starts. + * </ul> + * + * <p>This task decrypts such a blob and writes the plaintext to another file. + * + * <p>The backup file has two formats to indicate the boundaries of the chunks in the encrypted + * file. In {@link ChunksMetadataProto#EXPLICIT_STARTS} mode the chunk ordering contains the start + * positions of each chunk and the decryptor outputs the chunks in the order they appeared in the + * plaintext file. In {@link ChunksMetadataProto#INLINE_LENGTHS} mode the length of each encrypted + * chunk is prepended to the chunk in the file and the decryptor outputs the chunks in no specific + * order. + * + * <p>{@link ChunksMetadataProto#EXPLICIT_STARTS} is for use with full backup (Currently used for + * all backups as b/77188289 is not implemented yet), {@link ChunksMetadataProto#INLINE_LENGTHS} + * will be used for kv backup (once b/77188289 is implemented) to avoid re-uploading the chunk + * ordering (see b/70782620). + */ +public class BackupFileDecryptorTask { + private static final String TAG = "BackupFileDecryptorTask"; + + private static final String CIPHER_ALGORITHM = "AES/GCM/NoPadding"; + private static final int GCM_NONCE_LENGTH_BYTES = 12; + private static final int GCM_TAG_LENGTH_BYTES = 16; + private static final int BITS_PER_BYTE = 8; + private static final String READ_MODE = "r"; + private static final int BYTES_PER_LONG = 64 / BITS_PER_BYTE; + + private final Cipher mCipher; + private final SecretKey mSecretKey; + + /** + * A new instance. + * + * @param secretKey The tertiary key used to encrypt the backup blob. + */ + public BackupFileDecryptorTask(SecretKey secretKey) + throws NoSuchPaddingException, NoSuchAlgorithmException { + this.mCipher = Cipher.getInstance(CIPHER_ALGORITHM); + this.mSecretKey = secretKey; + } + + /** + * Runs the task, reading the encrypted data from {@code input} and writing the plaintext data + * to {@code output}. + * + * @param inputFile The encrypted backup file. + * @param decryptedChunkOutput Unopened output to write the plaintext to, which this class will + * open and close during decryption. + * @throws IOException if an error occurred reading the encrypted file or writing the plaintext, + * or if one of the protos could not be deserialized. + */ + public void decryptFile(File inputFile, DecryptedChunkOutput decryptedChunkOutput) + throws IOException, EncryptedRestoreException, IllegalBlockSizeException, + BadPaddingException, InvalidAlgorithmParameterException, InvalidKeyException, + ShortBufferException, NoSuchAlgorithmException { + RandomAccessFile input = new RandomAccessFile(inputFile, READ_MODE); + + long metadataOffset = getChunksMetadataOffset(input); + ChunksMetadataProto.ChunksMetadata chunksMetadata = + getChunksMetadata(input, metadataOffset); + ChunkOrdering chunkOrdering = decryptChunkOrdering(chunksMetadata); + + if (chunksMetadata.chunkOrderingType == ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED + || chunksMetadata.chunkOrderingType == ChunksMetadataProto.EXPLICIT_STARTS) { + Slog.d(TAG, "Using explicit starts"); + decryptFileWithExplicitStarts( + input, decryptedChunkOutput, chunkOrdering, metadataOffset); + + } else if (chunksMetadata.chunkOrderingType == ChunksMetadataProto.INLINE_LENGTHS) { + Slog.d(TAG, "Using inline lengths"); + decryptFileWithInlineLengths(input, decryptedChunkOutput, metadataOffset); + + } else { + throw new UnsupportedEncryptedFileException( + "Unknown chunk ordering type:" + chunksMetadata.chunkOrderingType); + } + + if (!Arrays.equals(decryptedChunkOutput.getDigest(), chunkOrdering.checksum)) { + throw new MessageDigestMismatchException("Checksums did not match"); + } + } + + private void decryptFileWithExplicitStarts( + RandomAccessFile input, + DecryptedChunkOutput decryptedChunkOutput, + ChunkOrdering chunkOrdering, + long metadataOffset) + throws IOException, InvalidKeyException, IllegalBlockSizeException, + InvalidAlgorithmParameterException, ShortBufferException, BadPaddingException, + NoSuchAlgorithmException { + SparseIntArray chunkLengthsByPosition = + getChunkLengths(chunkOrdering.starts, (int) metadataOffset); + int largestChunkLength = getLargestChunkLength(chunkLengthsByPosition); + byte[] encryptedChunkBuffer = new byte[largestChunkLength]; + // largestChunkLength is 0 if the backup file contains zero chunks e.g. 0 kv pairs. + int plaintextBufferLength = + Math.max(0, largestChunkLength - GCM_NONCE_LENGTH_BYTES - GCM_TAG_LENGTH_BYTES); + byte[] plaintextChunkBuffer = new byte[plaintextBufferLength]; + + try (DecryptedChunkOutput output = decryptedChunkOutput.open()) { + for (int start : chunkOrdering.starts) { + int length = chunkLengthsByPosition.get(start); + + input.seek(start); + input.readFully(encryptedChunkBuffer, 0, length); + int plaintextLength = + decryptChunk(encryptedChunkBuffer, length, plaintextChunkBuffer); + outputChunk(output, plaintextChunkBuffer, plaintextLength); + } + } + } + + private void decryptFileWithInlineLengths( + RandomAccessFile input, DecryptedChunkOutput decryptedChunkOutput, long metadataOffset) + throws MalformedEncryptedFileException, IOException, IllegalBlockSizeException, + BadPaddingException, InvalidAlgorithmParameterException, ShortBufferException, + InvalidKeyException, NoSuchAlgorithmException { + input.seek(0); + try (DecryptedChunkOutput output = decryptedChunkOutput.open()) { + while (input.getFilePointer() < metadataOffset) { + long start = input.getFilePointer(); + int encryptedChunkLength = input.readInt(); + + if (encryptedChunkLength <= 0) { + // If the length of the encrypted chunk is not positive we will not make + // progress reading the file and so will loop forever. + throw new MalformedEncryptedFileException( + "Encrypted chunk length not positive:" + encryptedChunkLength); + } + + if (start + encryptedChunkLength > metadataOffset) { + throw new MalformedEncryptedFileException( + String.format( + Locale.US, + "Encrypted chunk longer (%d) than file (%d)", + encryptedChunkLength, + metadataOffset)); + } + + byte[] plaintextChunk = new byte[encryptedChunkLength]; + byte[] plaintext = + new byte + [encryptedChunkLength + - GCM_NONCE_LENGTH_BYTES + - GCM_TAG_LENGTH_BYTES]; + + input.readFully(plaintextChunk); + + int plaintextChunkLength = + decryptChunk(plaintextChunk, encryptedChunkLength, plaintext); + outputChunk(output, plaintext, plaintextChunkLength); + } + } + } + + private void outputChunk( + DecryptedChunkOutput output, byte[] plaintextChunkBuffer, int plaintextLength) + throws IOException, InvalidKeyException, NoSuchAlgorithmException { + output.processChunk(plaintextChunkBuffer, plaintextLength); + } + + /** + * Decrypts chunk and returns the length of the plaintext. + * + * @param encryptedChunkBuffer The encrypted data, prefixed by the nonce. + * @param encryptedChunkBufferLength The length of the encrypted chunk (including nonce). + * @param plaintextChunkBuffer The buffer into which to write the plaintext chunk. + * @return The length of the plaintext chunk. + */ + private int decryptChunk( + byte[] encryptedChunkBuffer, + int encryptedChunkBufferLength, + byte[] plaintextChunkBuffer) + throws InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, + ShortBufferException, IllegalBlockSizeException { + + mCipher.init( + Cipher.DECRYPT_MODE, + mSecretKey, + new GCMParameterSpec( + GCM_TAG_LENGTH_BYTES * BITS_PER_BYTE, + encryptedChunkBuffer, + 0, + GCM_NONCE_LENGTH_BYTES)); + + return mCipher.doFinal( + encryptedChunkBuffer, + GCM_NONCE_LENGTH_BYTES, + encryptedChunkBufferLength - GCM_NONCE_LENGTH_BYTES, + plaintextChunkBuffer); + } + + /** Given all the lengths, returns the largest length. */ + private int getLargestChunkLength(SparseIntArray lengths) { + int maxSeen = 0; + for (int i = 0; i < lengths.size(); i++) { + maxSeen = Math.max(maxSeen, lengths.valueAt(i)); + } + return maxSeen; + } + + /** + * From a list of the starting position of each chunk in the correct order of the backup data, + * calculates a mapping from start position to length of that chunk. + * + * @param starts The start positions of chunks, in order. + * @param chunkOrderingPosition Where the {@link ChunkOrdering} proto starts, used to calculate + * the length of the last chunk. + * @return The mapping. + */ + private SparseIntArray getChunkLengths(int[] starts, int chunkOrderingPosition) { + int[] boundaries = Arrays.copyOf(starts, starts.length + 1); + boundaries[boundaries.length - 1] = chunkOrderingPosition; + Arrays.sort(boundaries); + + SparseIntArray lengths = new SparseIntArray(); + for (int i = 0; i < boundaries.length - 1; i++) { + lengths.put(boundaries[i], boundaries[i + 1] - boundaries[i]); + } + return lengths; + } + + /** + * Reads and decrypts the {@link ChunkOrdering} from the {@link ChunksMetadata}. + * + * @param metadata The metadata. + * @return The ordering. + * @throws InvalidProtocolBufferNanoException if there is an issue deserializing the proto. + */ + private ChunkOrdering decryptChunkOrdering(ChunksMetadata metadata) + throws InvalidProtocolBufferNanoException, InvalidAlgorithmParameterException, + InvalidKeyException, BadPaddingException, IllegalBlockSizeException, + UnsupportedEncryptedFileException { + assertCryptoSupported(metadata); + + mCipher.init( + Cipher.DECRYPT_MODE, + mSecretKey, + new GCMParameterSpec( + GCM_TAG_LENGTH_BYTES * BITS_PER_BYTE, + metadata.chunkOrdering, + 0, + GCM_NONCE_LENGTH_BYTES)); + + byte[] decrypted = + mCipher.doFinal( + metadata.chunkOrdering, + GCM_NONCE_LENGTH_BYTES, + metadata.chunkOrdering.length - GCM_NONCE_LENGTH_BYTES); + + return ChunkOrdering.parseFrom(decrypted); + } + + /** + * Asserts that the Cipher and MessageDigest algorithms in the backup metadata are supported. + * For now we only support SHA-256 for checksum and 256-bit AES/GCM/NoPadding for the Cipher. + * + * @param chunksMetadata The file metadata. + * @throws UnsupportedEncryptedFileException if any algorithm is unsupported. + */ + private void assertCryptoSupported(ChunksMetadata chunksMetadata) + throws UnsupportedEncryptedFileException { + if (chunksMetadata.checksumType != ChunksMetadataProto.SHA_256) { + // For now we only support SHA-256. + throw new UnsupportedEncryptedFileException( + "Unrecognized checksum type for backup (this version of backup only supports" + + " SHA-256): " + + chunksMetadata.checksumType); + } + + if (chunksMetadata.cipherType != ChunksMetadataProto.AES_256_GCM) { + throw new UnsupportedEncryptedFileException( + "Unrecognized cipher type for backup (this version of backup only supports" + + " AES-256-GCM: " + + chunksMetadata.cipherType); + } + } + + /** + * Reads the offset of the {@link ChunksMetadata} proto from the end of the file. + * + * @return The offset. + * @throws IOException if there is an error reading. + */ + private long getChunksMetadataOffset(RandomAccessFile input) throws IOException { + input.seek(input.length() - BYTES_PER_LONG); + return input.readLong(); + } + + /** + * Reads the {@link ChunksMetadata} proto from the given position in the file. + * + * @param input The encrypted file. + * @param position The position where the proto starts. + * @return The proto. + * @throws IOException if there is an issue reading the file or deserializing the proto. + */ + private ChunksMetadata getChunksMetadata(RandomAccessFile input, long position) + throws IOException, MalformedEncryptedFileException { + long length = input.length(); + if (position >= length || position < 0) { + throw new MalformedEncryptedFileException( + String.format( + Locale.US, + "%d is not valid position for chunks metadata in file of %d bytes", + position, + length)); + } + + // Read chunk ordering bytes + input.seek(position); + long chunksMetadataLength = input.length() - BYTES_PER_LONG - position; + byte[] chunksMetadataBytes = new byte[(int) chunksMetadataLength]; + input.readFully(chunksMetadataBytes); + + try { + return ChunksMetadata.parseFrom(chunksMetadataBytes); + } catch (InvalidProtocolBufferNanoException e) { + throw new MalformedEncryptedFileException( + String.format( + Locale.US, + "Could not read chunks metadata at position %d of file of %d bytes", + position, + length)); + } + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedBackupTask.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedBackupTask.java new file mode 100644 index 000000000000..ef13f23e799d --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedBackupTask.java @@ -0,0 +1,243 @@ +/* + * 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.backup.encryption.tasks; + +import android.annotation.Nullable; +import android.annotation.TargetApi; +import android.os.Build.VERSION_CODES; +import android.util.Slog; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.chunking.BackupFileBuilder; +import com.android.server.backup.encryption.chunking.EncryptedChunk; +import com.android.server.backup.encryption.client.CryptoBackupServer; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.protos.nano.WrappedKeyProto; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CancellationException; +import java.util.concurrent.atomic.AtomicBoolean; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.GCMParameterSpec; + +/** + * Task which reads encrypted chunks from a {@link BackupEncrypter}, builds a backup file and + * uploads it to the server. + */ +@TargetApi(VERSION_CODES.P) +public class EncryptedBackupTask { + private static final String CIPHER_ALGORITHM = "AES/GCM/NoPadding"; + private static final int GCM_NONCE_LENGTH_BYTES = 12; + private static final int GCM_TAG_LENGTH_BYTES = 16; + private static final int BITS_PER_BYTE = 8; + + private static final String TAG = "EncryptedBackupTask"; + + private final CryptoBackupServer mCryptoBackupServer; + private final SecureRandom mSecureRandom; + private final String mPackageName; + private final ByteArrayOutputStream mBackupDataOutput; + private final BackupEncrypter mBackupEncrypter; + private final AtomicBoolean mCancelled; + + /** Creates a new instance which reads data from the given input stream. */ + public EncryptedBackupTask( + CryptoBackupServer cryptoBackupServer, + SecureRandom secureRandom, + String packageName, + BackupEncrypter backupEncrypter) { + mCryptoBackupServer = cryptoBackupServer; + mSecureRandom = secureRandom; + mPackageName = packageName; + mBackupEncrypter = backupEncrypter; + + mBackupDataOutput = new ByteArrayOutputStream(); + mCancelled = new AtomicBoolean(false); + } + + /** + * Creates a non-incremental backup file and uploads it to the server. + * + * @param fingerprintMixerSalt Fingerprint mixer salt used for content-defined chunking during a + * full backup. May be {@code null} for a key-value backup. + */ + public ChunksMetadataProto.ChunkListing performNonIncrementalBackup( + SecretKey tertiaryKey, + WrappedKeyProto.WrappedKey wrappedTertiaryKey, + @Nullable byte[] fingerprintMixerSalt) + throws IOException, GeneralSecurityException { + + ChunksMetadataProto.ChunkListing newChunkListing = + performBackup( + tertiaryKey, + fingerprintMixerSalt, + BackupFileBuilder.createForNonIncremental(mBackupDataOutput), + new HashSet<>()); + + throwIfCancelled(); + + newChunkListing.documentId = + mCryptoBackupServer.uploadNonIncrementalBackup( + mPackageName, mBackupDataOutput.toByteArray(), wrappedTertiaryKey); + + return newChunkListing; + } + + /** Creates an incremental backup file and uploads it to the server. */ + public ChunksMetadataProto.ChunkListing performIncrementalBackup( + SecretKey tertiaryKey, + WrappedKeyProto.WrappedKey wrappedTertiaryKey, + ChunksMetadataProto.ChunkListing oldChunkListing) + throws IOException, GeneralSecurityException { + + ChunksMetadataProto.ChunkListing newChunkListing = + performBackup( + tertiaryKey, + oldChunkListing.fingerprintMixerSalt, + BackupFileBuilder.createForIncremental(mBackupDataOutput, oldChunkListing), + getChunkHashes(oldChunkListing)); + + throwIfCancelled(); + + String oldDocumentId = oldChunkListing.documentId; + Slog.v(TAG, "Old doc id: " + oldDocumentId); + + newChunkListing.documentId = + mCryptoBackupServer.uploadIncrementalBackup( + mPackageName, + oldDocumentId, + mBackupDataOutput.toByteArray(), + wrappedTertiaryKey); + return newChunkListing; + } + + /** + * Signals to the task that the backup has been cancelled. If the upload has not yet started + * then the task will not upload any data to the server or save the new chunk listing. + */ + public void cancel() { + mCancelled.getAndSet(true); + } + + private void throwIfCancelled() { + if (mCancelled.get()) { + throw new CancellationException("EncryptedBackupTask was cancelled"); + } + } + + private ChunksMetadataProto.ChunkListing performBackup( + SecretKey tertiaryKey, + @Nullable byte[] fingerprintMixerSalt, + BackupFileBuilder backupFileBuilder, + Set<ChunkHash> existingChunkHashes) + throws IOException, GeneralSecurityException { + BackupEncrypter.Result result = + mBackupEncrypter.backup(tertiaryKey, fingerprintMixerSalt, existingChunkHashes); + backupFileBuilder.writeChunks(result.getAllChunks(), buildChunkMap(result.getNewChunks())); + + ChunksMetadataProto.ChunkOrdering chunkOrdering = + backupFileBuilder.getNewChunkOrdering(result.getDigest()); + backupFileBuilder.finish(buildMetadata(tertiaryKey, chunkOrdering)); + + return backupFileBuilder.getNewChunkListing(fingerprintMixerSalt); + } + + /** Returns a set containing the hashes of every chunk in the given listing. */ + private static Set<ChunkHash> getChunkHashes(ChunksMetadataProto.ChunkListing chunkListing) { + Set<ChunkHash> hashes = new HashSet<>(); + for (ChunksMetadataProto.Chunk chunk : chunkListing.chunks) { + hashes.add(new ChunkHash(chunk.hash)); + } + return hashes; + } + + /** Returns a map from chunk hash to chunk containing every chunk in the given list. */ + private static Map<ChunkHash, EncryptedChunk> buildChunkMap(List<EncryptedChunk> chunks) { + Map<ChunkHash, EncryptedChunk> chunkMap = new HashMap<>(); + for (EncryptedChunk chunk : chunks) { + chunkMap.put(chunk.key(), chunk); + } + return chunkMap; + } + + private ChunksMetadataProto.ChunksMetadata buildMetadata( + SecretKey tertiaryKey, ChunksMetadataProto.ChunkOrdering chunkOrdering) + throws InvalidKeyException, IllegalBlockSizeException, BadPaddingException, + InvalidAlgorithmParameterException, NoSuchAlgorithmException, + ShortBufferException, NoSuchPaddingException { + ChunksMetadataProto.ChunksMetadata metaData = new ChunksMetadataProto.ChunksMetadata(); + metaData.cipherType = ChunksMetadataProto.AES_256_GCM; + metaData.checksumType = ChunksMetadataProto.SHA_256; + metaData.chunkOrdering = encryptChunkOrdering(tertiaryKey, chunkOrdering); + return metaData; + } + + private byte[] encryptChunkOrdering( + SecretKey tertiaryKey, ChunksMetadataProto.ChunkOrdering chunkOrdering) + throws InvalidKeyException, IllegalBlockSizeException, BadPaddingException, + NoSuchPaddingException, NoSuchAlgorithmException, + InvalidAlgorithmParameterException, ShortBufferException { + Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM); + + byte[] nonce = generateNonce(); + + cipher.init( + Cipher.ENCRYPT_MODE, + tertiaryKey, + new GCMParameterSpec(GCM_TAG_LENGTH_BYTES * BITS_PER_BYTE, nonce)); + + byte[] orderingBytes = ChunksMetadataProto.ChunkOrdering.toByteArray(chunkOrdering); + // We prepend the nonce to the ordering. + byte[] output = + Arrays.copyOf( + nonce, + GCM_NONCE_LENGTH_BYTES + orderingBytes.length + GCM_TAG_LENGTH_BYTES); + + cipher.doFinal( + orderingBytes, + /*inputOffset=*/ 0, + /*inputLen=*/ orderingBytes.length, + output, + /*outputOffset=*/ GCM_NONCE_LENGTH_BYTES); + + return output; + } + + private byte[] generateNonce() { + byte[] nonce = new byte[GCM_NONCE_LENGTH_BYTES]; + mSecureRandom.nextBytes(nonce); + return nonce; + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/FullRestoreToFileTask.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/FullRestoreToFileTask.java new file mode 100644 index 000000000000..82f83f9b7494 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/FullRestoreToFileTask.java @@ -0,0 +1,87 @@ +/* + * 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.backup.encryption.tasks; + +import static com.android.internal.util.Preconditions.checkArgument; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.server.backup.encryption.FullRestoreDownloader; +import com.android.server.backup.encryption.FullRestoreDownloader.FinishType; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; + +/** + * Reads a stream from a {@link FullRestoreDownloader} and writes it to a file for consumption by + * {@link BackupFileDecryptorTask}. + */ +public class FullRestoreToFileTask { + /** + * Maximum number of bytes which the framework can request from the full restore data stream in + * one call to {@link BackupTransport#getNextFullRestoreDataChunk}. + */ + public static final int MAX_BYTES_FULL_RESTORE_CHUNK = 1024 * 32; + + /** Returned when the end of a backup stream has been reached. */ + private static final int END_OF_STREAM = -1; + + private final FullRestoreDownloader mFullRestoreDownloader; + private final int mBufferSize; + + /** + * Constructs a new instance which reads from the given package wrapper, using a buffer of size + * {@link #MAX_BYTES_FULL_RESTORE_CHUNK}. + */ + public FullRestoreToFileTask(FullRestoreDownloader fullRestoreDownloader) { + this(fullRestoreDownloader, MAX_BYTES_FULL_RESTORE_CHUNK); + } + + @VisibleForTesting + FullRestoreToFileTask(FullRestoreDownloader fullRestoreDownloader, int bufferSize) { + checkArgument(bufferSize > 0, "Buffer must have positive size"); + + this.mFullRestoreDownloader = fullRestoreDownloader; + this.mBufferSize = bufferSize; + } + + /** + * Downloads the backup file from the server and writes it to the given file. + * + * <p>At the end of the download (success or failure), closes the connection and sends a + * Clearcut log. + */ + public void restoreToFile(File targetFile) throws IOException { + try (BufferedOutputStream outputStream = + new BufferedOutputStream(new FileOutputStream(targetFile))) { + byte[] buffer = new byte[mBufferSize]; + int bytesRead = mFullRestoreDownloader.readNextChunk(buffer); + while (bytesRead != END_OF_STREAM) { + outputStream.write(buffer, /* off=*/ 0, bytesRead); + bytesRead = mFullRestoreDownloader.readNextChunk(buffer); + } + + outputStream.flush(); + + mFullRestoreDownloader.finish(FinishType.FINISHED); + } catch (IOException e) { + mFullRestoreDownloader.finish(FinishType.TRANSFER_FAILURE); + throw e; + } + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/KvBackupEncrypter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/KvBackupEncrypter.java new file mode 100644 index 000000000000..d20cd4c07f88 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/KvBackupEncrypter.java @@ -0,0 +1,179 @@ +/* + * 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.backup.encryption.tasks; + +import static com.android.internal.util.Preconditions.checkState; + +import android.annotation.Nullable; +import android.app.backup.BackupDataInput; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.chunking.ChunkEncryptor; +import com.android.server.backup.encryption.chunking.ChunkHasher; +import com.android.server.backup.encryption.chunking.EncryptedChunk; +import com.android.server.backup.encryption.kv.KeyValueListingBuilder; +import com.android.server.backup.encryption.protos.nano.KeyValueListingProto; +import com.android.server.backup.encryption.protos.nano.KeyValuePairProto; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.SecretKey; + +/** + * Reads key value backup data from an input, converts each pair into a chunk and encrypts the + * chunks. + * + * <p>The caller should pass in the key value listing from the previous backup, if there is one. + * This class emits chunks for both existing and new pairs, using the provided listing to + * determine the hashes of pairs that already exist. During the backup it computes the new listing, + * which the caller should store on disk and pass in at the start of the next backup. + * + * <p>Also computes the message digest, which is {@code SHA-256(chunk hashes sorted + * lexicographically)}. + */ +public class KvBackupEncrypter implements BackupEncrypter { + private final BackupDataInput mBackupDataInput; + + private KeyValueListingProto.KeyValueListing mOldKeyValueListing; + @Nullable private KeyValueListingBuilder mNewKeyValueListing; + + /** + * Constructs a new instance which reads data from the given input. + * + * <p>By default this performs non-incremental backup, call {@link #setOldKeyValueListing} to + * perform incremental backup. + */ + public KvBackupEncrypter(BackupDataInput backupDataInput) { + mBackupDataInput = backupDataInput; + mOldKeyValueListing = KeyValueListingBuilder.emptyListing(); + } + + /** Sets the old listing to perform incremental backup against. */ + public void setOldKeyValueListing(KeyValueListingProto.KeyValueListing oldKeyValueListing) { + mOldKeyValueListing = oldKeyValueListing; + } + + @Override + public Result backup( + SecretKey secretKey, + @Nullable byte[] unusedFingerprintMixerSalt, + Set<ChunkHash> unusedExistingChunks) + throws IOException, GeneralSecurityException { + ChunkHasher chunkHasher = new ChunkHasher(secretKey); + ChunkEncryptor chunkEncryptor = new ChunkEncryptor(secretKey, new SecureRandom()); + mNewKeyValueListing = new KeyValueListingBuilder(); + List<ChunkHash> allChunks = new ArrayList<>(); + List<EncryptedChunk> newChunks = new ArrayList<>(); + + Map<String, ChunkHash> existingChunksToReuse = buildPairMap(mOldKeyValueListing); + + while (mBackupDataInput.readNextHeader()) { + String key = mBackupDataInput.getKey(); + Optional<byte[]> value = readEntireValue(mBackupDataInput); + + // As this pair exists in the new backup, we don't need to add it from the previous + // backup. + existingChunksToReuse.remove(key); + + // If the value is not present then this key has been deleted. + if (value.isPresent()) { + EncryptedChunk newChunk = + createEncryptedChunk(chunkHasher, chunkEncryptor, key, value.get()); + allChunks.add(newChunk.key()); + newChunks.add(newChunk); + mNewKeyValueListing.addPair(key, newChunk.key()); + } + } + + allChunks.addAll(existingChunksToReuse.values()); + + mNewKeyValueListing.addAll(existingChunksToReuse); + + return new Result(allChunks, newChunks, createMessageDigest(allChunks)); + } + + /** + * Returns a listing containing the pairs in the new backup. + * + * <p>You must call {@link #backup} first. + */ + public KeyValueListingProto.KeyValueListing getNewKeyValueListing() { + checkState(mNewKeyValueListing != null, "Must call backup() first"); + return mNewKeyValueListing.build(); + } + + private static Map<String, ChunkHash> buildPairMap( + KeyValueListingProto.KeyValueListing listing) { + Map<String, ChunkHash> map = new HashMap<>(); + for (KeyValueListingProto.KeyValueEntry entry : listing.entries) { + map.put(entry.key, new ChunkHash(entry.hash)); + } + return map; + } + + private EncryptedChunk createEncryptedChunk( + ChunkHasher chunkHasher, ChunkEncryptor chunkEncryptor, String key, byte[] value) + throws InvalidKeyException, IllegalBlockSizeException { + KeyValuePairProto.KeyValuePair pair = new KeyValuePairProto.KeyValuePair(); + pair.key = key; + pair.value = Arrays.copyOf(value, value.length); + + byte[] plaintext = KeyValuePairProto.KeyValuePair.toByteArray(pair); + return chunkEncryptor.encrypt(chunkHasher.computeHash(plaintext), plaintext); + } + + private static byte[] createMessageDigest(List<ChunkHash> allChunks) + throws NoSuchAlgorithmException { + MessageDigest messageDigest = + MessageDigest.getInstance(BackupEncrypter.MESSAGE_DIGEST_ALGORITHM); + // TODO:b/141531271 Extract sorted chunks code to utility class + List<ChunkHash> sortedChunks = new ArrayList<>(allChunks); + Collections.sort(sortedChunks); + for (ChunkHash hash : sortedChunks) { + messageDigest.update(hash.getHash()); + } + return messageDigest.digest(); + } + + private static Optional<byte[]> readEntireValue(BackupDataInput input) throws IOException { + // A negative data size indicates that this key should be deleted. + if (input.getDataSize() < 0) { + return Optional.empty(); + } + + byte[] value = new byte[input.getDataSize()]; + int bytesRead = 0; + while (bytesRead < value.length) { + bytesRead += input.readEntityData(value, bytesRead, value.length - bytesRead); + } + return Optional.of(value); + } +} diff --git a/services/net/java/android/net/TcpKeepalivePacketDataParcelable.aidl b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/MalformedEncryptedFileException.java index e25168d588e7..78c370b0d548 100644 --- a/services/net/java/android/net/TcpKeepalivePacketDataParcelable.aidl +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/MalformedEncryptedFileException.java @@ -14,17 +14,11 @@ * limitations under the License. */ -package android.net; +package com.android.server.backup.encryption.tasks; -parcelable TcpKeepalivePacketDataParcelable { - byte[] srcAddress; - int srcPort; - byte[] dstAddress; - int dstPort; - int seq; - int ack; - int rcvWnd; - int rcvWndScale; - int tos; - int ttl; +/** Exception thrown when we cannot parse the encrypted backup file. */ +public class MalformedEncryptedFileException extends EncryptedRestoreException { + public MalformedEncryptedFileException(String message) { + super(message); + } } diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/MessageDigestMismatchException.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/MessageDigestMismatchException.java new file mode 100644 index 000000000000..1e4f43b43e26 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/MessageDigestMismatchException.java @@ -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 com.android.server.backup.encryption.tasks; + +/** + * Error thrown if the message digest of the plaintext backup does not match that in the {@link + * com.android.server.backup.encryption.protos.ChunksMetadataProto.ChunkOrdering}. + */ +public class MessageDigestMismatchException extends EncryptedRestoreException { + public MessageDigestMismatchException(String message) { + super(message); + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/UnsupportedEncryptedFileException.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/UnsupportedEncryptedFileException.java new file mode 100644 index 000000000000..9a97e3870d83 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/UnsupportedEncryptedFileException.java @@ -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 com.android.server.backup.encryption.tasks; + +/** + * Thrown when the backup file provided by the server uses encryption algorithms this version of + * backup does not support. This could happen if the backup was created with a newer version of the + * code. + */ +public class UnsupportedEncryptedFileException extends EncryptedRestoreException { + public UnsupportedEncryptedFileException(String message) { + super(message); + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransport.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransport.java new file mode 100644 index 000000000000..1d0224d49be7 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransport.java @@ -0,0 +1,68 @@ +/* + * 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.backup.encryption.transport; + +import static com.android.server.backup.encryption.BackupEncryptionService.TAG; + +import android.os.RemoteException; +import android.util.Log; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.backup.IBackupTransport; +import com.android.server.backup.transport.DelegatingTransport; +import com.android.server.backup.transport.TransportClient; + +/** + * This is an implementation of {@link IBackupTransport} that encrypts (or decrypts) the data when + * sending it (or receiving it) from the {@link IBackupTransport} returned by {@link + * TransportClient.connect(String)}. + */ +public class IntermediateEncryptingTransport extends DelegatingTransport { + private final TransportClient mTransportClient; + private final Object mConnectLock = new Object(); + private volatile IBackupTransport mRealTransport; + + @VisibleForTesting + IntermediateEncryptingTransport(TransportClient transportClient) { + mTransportClient = transportClient; + } + + @Override + protected IBackupTransport getDelegate() throws RemoteException { + if (mRealTransport == null) { + connect(); + } + return mRealTransport; + } + + private void connect() throws RemoteException { + Log.i(TAG, "connecting " + mTransportClient); + synchronized (mConnectLock) { + if (mRealTransport == null) { + mRealTransport = mTransportClient.connect("IntermediateEncryptingTransport"); + if (mRealTransport == null) { + throw new RemoteException("Could not connect: " + mTransportClient); + } + } + } + } + + @VisibleForTesting + TransportClient getClient() { + return mTransportClient; + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManager.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManager.java new file mode 100644 index 000000000000..6e6d571aa3c7 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManager.java @@ -0,0 +1,98 @@ +/* + * 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.backup.encryption.transport; + +import static com.android.server.backup.encryption.BackupEncryptionService.TAG; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.os.UserHandle; +import android.util.Log; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.backup.IBackupTransport; +import com.android.server.backup.transport.TransportClientManager; +import com.android.server.backup.transport.TransportStats; + +import java.util.HashMap; +import java.util.Map; + +/** + * Handles creation and cleanup of {@link IntermediateEncryptingTransport} instances. + */ +public class IntermediateEncryptingTransportManager { + private static final String CALLER = "IntermediateEncryptingTransportManager"; + private final TransportClientManager mTransportClientManager; + private final Object mTransportsLock = new Object(); + private final Map<ComponentName, IntermediateEncryptingTransport> mTransports = new HashMap<>(); + + @VisibleForTesting + IntermediateEncryptingTransportManager(TransportClientManager transportClientManager) { + mTransportClientManager = transportClientManager; + } + + public IntermediateEncryptingTransportManager(Context context) { + this(new TransportClientManager(UserHandle.myUserId(), context, new TransportStats())); + } + + /** + * Extract the {@link ComponentName} corresponding to the real {@link IBackupTransport}, and + * provide a {@link IntermediateEncryptingTransport} which is an implementation of {@link + * IBackupTransport} that encrypts (or decrypts) the data when sending it (or receiving it) from + * the real {@link IBackupTransport}. + * @param intent {@link Intent} created with a call to {@link + * TransportClientManager.getEncryptingTransportIntent(ComponentName)}. + * @return + */ + public IntermediateEncryptingTransport get(Intent intent) { + Intent transportIntent = TransportClientManager.getRealTransportIntent(intent); + Log.i(TAG, "get: intent:" + intent + " transportIntent:" + transportIntent); + synchronized (mTransportsLock) { + return mTransports.computeIfAbsent(transportIntent.getComponent(), + c -> create(transportIntent)); + } + } + + /** + * Create an instance of {@link IntermediateEncryptingTransport}. + */ + private IntermediateEncryptingTransport create(Intent realTransportIntent) { + Log.d(TAG, "create: intent:" + realTransportIntent); + return new IntermediateEncryptingTransport(mTransportClientManager.getTransportClient( + realTransportIntent.getComponent(), realTransportIntent.getExtras(), CALLER)); + } + + /** + * Cleanup the {@link IntermediateEncryptingTransport} which was created by a call to + * {@link #get(Intent)} with this {@link Intent}. + */ + public void cleanup(Intent intent) { + Intent transportIntent = TransportClientManager.getRealTransportIntent(intent); + Log.i(TAG, "cleanup: intent:" + intent + " transportIntent:" + transportIntent); + + IntermediateEncryptingTransport transport; + synchronized (mTransportsLock) { + transport = mTransports.remove(transportIntent.getComponent()); + } + if (transport != null) { + mTransportClientManager.disposeOfTransportClient(transport.getClient(), CALLER); + } else { + Log.i(TAG, "Could not find IntermediateEncryptingTransport"); + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/Android.bp b/packages/BackupEncryption/test/robolectric/Android.bp index 4e42ce7366f0..2a36dcf0baba 100644 --- a/packages/BackupEncryption/test/robolectric/Android.bp +++ b/packages/BackupEncryption/test/robolectric/Android.bp @@ -16,7 +16,7 @@ android_robolectric_test { name: "BackupEncryptionRoboTests", srcs: [ "src/**/*.java", - ":FrameworksServicesRoboShadows", +// ":FrameworksServicesRoboShadows", ], java_resource_dirs: ["config"], libs: [ diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/BackupFileBuilderTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/BackupFileBuilderTest.java new file mode 100644 index 000000000000..590938efe148 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/BackupFileBuilderTest.java @@ -0,0 +1,614 @@ +/* + * 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.backup.encryption.chunking; + +import static com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.AES_256_GCM; +import static com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED; +import static com.android.server.backup.testing.CryptoTestUtils.newChunk; + +import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; + +import static junit.framework.Assert.fail; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.testng.Assert.assertThrows; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import android.platform.test.annotations.Presubmit; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.testing.DiffScriptProcessor; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Files; +import com.google.common.primitives.Bytes; +import com.google.common.primitives.Longs; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class BackupFileBuilderTest { + private static final String TEST_DATA_1 = + "I'm already there or close to [T7-9/executive level] in terms of big-picture vision"; + private static final String TEST_DATA_2 = + "I was known for Real Games and should have been brought in for advice"; + private static final String TEST_DATA_3 = + "Pride is rooted in the delusional belief held by all humans in an unchanging self"; + + private static final byte[] TEST_FINGERPRINT_MIXER_SALT = + Arrays.copyOf(new byte[] {22}, ChunkHash.HASH_LENGTH_BYTES); + + private static final ChunkHash TEST_HASH_1 = + new ChunkHash(Arrays.copyOf(new byte[] {0}, EncryptedChunk.KEY_LENGTH_BYTES)); + private static final ChunkHash TEST_HASH_2 = + new ChunkHash(Arrays.copyOf(new byte[] {1}, EncryptedChunk.KEY_LENGTH_BYTES)); + private static final ChunkHash TEST_HASH_3 = + new ChunkHash(Arrays.copyOf(new byte[] {2}, EncryptedChunk.KEY_LENGTH_BYTES)); + + private static final byte[] TEST_NONCE = + Arrays.copyOf(new byte[] {3}, EncryptedChunk.NONCE_LENGTH_BYTES); + + private static final EncryptedChunk TEST_CHUNK_1 = + EncryptedChunk.create(TEST_HASH_1, TEST_NONCE, TEST_DATA_1.getBytes(UTF_8)); + private static final EncryptedChunk TEST_CHUNK_2 = + EncryptedChunk.create(TEST_HASH_2, TEST_NONCE, TEST_DATA_2.getBytes(UTF_8)); + private static final EncryptedChunk TEST_CHUNK_3 = + EncryptedChunk.create(TEST_HASH_3, TEST_NONCE, TEST_DATA_3.getBytes(UTF_8)); + + private static final byte[] TEST_CHECKSUM = {1, 2, 3, 4, 5, 6}; + + @Rule public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); + + private File mOldFile; + private ChunksMetadataProto.ChunkListing mOldChunkListing; + private EncryptedChunkEncoder mEncryptedChunkEncoder; + + @Before + public void setUp() { + mEncryptedChunkEncoder = new LengthlessEncryptedChunkEncoder(); + } + + @Test + public void writeChunks_nonIncremental_writesCorrectRawData() throws Exception { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + BackupFileBuilder backupFileBuilder = BackupFileBuilder.createForNonIncremental(output); + + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2), + getNewChunkMap(TEST_HASH_1, TEST_HASH_2)); + + byte[] actual = output.toByteArray(); + byte[] expected = + Bytes.concat( + TEST_CHUNK_1.nonce(), + TEST_CHUNK_1.encryptedBytes(), + TEST_CHUNK_2.nonce(), + TEST_CHUNK_2.encryptedBytes()); + assertThat(actual).asList().containsExactlyElementsIn(Bytes.asList(expected)).inOrder(); + } + + @Test + public void writeChunks_nonIncrementalWithDuplicates_writesEachChunkOnlyOnce() + throws Exception { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + BackupFileBuilder backupFileBuilder = BackupFileBuilder.createForNonIncremental(output); + + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2, TEST_HASH_1), + getNewChunkMap(TEST_HASH_1, TEST_HASH_2)); + + byte[] actual = output.toByteArray(); + byte[] expected = + Bytes.concat( + TEST_CHUNK_1.nonce(), + TEST_CHUNK_1.encryptedBytes(), + TEST_CHUNK_2.nonce(), + TEST_CHUNK_2.encryptedBytes()); + assertThat(actual).asList().containsExactlyElementsIn(Bytes.asList(expected)).inOrder(); + } + + @Test + public void writeChunks_incremental_writesParsableDiffScript() throws Exception { + // We will insert chunk 2 in between chunks 1 and 3. + setUpOldBackupWithChunks(ImmutableList.of(TEST_CHUNK_1, TEST_CHUNK_3)); + ByteArrayOutputStream diffOutputStream = new ByteArrayOutputStream(); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental(diffOutputStream, mOldChunkListing); + + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2, TEST_HASH_3), + getNewChunkMap(TEST_HASH_2)); + backupFileBuilder.finish(getTestMetadata()); + + byte[] actual = + stripMetadataAndPositionFromOutput(parseDiffScript(diffOutputStream.toByteArray())); + byte[] expected = + Bytes.concat( + TEST_CHUNK_1.nonce(), + TEST_CHUNK_1.encryptedBytes(), + TEST_CHUNK_2.nonce(), + TEST_CHUNK_2.encryptedBytes(), + TEST_CHUNK_3.nonce(), + TEST_CHUNK_3.encryptedBytes()); + assertThat(actual).asList().containsExactlyElementsIn(Bytes.asList(expected)).inOrder(); + } + + @Test + public void writeChunks_incrementalWithDuplicates_writesEachChunkOnlyOnce() throws Exception { + // We will insert chunk 2 twice in between chunks 1 and 3. + setUpOldBackupWithChunks(ImmutableList.of(TEST_CHUNK_1, TEST_CHUNK_3)); + ByteArrayOutputStream diffOutputStream = new ByteArrayOutputStream(); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental(diffOutputStream, mOldChunkListing); + + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2, TEST_HASH_2, TEST_HASH_3), + getNewChunkMap(TEST_HASH_2)); + backupFileBuilder.finish(getTestMetadata()); + + byte[] actual = + stripMetadataAndPositionFromOutput(parseDiffScript(diffOutputStream.toByteArray())); + byte[] expected = + Bytes.concat( + TEST_CHUNK_1.nonce(), + TEST_CHUNK_1.encryptedBytes(), + TEST_CHUNK_2.nonce(), + TEST_CHUNK_2.encryptedBytes(), + TEST_CHUNK_3.nonce(), + TEST_CHUNK_3.encryptedBytes()); + assertThat(actual).asList().containsExactlyElementsIn(Bytes.asList(expected)).inOrder(); + } + + @Test + public void writeChunks_writesChunksInOrderOfHash() throws Exception { + setUpOldBackupWithChunks(ImmutableList.of()); + ByteArrayOutputStream diffOutputStream = new ByteArrayOutputStream(); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental(diffOutputStream, mOldChunkListing); + + // Write chunks out of order. + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_2, TEST_HASH_1), + getNewChunkMap(TEST_HASH_2, TEST_HASH_1)); + backupFileBuilder.finish(getTestMetadata()); + + byte[] actual = + stripMetadataAndPositionFromOutput(parseDiffScript(diffOutputStream.toByteArray())); + byte[] expected = + Bytes.concat( + TEST_CHUNK_1.nonce(), + TEST_CHUNK_1.encryptedBytes(), + TEST_CHUNK_2.nonce(), + TEST_CHUNK_2.encryptedBytes()); + assertThat(actual).asList().containsExactlyElementsIn(Bytes.asList(expected)).inOrder(); + } + + @Test + public void writeChunks_alreadyFlushed_throwsException() throws Exception { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), new ChunksMetadataProto.ChunkListing()); + backupFileBuilder.finish(getTestMetadata()); + + assertThrows( + IllegalStateException.class, + () -> backupFileBuilder.writeChunks(ImmutableList.of(), getNewChunkMap())); + } + + @Test + public void getNewChunkListing_hasChunksInOrderOfKey() throws Exception { + // We will insert chunk 2 in between chunks 1 and 3. + setUpOldBackupWithChunks(ImmutableList.of(TEST_CHUNK_1, TEST_CHUNK_3)); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), mOldChunkListing); + + // Write chunks out of order. + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_3, TEST_HASH_2), + getNewChunkMap(TEST_HASH_2)); + backupFileBuilder.finish(getTestMetadata()); + + ChunksMetadataProto.ChunkListing expected = expectedChunkListing(); + ChunksMetadataProto.ChunkListing actual = + backupFileBuilder.getNewChunkListing(TEST_FINGERPRINT_MIXER_SALT); + assertListingsEqual(actual, expected); + } + + @Test + public void getNewChunkListing_writeChunksInTwoBatches_returnsListingContainingAllChunks() + throws Exception { + // We will insert chunk 2 in between chunks 1 and 3. + setUpOldBackupWithChunks(ImmutableList.of(TEST_CHUNK_1, TEST_CHUNK_3)); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), mOldChunkListing); + + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2), getNewChunkMap(TEST_HASH_2)); + backupFileBuilder.writeChunks(ImmutableList.of(TEST_HASH_3), getNewChunkMap(TEST_HASH_2)); + backupFileBuilder.finish(getTestMetadata()); + + ChunksMetadataProto.ChunkListing expected = expectedChunkListing(); + ChunksMetadataProto.ChunkListing actual = + backupFileBuilder.getNewChunkListing(TEST_FINGERPRINT_MIXER_SALT); + assertListingsEqual(actual, expected); + } + + @Test + public void getNewChunkListing_writeDuplicateChunks_writesEachChunkOnlyOnce() throws Exception { + // We will append [2][3][3][2] onto [1]. + setUpOldBackupWithChunks(ImmutableList.of(TEST_CHUNK_1)); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), mOldChunkListing); + + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2, TEST_HASH_3), + getNewChunkMap(TEST_HASH_3, TEST_HASH_2)); + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_3, TEST_HASH_2), + getNewChunkMap(TEST_HASH_3, TEST_HASH_2)); + backupFileBuilder.finish(getTestMetadata()); + + ChunksMetadataProto.ChunkListing expected = expectedChunkListing(); + ChunksMetadataProto.ChunkListing actual = + backupFileBuilder.getNewChunkListing(TEST_FINGERPRINT_MIXER_SALT); + assertListingsEqual(actual, expected); + } + + @Test + public void getNewChunkListing_nonIncrementalWithNoSalt_doesNotThrowOnSerialisation() { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForNonIncremental(new ByteArrayOutputStream()); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(/*fingerprintMixerSalt=*/ null); + + // Does not throw. + ChunksMetadataProto.ChunkListing.toByteArray(newChunkListing); + } + + @Test + public void getNewChunkListing_incrementalWithNoSalt_doesNotThrowOnSerialisation() + throws Exception { + + setUpOldBackupWithChunks(ImmutableList.of()); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), mOldChunkListing); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(/*fingerprintMixerSalt=*/ null); + + // Does not throw. + ChunksMetadataProto.ChunkListing.toByteArray(newChunkListing); + } + + @Test + public void getNewChunkListing_nonIncrementalWithNoSalt_hasEmptySalt() { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForNonIncremental(new ByteArrayOutputStream()); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(/*fingerprintMixerSalt=*/ null); + + assertThat(newChunkListing.fingerprintMixerSalt).isEmpty(); + } + + @Test + public void getNewChunkListing_incrementalWithNoSalt_hasEmptySalt() throws Exception { + setUpOldBackupWithChunks(ImmutableList.of()); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), mOldChunkListing); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(/*fingerprintMixerSalt=*/ null); + + assertThat(newChunkListing.fingerprintMixerSalt).isEmpty(); + } + + @Test + public void getNewChunkListing_nonIncrementalWithSalt_hasGivenSalt() { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForNonIncremental(new ByteArrayOutputStream()); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(TEST_FINGERPRINT_MIXER_SALT); + + assertThat(newChunkListing.fingerprintMixerSalt).isEqualTo(TEST_FINGERPRINT_MIXER_SALT); + } + + @Test + public void getNewChunkListing_incrementalWithSalt_hasGivenSalt() throws Exception { + setUpOldBackupWithChunks(ImmutableList.of()); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), mOldChunkListing); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(TEST_FINGERPRINT_MIXER_SALT); + + assertThat(newChunkListing.fingerprintMixerSalt).isEqualTo(TEST_FINGERPRINT_MIXER_SALT); + } + + @Test + public void getNewChunkListing_nonIncremental_hasCorrectCipherTypeAndChunkOrderingType() { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForNonIncremental(new ByteArrayOutputStream()); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(/*fingerprintMixerSalt=*/ null); + + assertThat(newChunkListing.cipherType).isEqualTo(ChunksMetadataProto.AES_256_GCM); + assertThat(newChunkListing.chunkOrderingType) + .isEqualTo(ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED); + } + + @Test + public void getNewChunkListing_incremental_hasCorrectCipherTypeAndChunkOrderingType() + throws Exception { + setUpOldBackupWithChunks(ImmutableList.of()); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), mOldChunkListing); + + ChunksMetadataProto.ChunkListing newChunkListing = + backupFileBuilder.getNewChunkListing(/*fingerprintMixerSalt=*/ null); + + assertThat(newChunkListing.cipherType).isEqualTo(ChunksMetadataProto.AES_256_GCM); + assertThat(newChunkListing.chunkOrderingType) + .isEqualTo(ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED); + } + + @Test + public void getNewChunkOrdering_chunksHaveCorrectStartPositions() throws Exception { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), new ChunksMetadataProto.ChunkListing()); + + // Write out of order by key to check that ordering is maintained. + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_3, TEST_HASH_2), + getNewChunkMap(TEST_HASH_1, TEST_HASH_3, TEST_HASH_2)); + backupFileBuilder.finish(getTestMetadata()); + + ChunksMetadataProto.ChunkOrdering actual = + backupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM); + // The chunks are listed in the order they are written above, but the start positions are + // determined by the order in the encrypted blob (which is lexicographical by key). + int chunk1Start = 0; + int chunk2Start = + chunk1Start + mEncryptedChunkEncoder.getEncodedLengthOfChunk(TEST_CHUNK_1); + int chunk3Start = + chunk2Start + mEncryptedChunkEncoder.getEncodedLengthOfChunk(TEST_CHUNK_2); + + int[] expected = {chunk1Start, chunk3Start, chunk2Start}; + assertThat(actual.starts.length).isEqualTo(expected.length); + for (int i = 0; i < actual.starts.length; i++) { + assertThat(expected[i]).isEqualTo(actual.starts[i]); + } + } + + @Test + public void getNewChunkOrdering_duplicateChunks_writesDuplicates() throws Exception { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), new ChunksMetadataProto.ChunkListing()); + + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2, TEST_HASH_2), + getNewChunkMap(TEST_HASH_1, TEST_HASH_2)); + backupFileBuilder.writeChunks( + ImmutableList.of(TEST_HASH_3, TEST_HASH_3), getNewChunkMap(TEST_HASH_3)); + backupFileBuilder.finish(getTestMetadata()); + + ChunksMetadataProto.ChunkOrdering actual = + backupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM); + int chunk1Start = 0; + int chunk2Start = + chunk1Start + mEncryptedChunkEncoder.getEncodedLengthOfChunk(TEST_CHUNK_1); + int chunk3Start = + chunk2Start + mEncryptedChunkEncoder.getEncodedLengthOfChunk(TEST_CHUNK_2); + + int[] expected = {chunk1Start, chunk2Start, chunk2Start, chunk3Start, chunk3Start}; + assertThat(actual.starts.length).isEqualTo(expected.length); + for (int i = 0; i < actual.starts.length; i++) { + assertThat(expected[i]).isEqualTo(actual.starts[i]); + } + } + + @Test + public void getNewChunkOrdering_returnsOrderingWithChecksum() throws Exception { + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + new ByteArrayOutputStream(), new ChunksMetadataProto.ChunkListing()); + + backupFileBuilder.writeChunks(ImmutableList.of(TEST_HASH_1), getNewChunkMap(TEST_HASH_1)); + backupFileBuilder.finish(getTestMetadata()); + + ChunksMetadataProto.ChunkOrdering actual = + backupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM); + assertThat(actual.checksum).isEqualTo(TEST_CHECKSUM); + } + + @Test + public void finish_writesMetadata() throws Exception { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + BackupFileBuilder builder = BackupFileBuilder.createForNonIncremental(output); + ChunksMetadataProto.ChunksMetadata expectedMetadata = getTestMetadata(); + + builder.finish(expectedMetadata); + + // The output is [metadata]+[long giving size of metadata]. + byte[] metadataBytes = + Arrays.copyOfRange(output.toByteArray(), 0, output.size() - Long.BYTES); + ChunksMetadataProto.ChunksMetadata actualMetadata = + ChunksMetadataProto.ChunksMetadata.parseFrom(metadataBytes); + assertThat(actualMetadata.checksumType).isEqualTo(ChunksMetadataProto.SHA_256); + assertThat(actualMetadata.cipherType).isEqualTo(ChunksMetadataProto.AES_256_GCM); + } + + @Test + public void finish_writesMetadataPosition() throws Exception { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + BackupFileBuilder builder = BackupFileBuilder.createForNonIncremental(output); + + builder.writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2), + getNewChunkMap(TEST_HASH_1, TEST_HASH_2)); + builder.writeChunks(ImmutableList.of(TEST_HASH_3), getNewChunkMap(TEST_HASH_3)); + builder.finish(getTestMetadata()); + + long expectedPosition = + (long) mEncryptedChunkEncoder.getEncodedLengthOfChunk(TEST_CHUNK_1) + + mEncryptedChunkEncoder.getEncodedLengthOfChunk(TEST_CHUNK_2) + + mEncryptedChunkEncoder.getEncodedLengthOfChunk(TEST_CHUNK_3); + long actualPosition = + Longs.fromByteArray( + Arrays.copyOfRange( + output.toByteArray(), output.size() - Long.BYTES, output.size())); + assertThat(actualPosition).isEqualTo(expectedPosition); + } + + @Test + public void finish_flushesOutputStream() throws Exception { + OutputStream diffOutputStream = mock(OutputStream.class); + BackupFileBuilder backupFileBuilder = + BackupFileBuilder.createForIncremental( + diffOutputStream, new ChunksMetadataProto.ChunkListing()); + + backupFileBuilder.writeChunks(ImmutableList.of(TEST_HASH_1), getNewChunkMap(TEST_HASH_1)); + diffOutputStream.flush(); + + verify(diffOutputStream).flush(); + } + + private void setUpOldBackupWithChunks(List<EncryptedChunk> chunks) throws Exception { + mOldFile = mTemporaryFolder.newFile(); + ChunksMetadataProto.ChunkListing chunkListing = new ChunksMetadataProto.ChunkListing(); + chunkListing.fingerprintMixerSalt = + Arrays.copyOf(TEST_FINGERPRINT_MIXER_SALT, TEST_FINGERPRINT_MIXER_SALT.length); + chunkListing.cipherType = AES_256_GCM; + chunkListing.chunkOrderingType = CHUNK_ORDERING_TYPE_UNSPECIFIED; + + List<ChunksMetadataProto.Chunk> knownChunks = new ArrayList<>(); + try (FileOutputStream outputStream = new FileOutputStream(mOldFile)) { + for (EncryptedChunk chunk : chunks) { + // Chunks are encoded in the format [nonce]+[data]. + outputStream.write(chunk.nonce()); + outputStream.write(chunk.encryptedBytes()); + + knownChunks.add(createChunkFor(chunk)); + } + + outputStream.flush(); + } + + chunkListing.chunks = knownChunks.toArray(new ChunksMetadataProto.Chunk[0]); + mOldChunkListing = chunkListing; + } + + private byte[] parseDiffScript(byte[] diffScript) throws Exception { + File newFile = mTemporaryFolder.newFile(); + new DiffScriptProcessor(mOldFile, newFile).process(new ByteArrayInputStream(diffScript)); + return Files.toByteArray(newFile); + } + + private void assertListingsEqual( + ChunksMetadataProto.ChunkListing result, ChunksMetadataProto.ChunkListing expected) { + assertThat(result.chunks.length).isEqualTo(expected.chunks.length); + for (int i = 0; i < result.chunks.length; i++) { + assertWithMessage("Chunk " + i) + .that(result.chunks[i].length) + .isEqualTo(expected.chunks[i].length); + assertWithMessage("Chunk " + i) + .that(result.chunks[i].hash) + .isEqualTo(expected.chunks[i].hash); + } + } + + private static ImmutableMap<ChunkHash, EncryptedChunk> getNewChunkMap(ChunkHash... hashes) { + ImmutableMap.Builder<ChunkHash, EncryptedChunk> builder = ImmutableMap.builder(); + for (ChunkHash hash : hashes) { + if (TEST_HASH_1.equals(hash)) { + builder.put(TEST_HASH_1, TEST_CHUNK_1); + } else if (TEST_HASH_2.equals(hash)) { + builder.put(TEST_HASH_2, TEST_CHUNK_2); + } else if (TEST_HASH_3.equals(hash)) { + builder.put(TEST_HASH_3, TEST_CHUNK_3); + } else { + fail("Hash was not recognised: " + hash); + } + } + return builder.build(); + } + + private static ChunksMetadataProto.ChunksMetadata getTestMetadata() { + ChunksMetadataProto.ChunksMetadata metadata = new ChunksMetadataProto.ChunksMetadata(); + metadata.checksumType = ChunksMetadataProto.SHA_256; + metadata.cipherType = AES_256_GCM; + return metadata; + } + + private static byte[] stripMetadataAndPositionFromOutput(byte[] output) { + long metadataStart = + Longs.fromByteArray( + Arrays.copyOfRange(output, output.length - Long.BYTES, output.length)); + return Arrays.copyOfRange(output, 0, (int) metadataStart); + } + + private ChunksMetadataProto.ChunkListing expectedChunkListing() { + ChunksMetadataProto.ChunkListing chunkListing = new ChunksMetadataProto.ChunkListing(); + chunkListing.fingerprintMixerSalt = + Arrays.copyOf(TEST_FINGERPRINT_MIXER_SALT, TEST_FINGERPRINT_MIXER_SALT.length); + chunkListing.cipherType = AES_256_GCM; + chunkListing.chunkOrderingType = CHUNK_ORDERING_TYPE_UNSPECIFIED; + chunkListing.chunks = new ChunksMetadataProto.Chunk[3]; + chunkListing.chunks[0] = createChunkFor(TEST_CHUNK_1); + chunkListing.chunks[1] = createChunkFor(TEST_CHUNK_2); + chunkListing.chunks[2] = createChunkFor(TEST_CHUNK_3); + return chunkListing; + } + + private ChunksMetadataProto.Chunk createChunkFor(EncryptedChunk encryptedChunk) { + byte[] chunkHash = encryptedChunk.key().getHash(); + byte[] hashCopy = Arrays.copyOf(chunkHash, chunkHash.length); + return newChunk(hashCopy, mEncryptedChunkEncoder.getEncodedLengthOfChunk(encryptedChunk)); + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ProtoStoreTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ProtoStoreTest.java new file mode 100644 index 000000000000..d73c8e47f609 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ProtoStoreTest.java @@ -0,0 +1,264 @@ +/* + * 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.backup.encryption.chunking; + +import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; + +import static org.testng.Assert.assertThrows; + +import android.content.Context; +import android.platform.test.annotations.Presubmit; + +import androidx.test.core.app.ApplicationProvider; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.protos.nano.KeyValueListingProto; + +import com.google.common.collect.ImmutableMap; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map.Entry; +import java.util.Optional; + +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class ProtoStoreTest { + private static final String TEST_KEY_1 = "test_key_1"; + private static final ChunkHash TEST_HASH_1 = + new ChunkHash(Arrays.copyOf(new byte[] {1}, EncryptedChunk.KEY_LENGTH_BYTES)); + private static final ChunkHash TEST_HASH_2 = + new ChunkHash(Arrays.copyOf(new byte[] {2}, EncryptedChunk.KEY_LENGTH_BYTES)); + private static final int TEST_LENGTH_1 = 10; + private static final int TEST_LENGTH_2 = 18; + + private static final String TEST_PACKAGE_1 = "com.example.test1"; + private static final String TEST_PACKAGE_2 = "com.example.test2"; + + @Rule public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); + + private File mStoreFolder; + private ProtoStore<ChunksMetadataProto.ChunkListing> mProtoStore; + + @Before + public void setUp() throws Exception { + mStoreFolder = mTemporaryFolder.newFolder(); + mProtoStore = new ProtoStore<>(ChunksMetadataProto.ChunkListing.class, mStoreFolder); + } + + @Test + public void differentStoreTypes_operateSimultaneouslyWithoutInterfering() throws Exception { + ChunksMetadataProto.ChunkListing chunkListing = + createChunkListing(ImmutableMap.of(TEST_HASH_1, TEST_LENGTH_1)); + KeyValueListingProto.KeyValueListing keyValueListing = + new KeyValueListingProto.KeyValueListing(); + keyValueListing.entries = new KeyValueListingProto.KeyValueEntry[1]; + keyValueListing.entries[0] = new KeyValueListingProto.KeyValueEntry(); + keyValueListing.entries[0].key = TEST_KEY_1; + keyValueListing.entries[0].hash = TEST_HASH_1.getHash(); + + Context application = ApplicationProvider.getApplicationContext(); + ProtoStore<ChunksMetadataProto.ChunkListing> chunkListingStore = + ProtoStore.createChunkListingStore(application); + ProtoStore<KeyValueListingProto.KeyValueListing> keyValueListingStore = + ProtoStore.createKeyValueListingStore(application); + + chunkListingStore.saveProto(TEST_PACKAGE_1, chunkListing); + keyValueListingStore.saveProto(TEST_PACKAGE_1, keyValueListing); + + ChunksMetadataProto.ChunkListing actualChunkListing = + chunkListingStore.loadProto(TEST_PACKAGE_1).get(); + KeyValueListingProto.KeyValueListing actualKeyValueListing = + keyValueListingStore.loadProto(TEST_PACKAGE_1).get(); + assertListingsEqual(actualChunkListing, chunkListing); + assertThat(actualKeyValueListing.entries.length).isEqualTo(1); + assertThat(actualKeyValueListing.entries[0].key).isEqualTo(TEST_KEY_1); + assertThat(actualKeyValueListing.entries[0].hash).isEqualTo(TEST_HASH_1.getHash()); + } + + @Test + public void construct_storeLocationIsFile_throws() throws Exception { + assertThrows( + IOException.class, + () -> + new ProtoStore<>( + ChunksMetadataProto.ChunkListing.class, + mTemporaryFolder.newFile())); + } + + @Test + public void loadChunkListing_noListingExists_returnsEmptyListing() throws Exception { + Optional<ChunksMetadataProto.ChunkListing> chunkListing = + mProtoStore.loadProto(TEST_PACKAGE_1); + assertThat(chunkListing.isPresent()).isFalse(); + } + + @Test + public void loadChunkListing_listingExists_returnsExistingListing() throws Exception { + ChunksMetadataProto.ChunkListing expected = + createChunkListing( + ImmutableMap.of(TEST_HASH_1, TEST_LENGTH_1, TEST_HASH_2, TEST_LENGTH_2)); + mProtoStore.saveProto(TEST_PACKAGE_1, expected); + + ChunksMetadataProto.ChunkListing result = mProtoStore.loadProto(TEST_PACKAGE_1).get(); + + assertListingsEqual(result, expected); + } + + @Test + public void loadProto_emptyPackageName_throwsException() throws Exception { + assertThrows(IllegalArgumentException.class, () -> mProtoStore.loadProto("")); + } + + @Test + public void loadProto_nullPackageName_throwsException() throws Exception { + assertThrows(IllegalArgumentException.class, () -> mProtoStore.loadProto(null)); + } + + @Test + public void loadProto_packageNameContainsSlash_throwsException() throws Exception { + assertThrows( + IllegalArgumentException.class, () -> mProtoStore.loadProto(TEST_PACKAGE_1 + "/")); + } + + @Test + public void saveProto_persistsToNewInstance() throws Exception { + ChunksMetadataProto.ChunkListing expected = + createChunkListing( + ImmutableMap.of(TEST_HASH_1, TEST_LENGTH_1, TEST_HASH_2, TEST_LENGTH_2)); + mProtoStore.saveProto(TEST_PACKAGE_1, expected); + mProtoStore = new ProtoStore<>(ChunksMetadataProto.ChunkListing.class, mStoreFolder); + + ChunksMetadataProto.ChunkListing result = mProtoStore.loadProto(TEST_PACKAGE_1).get(); + + assertListingsEqual(result, expected); + } + + @Test + public void saveProto_emptyPackageName_throwsException() throws Exception { + assertThrows( + IllegalArgumentException.class, + () -> mProtoStore.saveProto("", new ChunksMetadataProto.ChunkListing())); + } + + @Test + public void saveProto_nullPackageName_throwsException() throws Exception { + assertThrows( + IllegalArgumentException.class, + () -> mProtoStore.saveProto(null, new ChunksMetadataProto.ChunkListing())); + } + + @Test + public void saveProto_packageNameContainsSlash_throwsException() throws Exception { + assertThrows( + IllegalArgumentException.class, + () -> + mProtoStore.saveProto( + TEST_PACKAGE_1 + "/", new ChunksMetadataProto.ChunkListing())); + } + + @Test + public void saveProto_nullListing_throwsException() throws Exception { + assertThrows(NullPointerException.class, () -> mProtoStore.saveProto(TEST_PACKAGE_1, null)); + } + + @Test + public void deleteProto_noListingExists_doesNothing() throws Exception { + ChunksMetadataProto.ChunkListing listing = + createChunkListing(ImmutableMap.of(TEST_HASH_1, TEST_LENGTH_1)); + mProtoStore.saveProto(TEST_PACKAGE_1, listing); + + mProtoStore.deleteProto(TEST_PACKAGE_2); + + assertThat(mProtoStore.loadProto(TEST_PACKAGE_1).get().chunks.length).isEqualTo(1); + } + + @Test + public void deleteProto_listingExists_deletesListing() throws Exception { + ChunksMetadataProto.ChunkListing listing = + createChunkListing(ImmutableMap.of(TEST_HASH_1, TEST_LENGTH_1)); + mProtoStore.saveProto(TEST_PACKAGE_1, listing); + + mProtoStore.deleteProto(TEST_PACKAGE_1); + + assertThat(mProtoStore.loadProto(TEST_PACKAGE_1).isPresent()).isFalse(); + } + + @Test + public void deleteAllProtos_deletesAllProtos() throws Exception { + ChunksMetadataProto.ChunkListing listing1 = + createChunkListing(ImmutableMap.of(TEST_HASH_1, TEST_LENGTH_1)); + ChunksMetadataProto.ChunkListing listing2 = + createChunkListing(ImmutableMap.of(TEST_HASH_2, TEST_LENGTH_2)); + mProtoStore.saveProto(TEST_PACKAGE_1, listing1); + mProtoStore.saveProto(TEST_PACKAGE_2, listing2); + + mProtoStore.deleteAllProtos(); + + assertThat(mProtoStore.loadProto(TEST_PACKAGE_1).isPresent()).isFalse(); + assertThat(mProtoStore.loadProto(TEST_PACKAGE_2).isPresent()).isFalse(); + } + + @Test + public void deleteAllProtos_folderDeleted_doesNotCrash() throws Exception { + mStoreFolder.delete(); + + mProtoStore.deleteAllProtos(); + } + + private static ChunksMetadataProto.ChunkListing createChunkListing( + ImmutableMap<ChunkHash, Integer> chunks) { + ChunksMetadataProto.ChunkListing listing = new ChunksMetadataProto.ChunkListing(); + listing.cipherType = ChunksMetadataProto.AES_256_GCM; + listing.chunkOrderingType = ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED; + + List<ChunksMetadataProto.Chunk> chunkProtos = new ArrayList<>(); + for (Entry<ChunkHash, Integer> entry : chunks.entrySet()) { + ChunksMetadataProto.Chunk chunk = new ChunksMetadataProto.Chunk(); + chunk.hash = entry.getKey().getHash(); + chunk.length = entry.getValue(); + chunkProtos.add(chunk); + } + listing.chunks = chunkProtos.toArray(new ChunksMetadataProto.Chunk[0]); + return listing; + } + + private void assertListingsEqual( + ChunksMetadataProto.ChunkListing result, ChunksMetadataProto.ChunkListing expected) { + assertThat(result.chunks.length).isEqualTo(expected.chunks.length); + for (int i = 0; i < result.chunks.length; i++) { + assertWithMessage("Chunk " + i) + .that(result.chunks[i].length) + .isEqualTo(expected.chunks[i].length); + assertWithMessage("Chunk " + i) + .that(result.chunks[i].hash) + .isEqualTo(expected.chunks[i].hash); + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/BackupFileDecryptorTaskTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/BackupFileDecryptorTaskTest.java new file mode 100644 index 000000000000..07a6fd2d5b60 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/BackupFileDecryptorTaskTest.java @@ -0,0 +1,583 @@ +/* + * 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.backup.encryption.tasks; + +import static com.android.server.backup.testing.CryptoTestUtils.generateAesKey; +import static com.android.server.backup.testing.CryptoTestUtils.newChunkOrdering; +import static com.android.server.backup.testing.CryptoTestUtils.newChunksMetadata; +import static com.android.server.backup.testing.CryptoTestUtils.newPair; + +import static com.google.common.truth.Truth.assertThat; + +import static org.testng.Assert.assertThrows; +import static org.testng.Assert.expectThrows; + +import android.annotation.Nullable; +import android.app.backup.BackupDataInput; +import android.platform.test.annotations.Presubmit; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.chunking.ChunkHasher; +import com.android.server.backup.encryption.chunking.DecryptedChunkFileOutput; +import com.android.server.backup.encryption.chunking.EncryptedChunk; +import com.android.server.backup.encryption.chunking.cdc.FingerprintMixer; +import com.android.server.backup.encryption.kv.DecryptedChunkKvOutput; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunkOrdering; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunksMetadata; +import com.android.server.backup.encryption.protos.nano.KeyValuePairProto.KeyValuePair; +import com.android.server.backup.encryption.tasks.BackupEncrypter.Result; +import com.android.server.backup.testing.CryptoTestUtils; +import com.android.server.testing.shadows.ShadowBackupDataInput; + +import com.google.common.collect.ImmutableMap; +import com.google.protobuf.nano.MessageNano; + +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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileDescriptor; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.RandomAccessFile; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Random; +import java.util.Set; + +import javax.crypto.AEADBadTagException; +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.GCMParameterSpec; + +@Config(shadows = {ShadowBackupDataInput.class}) +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class BackupFileDecryptorTaskTest { + private static final String READ_WRITE_MODE = "rw"; + private static final int BYTES_PER_KILOBYTE = 1024; + private static final int MIN_CHUNK_SIZE_BYTES = 2 * BYTES_PER_KILOBYTE; + private static final int AVERAGE_CHUNK_SIZE_BYTES = 4 * BYTES_PER_KILOBYTE; + private static final int MAX_CHUNK_SIZE_BYTES = 64 * BYTES_PER_KILOBYTE; + private static final int BACKUP_DATA_SIZE_BYTES = 60 * BYTES_PER_KILOBYTE; + private static final int GCM_NONCE_LENGTH_BYTES = 12; + private static final int GCM_TAG_LENGTH_BYTES = 16; + private static final int BITS_PER_BYTE = 8; + private static final int CHECKSUM_LENGTH_BYTES = 256 / BITS_PER_BYTE; + @Nullable private static final FileDescriptor NULL_FILE_DESCRIPTOR = null; + + private static final Set<KeyValuePair> TEST_KV_DATA = new HashSet<>(); + + static { + TEST_KV_DATA.add(newPair("key1", "value1")); + TEST_KV_DATA.add(newPair("key2", "value2")); + } + + @Rule public final TemporaryFolder mTemporaryFolder = new TemporaryFolder(); + + private SecretKey mTertiaryKey; + private SecretKey mChunkEncryptionKey; + private File mInputFile; + private File mOutputFile; + private DecryptedChunkOutput mFileOutput; + private DecryptedChunkKvOutput mKvOutput; + private Random mRandom; + private BackupFileDecryptorTask mTask; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + + mRandom = new Random(); + mTertiaryKey = generateAesKey(); + // In good situations it's always the same. We allow changing it for testing when somehow it + // has become mismatched that we throw an error. + mChunkEncryptionKey = mTertiaryKey; + mInputFile = mTemporaryFolder.newFile(); + mOutputFile = mTemporaryFolder.newFile(); + mFileOutput = new DecryptedChunkFileOutput(mOutputFile); + mKvOutput = new DecryptedChunkKvOutput(new ChunkHasher(mTertiaryKey)); + mTask = new BackupFileDecryptorTask(mTertiaryKey); + } + + @Test + public void decryptFile_throwsForNonExistentInput() throws Exception { + assertThrows( + FileNotFoundException.class, + () -> + mTask.decryptFile( + new File(mTemporaryFolder.newFolder(), "nonexistent"), + mFileOutput)); + } + + @Test + public void decryptFile_throwsForDirectoryInputFile() throws Exception { + assertThrows( + FileNotFoundException.class, + () -> mTask.decryptFile(mTemporaryFolder.newFolder(), mFileOutput)); + } + + @Test + public void decryptFile_withExplicitStarts_decryptsEncryptedData() throws Exception { + byte[] backupData = randomData(BACKUP_DATA_SIZE_BYTES); + createEncryptedFileUsingExplicitStarts(backupData); + + mTask.decryptFile(mInputFile, mFileOutput); + + assertThat(Files.readAllBytes(Paths.get(mOutputFile.toURI()))).isEqualTo(backupData); + } + + @Test + public void decryptFile_withInlineLengths_decryptsEncryptedData() throws Exception { + createEncryptedFileUsingInlineLengths( + TEST_KV_DATA, chunkOrdering -> chunkOrdering, chunksMetadata -> chunksMetadata); + mTask.decryptFile(mInputFile, mKvOutput); + assertThat(asMap(mKvOutput.getPairs())).containsExactlyEntriesIn(asMap(TEST_KV_DATA)); + } + + @Test + public void decryptFile_withNoChunkOrderingType_decryptsUsingExplicitStarts() throws Exception { + byte[] backupData = randomData(BACKUP_DATA_SIZE_BYTES); + createEncryptedFileUsingExplicitStarts( + backupData, + chunkOrdering -> chunkOrdering, + chunksMetadata -> { + ChunksMetadata metadata = CryptoTestUtils.clone(chunksMetadata); + metadata.chunkOrderingType = + ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED; + return metadata; + }); + + mTask.decryptFile(mInputFile, mFileOutput); + + assertThat(Files.readAllBytes(Paths.get(mOutputFile.toURI()))).isEqualTo(backupData); + } + + @Test + public void decryptFile_withInlineLengths_throwsForZeroLengths() throws Exception { + createEncryptedFileUsingInlineLengths( + TEST_KV_DATA, chunkOrdering -> chunkOrdering, chunksMetadata -> chunksMetadata); + + // Set the length of the first chunk to zero. + RandomAccessFile raf = new RandomAccessFile(mInputFile, READ_WRITE_MODE); + raf.seek(0); + raf.writeInt(0); + + assertThrows( + MalformedEncryptedFileException.class, + () -> mTask.decryptFile(mInputFile, mKvOutput)); + } + + @Test + public void decryptFile_withInlineLengths_throwsForLongLengths() throws Exception { + createEncryptedFileUsingInlineLengths( + TEST_KV_DATA, chunkOrdering -> chunkOrdering, chunksMetadata -> chunksMetadata); + + // Set the length of the first chunk to zero. + RandomAccessFile raf = new RandomAccessFile(mInputFile, READ_WRITE_MODE); + raf.seek(0); + raf.writeInt((int) mInputFile.length()); + + assertThrows( + MalformedEncryptedFileException.class, + () -> mTask.decryptFile(mInputFile, mKvOutput)); + } + + @Test + public void decryptFile_throwsForBadKey() throws Exception { + createEncryptedFileUsingExplicitStarts(randomData(BACKUP_DATA_SIZE_BYTES)); + + assertThrows( + AEADBadTagException.class, + () -> + new BackupFileDecryptorTask(generateAesKey()) + .decryptFile(mInputFile, mFileOutput)); + } + + @Test + public void decryptFile_withExplicitStarts_throwsForMangledOrdering() throws Exception { + createEncryptedFileUsingExplicitStarts( + randomData(BACKUP_DATA_SIZE_BYTES), + chunkOrdering -> { + ChunkOrdering ordering = CryptoTestUtils.clone(chunkOrdering); + Arrays.sort(ordering.starts); + return ordering; + }); + + assertThrows( + MessageDigestMismatchException.class, + () -> mTask.decryptFile(mInputFile, mFileOutput)); + } + + @Test + public void decryptFile_withExplicitStarts_noChunks_returnsNoData() throws Exception { + byte[] backupData = randomData(/*length=*/ 0); + createEncryptedFileUsingExplicitStarts( + backupData, + chunkOrdering -> { + ChunkOrdering ordering = CryptoTestUtils.clone(chunkOrdering); + ordering.starts = new int[0]; + return ordering; + }); + + mTask.decryptFile(mInputFile, mFileOutput); + + assertThat(Files.readAllBytes(Paths.get(mOutputFile.toURI()))).isEqualTo(backupData); + } + + @Test + public void decryptFile_throwsForMismatchedChecksum() throws Exception { + createEncryptedFileUsingExplicitStarts( + randomData(BACKUP_DATA_SIZE_BYTES), + chunkOrdering -> { + ChunkOrdering ordering = CryptoTestUtils.clone(chunkOrdering); + ordering.checksum = + Arrays.copyOf(randomData(CHECKSUM_LENGTH_BYTES), CHECKSUM_LENGTH_BYTES); + return ordering; + }); + + assertThrows( + MessageDigestMismatchException.class, + () -> mTask.decryptFile(mInputFile, mFileOutput)); + } + + @Test + public void decryptFile_throwsForBadChunksMetadataOffset() throws Exception { + createEncryptedFileUsingExplicitStarts(randomData(BACKUP_DATA_SIZE_BYTES)); + + // Replace the metadata with all 1s. + RandomAccessFile raf = new RandomAccessFile(mInputFile, READ_WRITE_MODE); + raf.seek(raf.length() - Long.BYTES); + int metadataOffset = (int) raf.readLong(); + int metadataLength = (int) raf.length() - metadataOffset - Long.BYTES; + + byte[] allOnes = new byte[metadataLength]; + Arrays.fill(allOnes, (byte) 1); + + raf.seek(metadataOffset); + raf.write(allOnes, /*off=*/ 0, metadataLength); + + MalformedEncryptedFileException thrown = + expectThrows( + MalformedEncryptedFileException.class, + () -> mTask.decryptFile(mInputFile, mFileOutput)); + assertThat(thrown) + .hasMessageThat() + .isEqualTo( + "Could not read chunks metadata at position " + + metadataOffset + + " of file of " + + raf.length() + + " bytes"); + } + + @Test + public void decryptFile_throwsForChunksMetadataOffsetBeyondEndOfFile() throws Exception { + createEncryptedFileUsingExplicitStarts(randomData(BACKUP_DATA_SIZE_BYTES)); + + RandomAccessFile raf = new RandomAccessFile(mInputFile, READ_WRITE_MODE); + raf.seek(raf.length() - Long.BYTES); + raf.writeLong(raf.length()); + + MalformedEncryptedFileException thrown = + expectThrows( + MalformedEncryptedFileException.class, + () -> mTask.decryptFile(mInputFile, mFileOutput)); + assertThat(thrown) + .hasMessageThat() + .isEqualTo( + raf.length() + + " is not valid position for chunks metadata in file of " + + raf.length() + + " bytes"); + } + + @Test + public void decryptFile_throwsForChunksMetadataOffsetBeforeBeginningOfFile() throws Exception { + createEncryptedFileUsingExplicitStarts(randomData(BACKUP_DATA_SIZE_BYTES)); + + RandomAccessFile raf = new RandomAccessFile(mInputFile, READ_WRITE_MODE); + raf.seek(raf.length() - Long.BYTES); + raf.writeLong(-1); + + MalformedEncryptedFileException thrown = + expectThrows( + MalformedEncryptedFileException.class, + () -> mTask.decryptFile(mInputFile, mFileOutput)); + assertThat(thrown) + .hasMessageThat() + .isEqualTo( + "-1 is not valid position for chunks metadata in file of " + + raf.length() + + " bytes"); + } + + @Test + public void decryptFile_throwsForMangledChunks() throws Exception { + createEncryptedFileUsingExplicitStarts(randomData(BACKUP_DATA_SIZE_BYTES)); + + // Mess up some bits in a random byte + RandomAccessFile raf = new RandomAccessFile(mInputFile, READ_WRITE_MODE); + raf.seek(50); + byte fiftiethByte = raf.readByte(); + raf.seek(50); + raf.write(~fiftiethByte); + + assertThrows(AEADBadTagException.class, () -> mTask.decryptFile(mInputFile, mFileOutput)); + } + + @Test + public void decryptFile_throwsForBadChunkEncryptionKey() throws Exception { + mChunkEncryptionKey = generateAesKey(); + + createEncryptedFileUsingExplicitStarts(randomData(BACKUP_DATA_SIZE_BYTES)); + + assertThrows(AEADBadTagException.class, () -> mTask.decryptFile(mInputFile, mFileOutput)); + } + + @Test + public void decryptFile_throwsForUnsupportedCipherType() throws Exception { + createEncryptedFileUsingExplicitStarts( + randomData(BACKUP_DATA_SIZE_BYTES), + chunkOrdering -> chunkOrdering, + chunksMetadata -> { + ChunksMetadata metadata = CryptoTestUtils.clone(chunksMetadata); + metadata.cipherType = ChunksMetadataProto.UNKNOWN_CIPHER_TYPE; + return metadata; + }); + + assertThrows( + UnsupportedEncryptedFileException.class, + () -> mTask.decryptFile(mInputFile, mFileOutput)); + } + + @Test + public void decryptFile_throwsForUnsupportedMessageDigestType() throws Exception { + createEncryptedFileUsingExplicitStarts( + randomData(BACKUP_DATA_SIZE_BYTES), + chunkOrdering -> chunkOrdering, + chunksMetadata -> { + ChunksMetadata metadata = CryptoTestUtils.clone(chunksMetadata); + metadata.checksumType = ChunksMetadataProto.UNKNOWN_CHECKSUM_TYPE; + return metadata; + }); + + assertThrows( + UnsupportedEncryptedFileException.class, + () -> mTask.decryptFile(mInputFile, mFileOutput)); + } + + /** + * Creates an encrypted backup file from the given data. + * + * @param data The plaintext content. + */ + private void createEncryptedFileUsingExplicitStarts(byte[] data) throws Exception { + createEncryptedFileUsingExplicitStarts(data, chunkOrdering -> chunkOrdering); + } + + /** + * Creates an encrypted backup file from the given data. + * + * @param data The plaintext content. + * @param chunkOrderingTransformer Transforms the ordering before it's encrypted. + */ + private void createEncryptedFileUsingExplicitStarts( + byte[] data, Transformer<ChunkOrdering> chunkOrderingTransformer) throws Exception { + createEncryptedFileUsingExplicitStarts( + data, chunkOrderingTransformer, chunksMetadata -> chunksMetadata); + } + + /** + * Creates an encrypted backup file from the given data in mode {@link + * ChunksMetadataProto#EXPLICIT_STARTS}. + * + * @param data The plaintext content. + * @param chunkOrderingTransformer Transforms the ordering before it's encrypted. + * @param chunksMetadataTransformer Transforms the metadata before it's written. + */ + private void createEncryptedFileUsingExplicitStarts( + byte[] data, + Transformer<ChunkOrdering> chunkOrderingTransformer, + Transformer<ChunksMetadata> chunksMetadataTransformer) + throws Exception { + Result result = backupFullData(data); + + ArrayList<EncryptedChunk> chunks = new ArrayList<>(result.getNewChunks()); + Collections.shuffle(chunks); + HashMap<ChunkHash, Integer> startPositions = new HashMap<>(); + + try (FileOutputStream fos = new FileOutputStream(mInputFile); + DataOutputStream dos = new DataOutputStream(fos)) { + int position = 0; + + for (EncryptedChunk chunk : chunks) { + startPositions.put(chunk.key(), position); + dos.write(chunk.nonce()); + dos.write(chunk.encryptedBytes()); + position += chunk.nonce().length + chunk.encryptedBytes().length; + } + + int[] starts = new int[chunks.size()]; + List<ChunkHash> chunkListing = result.getAllChunks(); + + for (int i = 0; i < chunks.size(); i++) { + starts[i] = startPositions.get(chunkListing.get(i)); + } + + ChunkOrdering chunkOrdering = newChunkOrdering(starts, result.getDigest()); + chunkOrdering = chunkOrderingTransformer.accept(chunkOrdering); + + ChunksMetadata metadata = + newChunksMetadata( + ChunksMetadataProto.AES_256_GCM, + ChunksMetadataProto.SHA_256, + ChunksMetadataProto.EXPLICIT_STARTS, + encrypt(chunkOrdering)); + metadata = chunksMetadataTransformer.accept(metadata); + + dos.write(MessageNano.toByteArray(metadata)); + dos.writeLong(position); + } + } + + /** + * Creates an encrypted backup file from the given data in mode {@link + * ChunksMetadataProto#INLINE_LENGTHS}. + * + * @param data The plaintext key value pairs to back up. + * @param chunkOrderingTransformer Transforms the ordering before it's encrypted. + * @param chunksMetadataTransformer Transforms the metadata before it's written. + */ + private void createEncryptedFileUsingInlineLengths( + Set<KeyValuePair> data, + Transformer<ChunkOrdering> chunkOrderingTransformer, + Transformer<ChunksMetadata> chunksMetadataTransformer) + throws Exception { + Result result = backupKvData(data); + + List<EncryptedChunk> chunks = new ArrayList<>(result.getNewChunks()); + System.out.println("we have chunk count " + chunks.size()); + Collections.shuffle(chunks); + + try (FileOutputStream fos = new FileOutputStream(mInputFile); + DataOutputStream dos = new DataOutputStream(fos)) { + for (EncryptedChunk chunk : chunks) { + dos.writeInt(chunk.nonce().length + chunk.encryptedBytes().length); + dos.write(chunk.nonce()); + dos.write(chunk.encryptedBytes()); + } + + ChunkOrdering chunkOrdering = newChunkOrdering(null, result.getDigest()); + chunkOrdering = chunkOrderingTransformer.accept(chunkOrdering); + + ChunksMetadata metadata = + newChunksMetadata( + ChunksMetadataProto.AES_256_GCM, + ChunksMetadataProto.SHA_256, + ChunksMetadataProto.INLINE_LENGTHS, + encrypt(chunkOrdering)); + metadata = chunksMetadataTransformer.accept(metadata); + + int metadataStart = dos.size(); + dos.write(MessageNano.toByteArray(metadata)); + dos.writeLong(metadataStart); + } + } + + /** Performs a full backup of the given data, and returns the chunks. */ + private BackupEncrypter.Result backupFullData(byte[] data) throws Exception { + BackupStreamEncrypter encrypter = + new BackupStreamEncrypter( + new ByteArrayInputStream(data), + MIN_CHUNK_SIZE_BYTES, + MAX_CHUNK_SIZE_BYTES, + AVERAGE_CHUNK_SIZE_BYTES); + return encrypter.backup( + mChunkEncryptionKey, + randomData(FingerprintMixer.SALT_LENGTH_BYTES), + new HashSet<>()); + } + + private Result backupKvData(Set<KeyValuePair> data) throws Exception { + ShadowBackupDataInput.reset(); + for (KeyValuePair pair : data) { + ShadowBackupDataInput.addEntity(pair.key, pair.value); + } + KvBackupEncrypter encrypter = + new KvBackupEncrypter(new BackupDataInput(NULL_FILE_DESCRIPTOR)); + return encrypter.backup( + mChunkEncryptionKey, + randomData(FingerprintMixer.SALT_LENGTH_BYTES), + Collections.EMPTY_SET); + } + + /** Encrypts {@code chunkOrdering} using {@link #mTertiaryKey}. */ + private byte[] encrypt(ChunkOrdering chunkOrdering) throws Exception { + Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); + byte[] nonce = randomData(GCM_NONCE_LENGTH_BYTES); + cipher.init( + Cipher.ENCRYPT_MODE, + mTertiaryKey, + new GCMParameterSpec(GCM_TAG_LENGTH_BYTES * BITS_PER_BYTE, nonce)); + byte[] nanoBytes = MessageNano.toByteArray(chunkOrdering); + byte[] encryptedBytes = cipher.doFinal(nanoBytes); + + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + out.write(nonce); + out.write(encryptedBytes); + return out.toByteArray(); + } + } + + /** Returns {@code length} random bytes. */ + private byte[] randomData(int length) { + byte[] data = new byte[length]; + mRandom.nextBytes(data); + return data; + } + + private static ImmutableMap<String, String> asMap(Collection<KeyValuePair> pairs) { + ImmutableMap.Builder<String, String> map = ImmutableMap.builder(); + for (KeyValuePair pair : pairs) { + map.put(pair.key, new String(pair.value, Charset.forName("UTF-8"))); + } + return map.build(); + } + + private interface Transformer<T> { + T accept(T t); + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedBackupTaskTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedBackupTaskTest.java new file mode 100644 index 000000000000..f6914efd6d83 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedBackupTaskTest.java @@ -0,0 +1,397 @@ +/* + * 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.backup.encryption.tasks; + +import static com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.AES_256_GCM; +import static com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.CHUNK_ORDERING_TYPE_UNSPECIFIED; +import static com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.SHA_256; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertThrows; + +import android.platform.test.annotations.Presubmit; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.chunking.BackupFileBuilder; +import com.android.server.backup.encryption.chunking.EncryptedChunk; +import com.android.server.backup.encryption.chunking.EncryptedChunkEncoder; +import com.android.server.backup.encryption.chunking.LengthlessEncryptedChunkEncoder; +import com.android.server.backup.encryption.client.CryptoBackupServer; +import com.android.server.backup.encryption.keys.TertiaryKeyGenerator; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunkListing; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunkOrdering; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunksMetadata; +import com.android.server.backup.encryption.protos.nano.WrappedKeyProto.WrappedKey; +import com.android.server.backup.encryption.tasks.BackupEncrypter.Result; +import com.android.server.backup.testing.CryptoTestUtils; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.protobuf.nano.MessageNano; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; + +import java.io.OutputStream; +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.concurrent.CancellationException; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.GCMParameterSpec; + +@Config(shadows = {EncryptedBackupTaskTest.ShadowBackupFileBuilder.class}) +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class EncryptedBackupTaskTest { + + private static final String CIPHER_ALGORITHM = "AES/GCM/NoPadding"; + private static final int GCM_NONCE_LENGTH_BYTES = 12; + private static final int GCM_TAG_LENGTH_BYTES = 16; + private static final int BITS_PER_BYTE = 8; + + private static final byte[] TEST_FINGERPRINT_MIXER_SALT = + Arrays.copyOf(new byte[] {22}, ChunkHash.HASH_LENGTH_BYTES); + + private static final byte[] TEST_NONCE = + Arrays.copyOf(new byte[] {55}, EncryptedChunk.NONCE_LENGTH_BYTES); + + private static final ChunkHash TEST_HASH_1 = + new ChunkHash(Arrays.copyOf(new byte[] {1}, ChunkHash.HASH_LENGTH_BYTES)); + private static final ChunkHash TEST_HASH_2 = + new ChunkHash(Arrays.copyOf(new byte[] {2}, ChunkHash.HASH_LENGTH_BYTES)); + private static final ChunkHash TEST_HASH_3 = + new ChunkHash(Arrays.copyOf(new byte[] {3}, ChunkHash.HASH_LENGTH_BYTES)); + + private static final EncryptedChunk TEST_CHUNK_1 = + EncryptedChunk.create(TEST_HASH_1, TEST_NONCE, new byte[] {1, 2, 3, 4, 5}); + private static final EncryptedChunk TEST_CHUNK_2 = + EncryptedChunk.create(TEST_HASH_2, TEST_NONCE, new byte[] {6, 7, 8, 9, 10}); + private static final EncryptedChunk TEST_CHUNK_3 = + EncryptedChunk.create(TEST_HASH_3, TEST_NONCE, new byte[] {11, 12, 13, 14, 15}); + + private static final byte[] TEST_CHECKSUM = Arrays.copyOf(new byte[] {10}, 258 / 8); + private static final String TEST_PACKAGE_NAME = "com.example.package"; + private static final String TEST_OLD_DOCUMENT_ID = "old_doc_1"; + private static final String TEST_NEW_DOCUMENT_ID = "new_doc_1"; + + @Captor private ArgumentCaptor<ChunksMetadata> mMetadataCaptor; + + @Mock private CryptoBackupServer mCryptoBackupServer; + @Mock private BackupEncrypter mBackupEncrypter; + @Mock private BackupFileBuilder mBackupFileBuilder; + + private ChunkListing mOldChunkListing; + private SecretKey mTertiaryKey; + private WrappedKey mWrappedTertiaryKey; + private EncryptedChunkEncoder mEncryptedChunkEncoder; + private EncryptedBackupTask mTask; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + + SecureRandom secureRandom = new SecureRandom(); + mTertiaryKey = new TertiaryKeyGenerator(secureRandom).generate(); + mWrappedTertiaryKey = new WrappedKey(); + + mEncryptedChunkEncoder = new LengthlessEncryptedChunkEncoder(); + + ShadowBackupFileBuilder.sInstance = mBackupFileBuilder; + + mTask = + new EncryptedBackupTask( + mCryptoBackupServer, secureRandom, TEST_PACKAGE_NAME, mBackupEncrypter); + } + + @Test + public void performNonIncrementalBackup_performsBackup() throws Exception { + setUpWithoutExistingBackup(); + + // Chunk listing and ordering don't matter for this test. + when(mBackupFileBuilder.getNewChunkListing(any())).thenReturn(new ChunkListing()); + when(mBackupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM)).thenReturn(new ChunkOrdering()); + + when(mCryptoBackupServer.uploadNonIncrementalBackup(eq(TEST_PACKAGE_NAME), any(), any())) + .thenReturn(TEST_NEW_DOCUMENT_ID); + + mTask.performNonIncrementalBackup( + mTertiaryKey, mWrappedTertiaryKey, TEST_FINGERPRINT_MIXER_SALT); + + verify(mBackupFileBuilder) + .writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2), + ImmutableMap.of(TEST_HASH_1, TEST_CHUNK_1, TEST_HASH_2, TEST_CHUNK_2)); + verify(mBackupFileBuilder).finish(any()); + verify(mCryptoBackupServer) + .uploadNonIncrementalBackup(eq(TEST_PACKAGE_NAME), any(), eq(mWrappedTertiaryKey)); + } + + @Test + public void performIncrementalBackup_performsBackup() throws Exception { + setUpWithExistingBackup(); + + // Chunk listing and ordering don't matter for this test. + when(mBackupFileBuilder.getNewChunkListing(any())).thenReturn(new ChunkListing()); + when(mBackupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM)).thenReturn(new ChunkOrdering()); + + when(mCryptoBackupServer.uploadIncrementalBackup( + eq(TEST_PACKAGE_NAME), eq(TEST_OLD_DOCUMENT_ID), any(), any())) + .thenReturn(TEST_NEW_DOCUMENT_ID); + + mTask.performIncrementalBackup(mTertiaryKey, mWrappedTertiaryKey, mOldChunkListing); + + verify(mBackupFileBuilder) + .writeChunks( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2, TEST_HASH_3), + ImmutableMap.of(TEST_HASH_2, TEST_CHUNK_2)); + verify(mBackupFileBuilder).finish(any()); + verify(mCryptoBackupServer) + .uploadIncrementalBackup( + eq(TEST_PACKAGE_NAME), + eq(TEST_OLD_DOCUMENT_ID), + any(), + eq(mWrappedTertiaryKey)); + } + + @Test + public void performIncrementalBackup_returnsNewChunkListingWithDocId() throws Exception { + setUpWithExistingBackup(); + + ChunkListing chunkListingWithoutDocId = + CryptoTestUtils.newChunkListingWithoutDocId( + TEST_FINGERPRINT_MIXER_SALT, + AES_256_GCM, + CHUNK_ORDERING_TYPE_UNSPECIFIED, + createChunkProtoFor(TEST_HASH_1, TEST_CHUNK_1), + createChunkProtoFor(TEST_HASH_2, TEST_CHUNK_2)); + when(mBackupFileBuilder.getNewChunkListing(any())).thenReturn(chunkListingWithoutDocId); + + // Chunk ordering doesn't matter for this test. + when(mBackupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM)).thenReturn(new ChunkOrdering()); + + when(mCryptoBackupServer.uploadIncrementalBackup( + eq(TEST_PACKAGE_NAME), eq(TEST_OLD_DOCUMENT_ID), any(), any())) + .thenReturn(TEST_NEW_DOCUMENT_ID); + + ChunkListing actualChunkListing = + mTask.performIncrementalBackup(mTertiaryKey, mWrappedTertiaryKey, mOldChunkListing); + + ChunkListing expectedChunkListing = CryptoTestUtils.clone(chunkListingWithoutDocId); + expectedChunkListing.documentId = TEST_NEW_DOCUMENT_ID; + assertChunkListingsAreEqual(actualChunkListing, expectedChunkListing); + } + + @Test + public void performNonIncrementalBackup_returnsNewChunkListingWithDocId() throws Exception { + setUpWithoutExistingBackup(); + + ChunkListing chunkListingWithoutDocId = + CryptoTestUtils.newChunkListingWithoutDocId( + TEST_FINGERPRINT_MIXER_SALT, + AES_256_GCM, + CHUNK_ORDERING_TYPE_UNSPECIFIED, + createChunkProtoFor(TEST_HASH_1, TEST_CHUNK_1), + createChunkProtoFor(TEST_HASH_2, TEST_CHUNK_2)); + when(mBackupFileBuilder.getNewChunkListing(any())).thenReturn(chunkListingWithoutDocId); + + // Chunk ordering doesn't matter for this test. + when(mBackupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM)).thenReturn(new ChunkOrdering()); + + when(mCryptoBackupServer.uploadNonIncrementalBackup(eq(TEST_PACKAGE_NAME), any(), any())) + .thenReturn(TEST_NEW_DOCUMENT_ID); + + ChunkListing actualChunkListing = + mTask.performNonIncrementalBackup( + mTertiaryKey, mWrappedTertiaryKey, TEST_FINGERPRINT_MIXER_SALT); + + ChunkListing expectedChunkListing = CryptoTestUtils.clone(chunkListingWithoutDocId); + expectedChunkListing.documentId = TEST_NEW_DOCUMENT_ID; + assertChunkListingsAreEqual(actualChunkListing, expectedChunkListing); + } + + @Test + public void performNonIncrementalBackup_buildsCorrectChunkMetadata() throws Exception { + setUpWithoutExistingBackup(); + + // Chunk listing doesn't matter for this test. + when(mBackupFileBuilder.getNewChunkListing(any())).thenReturn(new ChunkListing()); + + ChunkOrdering expectedOrdering = + CryptoTestUtils.newChunkOrdering(new int[10], TEST_CHECKSUM); + when(mBackupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM)).thenReturn(expectedOrdering); + + when(mCryptoBackupServer.uploadNonIncrementalBackup(eq(TEST_PACKAGE_NAME), any(), any())) + .thenReturn(TEST_NEW_DOCUMENT_ID); + + mTask.performNonIncrementalBackup( + mTertiaryKey, mWrappedTertiaryKey, TEST_FINGERPRINT_MIXER_SALT); + + verify(mBackupFileBuilder).finish(mMetadataCaptor.capture()); + + ChunksMetadata actualMetadata = mMetadataCaptor.getValue(); + assertThat(actualMetadata.checksumType).isEqualTo(SHA_256); + assertThat(actualMetadata.cipherType).isEqualTo(AES_256_GCM); + + ChunkOrdering actualOrdering = decryptChunkOrdering(actualMetadata.chunkOrdering); + assertThat(actualOrdering.checksum).isEqualTo(TEST_CHECKSUM); + assertThat(actualOrdering.starts).isEqualTo(expectedOrdering.starts); + } + + @Test + public void cancel_incrementalBackup_doesNotUploadOrSaveChunkListing() throws Exception { + setUpWithExistingBackup(); + + // Chunk listing and ordering don't matter for this test. + when(mBackupFileBuilder.getNewChunkListing(any())).thenReturn(new ChunkListing()); + when(mBackupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM)).thenReturn(new ChunkOrdering()); + + mTask.cancel(); + assertThrows( + CancellationException.class, + () -> + mTask.performIncrementalBackup( + mTertiaryKey, mWrappedTertiaryKey, mOldChunkListing)); + + verify(mCryptoBackupServer, never()).uploadIncrementalBackup(any(), any(), any(), any()); + verify(mCryptoBackupServer, never()).uploadNonIncrementalBackup(any(), any(), any()); + } + + @Test + public void cancel_nonIncrementalBackup_doesNotUploadOrSaveChunkListing() throws Exception { + setUpWithoutExistingBackup(); + + // Chunk listing and ordering don't matter for this test. + when(mBackupFileBuilder.getNewChunkListing(any())).thenReturn(new ChunkListing()); + when(mBackupFileBuilder.getNewChunkOrdering(TEST_CHECKSUM)).thenReturn(new ChunkOrdering()); + + mTask.cancel(); + assertThrows( + CancellationException.class, + () -> + mTask.performNonIncrementalBackup( + mTertiaryKey, mWrappedTertiaryKey, TEST_FINGERPRINT_MIXER_SALT)); + + verify(mCryptoBackupServer, never()).uploadIncrementalBackup(any(), any(), any(), any()); + verify(mCryptoBackupServer, never()).uploadNonIncrementalBackup(any(), any(), any()); + } + + /** Sets up a backup of [CHUNK 1][CHUNK 2] with no existing data. */ + private void setUpWithoutExistingBackup() throws Exception { + Result result = + new Result( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2), + ImmutableList.of(TEST_CHUNK_1, TEST_CHUNK_2), + TEST_CHECKSUM); + when(mBackupEncrypter.backup(any(), eq(TEST_FINGERPRINT_MIXER_SALT), eq(ImmutableSet.of()))) + .thenReturn(result); + } + + /** + * Sets up a backup of [CHUNK 1][CHUNK 2][CHUNK 3] where the previous backup contained [CHUNK + * 1][CHUNK 3]. + */ + private void setUpWithExistingBackup() throws Exception { + mOldChunkListing = + CryptoTestUtils.newChunkListing( + TEST_OLD_DOCUMENT_ID, + TEST_FINGERPRINT_MIXER_SALT, + AES_256_GCM, + CHUNK_ORDERING_TYPE_UNSPECIFIED, + createChunkProtoFor(TEST_HASH_1, TEST_CHUNK_1), + createChunkProtoFor(TEST_HASH_3, TEST_CHUNK_3)); + + Result result = + new Result( + ImmutableList.of(TEST_HASH_1, TEST_HASH_2, TEST_HASH_3), + ImmutableList.of(TEST_CHUNK_2), + TEST_CHECKSUM); + when(mBackupEncrypter.backup( + any(), + eq(TEST_FINGERPRINT_MIXER_SALT), + eq(ImmutableSet.of(TEST_HASH_1, TEST_HASH_3)))) + .thenReturn(result); + } + + private ChunksMetadataProto.Chunk createChunkProtoFor( + ChunkHash chunkHash, EncryptedChunk encryptedChunk) { + return CryptoTestUtils.newChunk( + chunkHash, mEncryptedChunkEncoder.getEncodedLengthOfChunk(encryptedChunk)); + } + + private ChunkOrdering decryptChunkOrdering(byte[] encryptedOrdering) throws Exception { + Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM); + cipher.init( + Cipher.DECRYPT_MODE, + mTertiaryKey, + new GCMParameterSpec( + GCM_TAG_LENGTH_BYTES * BITS_PER_BYTE, + encryptedOrdering, + /*offset=*/ 0, + GCM_NONCE_LENGTH_BYTES)); + byte[] decrypted = + cipher.doFinal( + encryptedOrdering, + GCM_NONCE_LENGTH_BYTES, + encryptedOrdering.length - GCM_NONCE_LENGTH_BYTES); + return ChunkOrdering.parseFrom(decrypted); + } + + // This method is needed because nano protobuf generated classes dont implmenent + // .equals + private void assertChunkListingsAreEqual(ChunkListing a, ChunkListing b) { + byte[] aBytes = MessageNano.toByteArray(a); + byte[] bBytes = MessageNano.toByteArray(b); + + assertThat(aBytes).isEqualTo(bBytes); + } + + @Implements(BackupFileBuilder.class) + public static class ShadowBackupFileBuilder { + + private static BackupFileBuilder sInstance; + + @Implementation + public static BackupFileBuilder createForNonIncremental(OutputStream outputStream) { + return sInstance; + } + + @Implementation + public static BackupFileBuilder createForIncremental( + OutputStream outputStream, ChunkListing oldChunkListing) { + return sInstance; + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/FullRestoreToFileTaskTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/FullRestoreToFileTaskTest.java new file mode 100644 index 000000000000..de8b7340ebce --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/FullRestoreToFileTaskTest.java @@ -0,0 +1,128 @@ +/* + * 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.backup.encryption.tasks; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertThrows; + +import android.platform.test.annotations.Presubmit; + +import com.android.server.backup.encryption.FullRestoreDownloader; +import com.android.server.backup.encryption.FullRestoreDownloader.FinishType; + +import com.google.common.io.Files; + +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 org.robolectric.RobolectricTestRunner; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.util.Random; + +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class FullRestoreToFileTaskTest { + private static final int TEST_RANDOM_SEED = 34; + private static final int TEST_MAX_CHUNK_SIZE_BYTES = 5; + private static final int TEST_DATA_LENGTH_BYTES = TEST_MAX_CHUNK_SIZE_BYTES * 20; + + @Rule public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); + + private byte[] mTestData; + private File mTargetFile; + private FakeFullRestoreDownloader mFakeFullRestoreDownloader; + @Mock private FullRestoreDownloader mMockFullRestoreDownloader; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + + mTargetFile = mTemporaryFolder.newFile(); + + mTestData = new byte[TEST_DATA_LENGTH_BYTES]; + new Random(TEST_RANDOM_SEED).nextBytes(mTestData); + mFakeFullRestoreDownloader = new FakeFullRestoreDownloader(mTestData); + } + + private FullRestoreToFileTask createTaskWithFakeDownloader() { + return new FullRestoreToFileTask(mFakeFullRestoreDownloader, TEST_MAX_CHUNK_SIZE_BYTES); + } + + private FullRestoreToFileTask createTaskWithMockDownloader() { + return new FullRestoreToFileTask(mMockFullRestoreDownloader, TEST_MAX_CHUNK_SIZE_BYTES); + } + + @Test + public void restoreToFile_readsDataAndWritesToFile() throws Exception { + FullRestoreToFileTask task = createTaskWithFakeDownloader(); + task.restoreToFile(mTargetFile); + assertThat(Files.toByteArray(mTargetFile)).isEqualTo(mTestData); + } + + @Test + public void restoreToFile_noErrors_closesDownloaderWithFinished() throws Exception { + FullRestoreToFileTask task = createTaskWithMockDownloader(); + when(mMockFullRestoreDownloader.readNextChunk(any())).thenReturn(-1); + + task.restoreToFile(mTargetFile); + + verify(mMockFullRestoreDownloader).finish(FinishType.FINISHED); + } + + @Test + public void restoreToFile_ioException_closesDownloaderWithTransferFailure() throws Exception { + FullRestoreToFileTask task = createTaskWithMockDownloader(); + when(mMockFullRestoreDownloader.readNextChunk(any())).thenThrow(IOException.class); + + assertThrows(IOException.class, () -> task.restoreToFile(mTargetFile)); + + verify(mMockFullRestoreDownloader).finish(FinishType.TRANSFER_FAILURE); + } + + /** Fake package wrapper which returns data from a byte array. */ + private static class FakeFullRestoreDownloader extends FullRestoreDownloader { + + private final ByteArrayInputStream mData; + + FakeFullRestoreDownloader(byte[] data) { + // We override all methods of the superclass, so it does not require any collaborators. + super(); + this.mData = new ByteArrayInputStream(data); + } + + @Override + public int readNextChunk(byte[] buffer) throws IOException { + return mData.read(buffer); + } + + @Override + public void finish(FinishType finishType) { + // Do nothing. + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/KvBackupEncrypterTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/KvBackupEncrypterTest.java new file mode 100644 index 000000000000..ccfbfa4b25e9 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/KvBackupEncrypterTest.java @@ -0,0 +1,287 @@ +/* + * 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.backup.encryption.tasks; + +import static com.google.common.truth.Truth.assertThat; + +import static org.testng.Assert.assertThrows; + +import android.app.backup.BackupDataInput; +import android.platform.test.annotations.Presubmit; +import android.util.Pair; + +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.chunking.ChunkHasher; +import com.android.server.backup.encryption.chunking.EncryptedChunk; +import com.android.server.backup.encryption.kv.KeyValueListingBuilder; +import com.android.server.backup.encryption.protos.nano.KeyValueListingProto.KeyValueListing; +import com.android.server.backup.encryption.protos.nano.KeyValuePairProto.KeyValuePair; +import com.android.server.backup.encryption.tasks.BackupEncrypter.Result; +import com.android.server.testing.shadows.DataEntity; +import com.android.server.testing.shadows.ShadowBackupDataInput; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Ordering; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import java.security.MessageDigest; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.GCMParameterSpec; +import javax.crypto.spec.SecretKeySpec; + +@RunWith(RobolectricTestRunner.class) +@Presubmit +@Config(shadows = {ShadowBackupDataInput.class}) +public class KvBackupEncrypterTest { + private static final String KEY_ALGORITHM = "AES"; + private static final String CIPHER_ALGORITHM = "AES/GCM/NoPadding"; + private static final int GCM_TAG_LENGTH_BYTES = 16; + + private static final byte[] TEST_TERTIARY_KEY = Arrays.copyOf(new byte[0], 256 / Byte.SIZE); + private static final String TEST_KEY_1 = "test_key_1"; + private static final String TEST_KEY_2 = "test_key_2"; + private static final String TEST_KEY_3 = "test_key_3"; + private static final byte[] TEST_VALUE_1 = {10, 11, 12}; + private static final byte[] TEST_VALUE_2 = {13, 14, 15}; + private static final byte[] TEST_VALUE_2B = {13, 14, 15, 16}; + private static final byte[] TEST_VALUE_3 = {16, 17, 18}; + + private SecretKey mSecretKey; + private ChunkHasher mChunkHasher; + + @Before + public void setUp() { + mSecretKey = new SecretKeySpec(TEST_TERTIARY_KEY, KEY_ALGORITHM); + mChunkHasher = new ChunkHasher(mSecretKey); + + ShadowBackupDataInput.reset(); + } + + private KvBackupEncrypter createEncrypter(KeyValueListing keyValueListing) { + KvBackupEncrypter encrypter = new KvBackupEncrypter(new BackupDataInput(null)); + encrypter.setOldKeyValueListing(keyValueListing); + return encrypter; + } + + @Test + public void backup_noExistingBackup_encryptsAllPairs() throws Exception { + ShadowBackupDataInput.addEntity(TEST_KEY_1, TEST_VALUE_1); + ShadowBackupDataInput.addEntity(TEST_KEY_2, TEST_VALUE_2); + + KeyValueListing emptyKeyValueListing = new KeyValueListingBuilder().build(); + ImmutableSet<ChunkHash> emptyExistingChunks = ImmutableSet.of(); + KvBackupEncrypter encrypter = createEncrypter(emptyKeyValueListing); + + Result result = + encrypter.backup( + mSecretKey, /*unusedFingerprintMixerSalt=*/ null, emptyExistingChunks); + + assertThat(result.getAllChunks()).hasSize(2); + EncryptedChunk chunk1 = result.getNewChunks().get(0); + EncryptedChunk chunk2 = result.getNewChunks().get(1); + assertThat(chunk1.key()).isEqualTo(getChunkHash(TEST_KEY_1, TEST_VALUE_1)); + KeyValuePair pair1 = decryptChunk(chunk1); + assertThat(pair1.key).isEqualTo(TEST_KEY_1); + assertThat(pair1.value).isEqualTo(TEST_VALUE_1); + assertThat(chunk2.key()).isEqualTo(getChunkHash(TEST_KEY_2, TEST_VALUE_2)); + KeyValuePair pair2 = decryptChunk(chunk2); + assertThat(pair2.key).isEqualTo(TEST_KEY_2); + assertThat(pair2.value).isEqualTo(TEST_VALUE_2); + } + + @Test + public void backup_existingBackup_encryptsNewAndUpdatedPairs() throws Exception { + Pair<KeyValueListing, Set<ChunkHash>> initialResult = runInitialBackupOfPairs1And2(); + + // Update key 2 and add the new key 3. + ShadowBackupDataInput.reset(); + ShadowBackupDataInput.addEntity(TEST_KEY_2, TEST_VALUE_2B); + ShadowBackupDataInput.addEntity(TEST_KEY_3, TEST_VALUE_3); + + KvBackupEncrypter encrypter = createEncrypter(initialResult.first); + BackupEncrypter.Result secondResult = + encrypter.backup( + mSecretKey, /*unusedFingerprintMixerSalt=*/ null, initialResult.second); + + assertThat(secondResult.getAllChunks()).hasSize(3); + assertThat(secondResult.getNewChunks()).hasSize(2); + EncryptedChunk newChunk2 = secondResult.getNewChunks().get(0); + EncryptedChunk newChunk3 = secondResult.getNewChunks().get(1); + assertThat(newChunk2.key()).isEqualTo(getChunkHash(TEST_KEY_2, TEST_VALUE_2B)); + assertThat(decryptChunk(newChunk2).value).isEqualTo(TEST_VALUE_2B); + assertThat(newChunk3.key()).isEqualTo(getChunkHash(TEST_KEY_3, TEST_VALUE_3)); + assertThat(decryptChunk(newChunk3).value).isEqualTo(TEST_VALUE_3); + } + + @Test + public void backup_allChunksContainsHashesOfAllChunks() throws Exception { + Pair<KeyValueListing, Set<ChunkHash>> initialResult = runInitialBackupOfPairs1And2(); + + ShadowBackupDataInput.reset(); + ShadowBackupDataInput.addEntity(TEST_KEY_3, TEST_VALUE_3); + + KvBackupEncrypter encrypter = createEncrypter(initialResult.first); + BackupEncrypter.Result secondResult = + encrypter.backup( + mSecretKey, /*unusedFingerprintMixerSalt=*/ null, initialResult.second); + + assertThat(secondResult.getAllChunks()) + .containsExactly( + getChunkHash(TEST_KEY_1, TEST_VALUE_1), + getChunkHash(TEST_KEY_2, TEST_VALUE_2), + getChunkHash(TEST_KEY_3, TEST_VALUE_3)); + } + + @Test + public void backup_negativeSize_deletesKeyFromExistingBackup() throws Exception { + Pair<KeyValueListing, Set<ChunkHash>> initialResult = runInitialBackupOfPairs1And2(); + + ShadowBackupDataInput.reset(); + ShadowBackupDataInput.addEntity(new DataEntity(TEST_KEY_2)); + + KvBackupEncrypter encrypter = createEncrypter(initialResult.first); + Result secondResult = + encrypter.backup( + mSecretKey, /*unusedFingerprintMixerSalt=*/ null, initialResult.second); + + assertThat(secondResult.getAllChunks()) + .containsExactly(getChunkHash(TEST_KEY_1, TEST_VALUE_1)); + assertThat(secondResult.getNewChunks()).isEmpty(); + } + + @Test + public void backup_returnsMessageDigestOverChunkHashes() throws Exception { + Pair<KeyValueListing, Set<ChunkHash>> initialResult = runInitialBackupOfPairs1And2(); + + ShadowBackupDataInput.reset(); + ShadowBackupDataInput.addEntity(TEST_KEY_3, TEST_VALUE_3); + + KvBackupEncrypter encrypter = createEncrypter(initialResult.first); + Result secondResult = + encrypter.backup( + mSecretKey, /*unusedFingerprintMixerSalt=*/ null, initialResult.second); + + MessageDigest messageDigest = + MessageDigest.getInstance(BackupEncrypter.MESSAGE_DIGEST_ALGORITHM); + ImmutableList<ChunkHash> sortedHashes = + Ordering.natural() + .immutableSortedCopy( + ImmutableList.of( + getChunkHash(TEST_KEY_1, TEST_VALUE_1), + getChunkHash(TEST_KEY_2, TEST_VALUE_2), + getChunkHash(TEST_KEY_3, TEST_VALUE_3))); + messageDigest.update(sortedHashes.get(0).getHash()); + messageDigest.update(sortedHashes.get(1).getHash()); + messageDigest.update(sortedHashes.get(2).getHash()); + assertThat(secondResult.getDigest()).isEqualTo(messageDigest.digest()); + } + + @Test + public void getNewKeyValueListing_noExistingBackup_returnsCorrectListing() throws Exception { + KeyValueListing keyValueListing = runInitialBackupOfPairs1And2().first; + + assertThat(keyValueListing.entries.length).isEqualTo(2); + assertThat(keyValueListing.entries[0].key).isEqualTo(TEST_KEY_1); + assertThat(keyValueListing.entries[0].hash) + .isEqualTo(getChunkHash(TEST_KEY_1, TEST_VALUE_1).getHash()); + assertThat(keyValueListing.entries[1].key).isEqualTo(TEST_KEY_2); + assertThat(keyValueListing.entries[1].hash) + .isEqualTo(getChunkHash(TEST_KEY_2, TEST_VALUE_2).getHash()); + } + + @Test + public void getNewKeyValueListing_existingBackup_returnsCorrectListing() throws Exception { + Pair<KeyValueListing, Set<ChunkHash>> initialResult = runInitialBackupOfPairs1And2(); + + ShadowBackupDataInput.reset(); + ShadowBackupDataInput.addEntity(TEST_KEY_2, TEST_VALUE_2B); + ShadowBackupDataInput.addEntity(TEST_KEY_3, TEST_VALUE_3); + + KvBackupEncrypter encrypter = createEncrypter(initialResult.first); + encrypter.backup(mSecretKey, /*unusedFingerprintMixerSalt=*/ null, initialResult.second); + + ImmutableMap<String, ChunkHash> keyValueListing = + listingToMap(encrypter.getNewKeyValueListing()); + assertThat(keyValueListing).hasSize(3); + assertThat(keyValueListing) + .containsEntry(TEST_KEY_1, getChunkHash(TEST_KEY_1, TEST_VALUE_1)); + assertThat(keyValueListing) + .containsEntry(TEST_KEY_2, getChunkHash(TEST_KEY_2, TEST_VALUE_2B)); + assertThat(keyValueListing) + .containsEntry(TEST_KEY_3, getChunkHash(TEST_KEY_3, TEST_VALUE_3)); + } + + @Test + public void getNewKeyValueChunkListing_beforeBackup_throws() throws Exception { + KvBackupEncrypter encrypter = createEncrypter(new KeyValueListing()); + assertThrows(IllegalStateException.class, encrypter::getNewKeyValueListing); + } + + private ImmutableMap<String, ChunkHash> listingToMap(KeyValueListing listing) { + // We can't use the ImmutableMap collector directly because it isn't supported in Android + // guava. + return ImmutableMap.copyOf( + Arrays.stream(listing.entries) + .collect( + Collectors.toMap( + entry -> entry.key, entry -> new ChunkHash(entry.hash)))); + } + + private Pair<KeyValueListing, Set<ChunkHash>> runInitialBackupOfPairs1And2() throws Exception { + ShadowBackupDataInput.addEntity(TEST_KEY_1, TEST_VALUE_1); + ShadowBackupDataInput.addEntity(TEST_KEY_2, TEST_VALUE_2); + + KeyValueListing initialKeyValueListing = new KeyValueListingBuilder().build(); + ImmutableSet<ChunkHash> initialExistingChunks = ImmutableSet.of(); + KvBackupEncrypter encrypter = createEncrypter(initialKeyValueListing); + Result firstResult = + encrypter.backup( + mSecretKey, /*unusedFingerprintMixerSalt=*/ null, initialExistingChunks); + + return Pair.create( + encrypter.getNewKeyValueListing(), ImmutableSet.copyOf(firstResult.getAllChunks())); + } + + private ChunkHash getChunkHash(String key, byte[] value) throws Exception { + KeyValuePair pair = new KeyValuePair(); + pair.key = key; + pair.value = Arrays.copyOf(value, value.length); + return mChunkHasher.computeHash(KeyValuePair.toByteArray(pair)); + } + + private KeyValuePair decryptChunk(EncryptedChunk encryptedChunk) throws Exception { + Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM); + cipher.init( + Cipher.DECRYPT_MODE, + mSecretKey, + new GCMParameterSpec(GCM_TAG_LENGTH_BYTES * Byte.SIZE, encryptedChunk.nonce())); + byte[] decryptedBytes = cipher.doFinal(encryptedChunk.encryptedBytes()); + return KeyValuePair.parseFrom(decryptedBytes); + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/testing/DiffScriptProcessor.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/testing/DiffScriptProcessor.java new file mode 100644 index 000000000000..faddb6cf129c --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/testing/DiffScriptProcessor.java @@ -0,0 +1,256 @@ +/* + * 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.backup.encryption.testing; + +import static com.android.internal.util.Preconditions.checkArgument; +import static com.android.internal.util.Preconditions.checkNotNull; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.RandomAccessFile; +import java.util.Locale; +import java.util.Optional; +import java.util.Scanner; +import java.util.regex.Pattern; + +/** + * To be used as part of a fake backup server. Processes a Scotty diff script. + * + * <p>A Scotty diff script consists of an ASCII line denoting a command, optionally followed by a + * range of bytes. Command format is either + * + * <ul> + * <li>A single 64-bit integer, followed by a new line: this denotes that the given number of + * bytes are to follow in the stream. These bytes should be written directly to the new file. + * <li>Two 64-bit integers, separated by a hyphen, followed by a new line: this says that the + * given range of bytes from the original file ought to be copied into the new file. + * </ul> + */ +public class DiffScriptProcessor { + + private static final int COPY_BUFFER_SIZE = 1024; + + private static final String READ_MODE = "r"; + private static final Pattern VALID_COMMAND_PATTERN = Pattern.compile("^\\d+(-\\d+)?$"); + + private final File mInput; + private final File mOutput; + private final long mInputLength; + + /** + * A new instance, with {@code input} as previous file, and {@code output} as new file. + * + * @param input Previous file from which ranges of bytes are to be copied. This file should be + * immutable. + * @param output Output file, to which the new data should be written. + * @throws IllegalArgumentException if input does not exist. + */ + public DiffScriptProcessor(File input, File output) { + checkArgument(input.exists(), "input file did not exist."); + mInput = input; + mInputLength = input.length(); + mOutput = checkNotNull(output); + } + + public void process(InputStream diffScript) throws IOException, MalformedDiffScriptException { + RandomAccessFile randomAccessInput = new RandomAccessFile(mInput, READ_MODE); + + try (FileOutputStream outputStream = new FileOutputStream(mOutput)) { + while (true) { + Optional<String> commandString = readCommand(diffScript); + if (!commandString.isPresent()) { + return; + } + Command command = Command.parse(commandString.get()); + + if (command.mIsRange) { + checkFileRange(command.mCount, command.mLimit); + copyRange(randomAccessInput, outputStream, command.mCount, command.mLimit); + } else { + long bytesCopied = copyBytes(diffScript, outputStream, command.mCount); + if (bytesCopied < command.mCount) { + throw new MalformedDiffScriptException( + String.format( + Locale.US, + "Command to copy %d bytes from diff script, but only %d" + + " bytes available", + command.mCount, + bytesCopied)); + } + if (diffScript.read() != '\n') { + throw new MalformedDiffScriptException("Expected new line after bytes."); + } + } + } + } + } + + private void checkFileRange(long start, long end) throws MalformedDiffScriptException { + if (end < start) { + throw new MalformedDiffScriptException( + String.format( + Locale.US, + "Command to copy %d-%d bytes from original file, but %2$d < %1$d.", + start, + end)); + } + + if (end >= mInputLength) { + throw new MalformedDiffScriptException( + String.format( + Locale.US, + "Command to copy %d-%d bytes from original file, but file is only %d" + + " bytes long.", + start, + end, + mInputLength)); + } + } + + /** + * Reads a command from the input stream. + * + * @param inputStream The input. + * @return Optional of command, or empty if EOF. + */ + private static Optional<String> readCommand(InputStream inputStream) throws IOException { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + + int b; + while (!isEndOfCommand(b = inputStream.read())) { + byteArrayOutputStream.write(b); + } + + byte[] bytes = byteArrayOutputStream.toByteArray(); + if (bytes.length == 0) { + return Optional.empty(); + } else { + return Optional.of(new String(bytes, UTF_8)); + } + } + + /** + * If the given output from {@link InputStream#read()} is the end of a command - i.e., a new + * line or the EOF. + * + * @param b The byte or -1. + * @return {@code true} if ends the command. + */ + private static boolean isEndOfCommand(int b) { + return b == -1 || b == '\n'; + } + + /** + * Copies {@code n} bytes from {@code inputStream} to {@code outputStream}. + * + * @return The number of bytes copied. + * @throws IOException if there was a problem reading or writing. + */ + private static long copyBytes(InputStream inputStream, OutputStream outputStream, long n) + throws IOException { + byte[] buffer = new byte[COPY_BUFFER_SIZE]; + long copied = 0; + while (n - copied > COPY_BUFFER_SIZE) { + long read = copyBlock(inputStream, outputStream, buffer, COPY_BUFFER_SIZE); + if (read <= 0) { + return copied; + } + } + while (n - copied > 0) { + copied += copyBlock(inputStream, outputStream, buffer, (int) (n - copied)); + } + return copied; + } + + private static long copyBlock( + InputStream inputStream, OutputStream outputStream, byte[] buffer, int size) + throws IOException { + int read = inputStream.read(buffer, 0, size); + outputStream.write(buffer, 0, read); + return read; + } + + /** + * Copies the given range of bytes from the input file to the output stream. + * + * @param input The input file. + * @param output The output stream. + * @param start Start position in the input file. + * @param end End position in the output file (inclusive). + * @throws IOException if there was a problem reading or writing. + */ + private static void copyRange(RandomAccessFile input, OutputStream output, long start, long end) + throws IOException { + input.seek(start); + + // Inefficient but obviously correct. If tests become slow, optimize. + for (; start <= end; start++) { + output.write(input.read()); + } + } + + /** Error thrown for a malformed diff script. */ + public static class MalformedDiffScriptException extends Exception { + public MalformedDiffScriptException(String message) { + super(message); + } + } + + /** + * A command telling the processor either to insert n bytes, which follow, or copy n-m bytes + * from the original file. + */ + private static class Command { + private final long mCount; + private final long mLimit; + private final boolean mIsRange; + + private Command(long count, long limit, boolean isRange) { + mCount = count; + mLimit = limit; + mIsRange = isRange; + } + + /** + * Attempts to parse the command string into a usable structure. + * + * @param command The command string, without a new line at the end. + * @throws MalformedDiffScriptException if the command is not a valid diff script command. + * @return The parsed command. + */ + private static Command parse(String command) throws MalformedDiffScriptException { + if (!VALID_COMMAND_PATTERN.matcher(command).matches()) { + throw new MalformedDiffScriptException("Bad command: " + command); + } + + Scanner commandScanner = new Scanner(command); + commandScanner.useDelimiter("-"); + long n = commandScanner.nextLong(); + if (!commandScanner.hasNextLong()) { + return new Command(n, 0L, /*isRange=*/ false); + } + long m = commandScanner.nextLong(); + return new Command(n, m, /*isRange=*/ true); + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java index 3f3494d2c22c..5cff53f817d4 100644 --- a/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java @@ -16,7 +16,13 @@ package com.android.server.backup.testing; +import com.android.server.backup.encryption.chunk.ChunkHash; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.protos.nano.KeyValuePairProto; + +import java.nio.charset.Charset; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; import java.util.Random; import javax.crypto.KeyGenerator; @@ -42,4 +48,115 @@ public class CryptoTestUtils { random.nextBytes(bytes); return bytes; } + + public static ChunksMetadataProto.Chunk newChunk(ChunkHash hash, int length) { + return newChunk(hash.getHash(), length); + } + + public static ChunksMetadataProto.Chunk newChunk(byte[] hash, int length) { + ChunksMetadataProto.Chunk newChunk = new ChunksMetadataProto.Chunk(); + newChunk.hash = Arrays.copyOf(hash, hash.length); + newChunk.length = length; + return newChunk; + } + + public static ChunksMetadataProto.ChunkListing newChunkListing( + String docId, + byte[] fingerprintSalt, + int cipherType, + int orderingType, + ChunksMetadataProto.Chunk... chunks) { + ChunksMetadataProto.ChunkListing chunkListing = + newChunkListingWithoutDocId(fingerprintSalt, cipherType, orderingType, chunks); + chunkListing.documentId = docId; + return chunkListing; + } + + public static ChunksMetadataProto.ChunkListing newChunkListingWithoutDocId( + byte[] fingerprintSalt, + int cipherType, + int orderingType, + ChunksMetadataProto.Chunk... chunks) { + ChunksMetadataProto.ChunkListing chunkListing = new ChunksMetadataProto.ChunkListing(); + chunkListing.fingerprintMixerSalt = Arrays.copyOf(fingerprintSalt, fingerprintSalt.length); + chunkListing.cipherType = cipherType; + chunkListing.chunkOrderingType = orderingType; + chunkListing.chunks = chunks; + return chunkListing; + } + + public static ChunksMetadataProto.ChunkOrdering newChunkOrdering( + int[] starts, byte[] checksum) { + ChunksMetadataProto.ChunkOrdering chunkOrdering = new ChunksMetadataProto.ChunkOrdering(); + chunkOrdering.starts = starts == null ? null : Arrays.copyOf(starts, starts.length); + chunkOrdering.checksum = + checksum == null ? checksum : Arrays.copyOf(checksum, checksum.length); + return chunkOrdering; + } + + public static ChunksMetadataProto.ChunksMetadata newChunksMetadata( + int cipherType, int checksumType, int chunkOrderingType, byte[] chunkOrdering) { + ChunksMetadataProto.ChunksMetadata metadata = new ChunksMetadataProto.ChunksMetadata(); + metadata.cipherType = cipherType; + metadata.checksumType = checksumType; + metadata.chunkOrdering = Arrays.copyOf(chunkOrdering, chunkOrdering.length); + metadata.chunkOrderingType = chunkOrderingType; + return metadata; + } + + public static KeyValuePairProto.KeyValuePair newPair(String key, String value) { + return newPair(key, value.getBytes(Charset.forName("UTF-8"))); + } + + public static KeyValuePairProto.KeyValuePair newPair(String key, byte[] value) { + KeyValuePairProto.KeyValuePair newPair = new KeyValuePairProto.KeyValuePair(); + newPair.key = key; + newPair.value = value; + return newPair; + } + + public static ChunksMetadataProto.ChunkListing clone( + ChunksMetadataProto.ChunkListing original) { + ChunksMetadataProto.Chunk[] clonedChunks; + if (original.chunks == null) { + clonedChunks = null; + } else { + clonedChunks = new ChunksMetadataProto.Chunk[original.chunks.length]; + for (int i = 0; i < original.chunks.length; i++) { + clonedChunks[i] = clone(original.chunks[i]); + } + } + + return newChunkListing( + original.documentId, + original.fingerprintMixerSalt, + original.cipherType, + original.chunkOrderingType, + clonedChunks); + } + + public static ChunksMetadataProto.Chunk clone(ChunksMetadataProto.Chunk original) { + return newChunk(original.hash, original.length); + } + + public static ChunksMetadataProto.ChunksMetadata clone( + ChunksMetadataProto.ChunksMetadata original) { + ChunksMetadataProto.ChunksMetadata cloneMetadata = new ChunksMetadataProto.ChunksMetadata(); + cloneMetadata.chunkOrderingType = original.chunkOrderingType; + cloneMetadata.chunkOrdering = + original.chunkOrdering == null + ? null + : Arrays.copyOf(original.chunkOrdering, original.chunkOrdering.length); + cloneMetadata.checksumType = original.checksumType; + cloneMetadata.cipherType = original.cipherType; + return cloneMetadata; + } + + public static ChunksMetadataProto.ChunkOrdering clone( + ChunksMetadataProto.ChunkOrdering original) { + ChunksMetadataProto.ChunkOrdering clone = new ChunksMetadataProto.ChunkOrdering(); + clone.starts = Arrays.copyOf(original.starts, original.starts.length); + clone.checksum = Arrays.copyOf(original.checksum, original.checksum.length); + return clone; + } } diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/TestFileUtils.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/TestFileUtils.java new file mode 100644 index 000000000000..e5d73ba41902 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/TestFileUtils.java @@ -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. + */ + +import com.google.common.io.ByteStreams; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; + +/** Utility methods for use in tests */ +public class TestFileUtils { + /** Read the contents of a file into a byte array */ + public static byte[] toByteArray(File file) throws IOException { + try (FileInputStream fis = new FileInputStream(file)) { + return ByteStreams.toByteArray(fis); + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/DataEntity.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/DataEntity.java new file mode 100644 index 000000000000..6d3b5e9f1d7b --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/DataEntity.java @@ -0,0 +1,100 @@ +/* + * 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.testing.shadows; + +import static com.google.common.base.Preconditions.checkNotNull; + +import java.nio.charset.StandardCharsets; +import java.util.Arrays; + +/** + * Represents a key value pair in {@link ShadowBackupDataInput} and {@link ShadowBackupDataOutput}. + */ +public class DataEntity { + public final String mKey; + public final byte[] mValue; + public final int mSize; + + /** + * Constructs a pair with a string value. The value will be converted to a byte array in {@link + * StandardCharsets#UTF_8}. + */ + public DataEntity(String key, String value) { + this.mKey = checkNotNull(key); + this.mValue = value.getBytes(StandardCharsets.UTF_8); + mSize = this.mValue.length; + } + + /** + * Constructs a new entity with the given key but a negative size. This represents a deleted + * pair. + */ + public DataEntity(String key) { + this.mKey = checkNotNull(key); + mSize = -1; + mValue = null; + } + + /** Constructs a new entity where the size of the value is the entire array. */ + public DataEntity(String key, byte[] value) { + this(key, value, value.length); + } + + /** + * Constructs a new entity. + * + * @param key the key of the pair + * @param data the value to associate with the key + * @param size the length of the value in bytes + */ + public DataEntity(String key, byte[] data, int size) { + this.mKey = checkNotNull(key); + this.mSize = size; + mValue = new byte[size]; + for (int i = 0; i < size; i++) { + mValue[i] = data[i]; + } + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + DataEntity that = (DataEntity) o; + + if (mSize != that.mSize) { + return false; + } + if (!mKey.equals(that.mKey)) { + return false; + } + return Arrays.equals(mValue, that.mValue); + } + + @Override + public int hashCode() { + int result = mKey.hashCode(); + result = 31 * result + Arrays.hashCode(mValue); + result = 31 * result + mSize; + return result; + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowBackupDataInput.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowBackupDataInput.java new file mode 100644 index 000000000000..7ac6ec40508d --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowBackupDataInput.java @@ -0,0 +1,106 @@ +/* + * 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.testing.shadows; + +import static com.google.common.base.Preconditions.checkState; + +import android.annotation.Nullable; +import android.app.backup.BackupDataInput; + +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; + +import java.io.ByteArrayInputStream; +import java.io.FileDescriptor; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** Shadow for BackupDataInput. */ +@Implements(BackupDataInput.class) +public class ShadowBackupDataInput { + private static final List<DataEntity> ENTITIES = new ArrayList<>(); + @Nullable private static IOException sReadNextHeaderException; + + @Nullable private ByteArrayInputStream mCurrentEntityInputStream; + private int mCurrentEntity = -1; + + /** Resets the shadow, clearing any entities or exception. */ + public static void reset() { + ENTITIES.clear(); + sReadNextHeaderException = null; + } + + /** Sets the exception which the input will throw for any call to {@link #readNextHeader}. */ + public static void setReadNextHeaderException(@Nullable IOException readNextHeaderException) { + ShadowBackupDataInput.sReadNextHeaderException = readNextHeaderException; + } + + /** Adds the given entity to the input. */ + public static void addEntity(DataEntity e) { + ENTITIES.add(e); + } + + /** Adds an entity to the input with the given key and value. */ + public static void addEntity(String key, byte[] value) { + ENTITIES.add(new DataEntity(key, value, value.length)); + } + + public void __constructor__(FileDescriptor fd) {} + + @Implementation + public boolean readNextHeader() throws IOException { + if (sReadNextHeaderException != null) { + throw sReadNextHeaderException; + } + + mCurrentEntity++; + + if (mCurrentEntity >= ENTITIES.size()) { + return false; + } + + byte[] value = ENTITIES.get(mCurrentEntity).mValue; + if (value == null) { + mCurrentEntityInputStream = new ByteArrayInputStream(new byte[0]); + } else { + mCurrentEntityInputStream = new ByteArrayInputStream(value); + } + return true; + } + + @Implementation + public String getKey() { + return ENTITIES.get(mCurrentEntity).mKey; + } + + @Implementation + public int getDataSize() { + return ENTITIES.get(mCurrentEntity).mSize; + } + + @Implementation + public void skipEntityData() { + // Do nothing. + } + + @Implementation + public int readEntityData(byte[] data, int offset, int size) { + checkState(mCurrentEntityInputStream != null, "Must call readNextHeader() first"); + return mCurrentEntityInputStream.read(data, offset, size); + } +} diff --git a/packages/BackupEncryption/test/unittest/Android.bp b/packages/BackupEncryption/test/unittest/Android.bp new file mode 100644 index 000000000000..d7c510b57518 --- /dev/null +++ b/packages/BackupEncryption/test/unittest/Android.bp @@ -0,0 +1,22 @@ +android_test { + name: "BackupEncryptionUnitTests", + srcs: ["src/**/*.java"], + static_libs: [ + "androidx.test.runner", + "androidx.test.rules", + "mockito-target-minus-junit4", + "platform-test-annotations", + "truth-prebuilt", + "testables", + "testng", + ], + libs: [ + "android.test.mock", + "android.test.base", + "android.test.runner", + "BackupEncryption", + ], + test_suites: ["device-tests"], + instrumentation_for: "BackupEncryption", + certificate: "platform", +}
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/values/attrs.xml b/packages/BackupEncryption/test/unittest/AndroidManifest.xml index ef4cd5b959de..39ac8aa32ebc 100644 --- a/packages/SystemUI/legacy/recents/res/values/attrs.xml +++ b/packages/BackupEncryption/test/unittest/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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,13 +14,14 @@ limitations under the License. --> -<resources> - - <declare-styleable name="RecentsPanelView"> - <attr name="recentItemLayout" format="reference" /> - <!-- Style for the "Clear all" button. --> - <attr name="clearAllStyle" format="reference" /> - <attr name="clearAllBackgroundColor" format="reference" /> - </declare-styleable> - -</resources>
\ No newline at end of file +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.server.backup.encryption.unittests" + android:sharedUserId="android.uid.system" > + <application android:testOnly="true"> + <uses-library android:name="android.test.runner" /> + </application> + <instrumentation + android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.server.backup.encryption" + android:label="Backup Encryption Unit Tests" /> +</manifest>
\ No newline at end of file diff --git a/packages/BackupEncryption/test/unittest/AndroidTest.xml b/packages/BackupEncryption/test/unittest/AndroidTest.xml new file mode 100644 index 000000000000..c9c812a78194 --- /dev/null +++ b/packages/BackupEncryption/test/unittest/AndroidTest.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. + --> +<configuration description="Runs Backup Encryption Unit Tests."> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="install-arg" value="-t" /> + <option name="test-file-name" value="BackupEncryptionUnitTests.apk" /> + </target_preparer> + + <option name="test-tag" value="BackupEncryptionUnitTests" /> + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > + <option name="package" value="com.android.server.backup.encryption.unittests" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> + </test> +</configuration> diff --git a/packages/BackupEncryption/test/unittest/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManagerTest.java b/packages/BackupEncryption/test/unittest/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManagerTest.java new file mode 100644 index 000000000000..0d43a190cd07 --- /dev/null +++ b/packages/BackupEncryption/test/unittest/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportManagerTest.java @@ -0,0 +1,120 @@ +/* + * 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.backup.encryption.transport; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotSame; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import android.content.ComponentName; +import android.content.Intent; +import android.os.Bundle; +import android.platform.test.annotations.Presubmit; + +import androidx.test.runner.AndroidJUnit4; + +import com.android.server.backup.transport.TransportClient; +import com.android.server.backup.transport.TransportClientManager; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@Presubmit +@RunWith(AndroidJUnit4.class) +public class IntermediateEncryptingTransportManagerTest { + @Mock private TransportClient mTransportClient; + @Mock private TransportClientManager mTransportClientManager; + + private final ComponentName mTransportComponent = new ComponentName("pkg", "class"); + private final Bundle mExtras = new Bundle(); + private Intent mEncryptingTransportIntent; + private IntermediateEncryptingTransportManager mIntermediateEncryptingTransportManager; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + mExtras.putInt("test", 1); + mEncryptingTransportIntent = + TransportClientManager.getEncryptingTransportIntent(mTransportComponent) + .putExtras(mExtras); + mIntermediateEncryptingTransportManager = + new IntermediateEncryptingTransportManager(mTransportClientManager); + } + + @Test + public void testGet_createsClientWithRealTransportComponentAndExtras() { + when(mTransportClientManager.getTransportClient(any(), any(), any())) + .thenReturn(mTransportClient); + + IntermediateEncryptingTransport intermediateEncryptingTransport = + mIntermediateEncryptingTransportManager.get(mEncryptingTransportIntent); + + assertEquals(mTransportClient, intermediateEncryptingTransport.getClient()); + verify(mTransportClientManager, times(1)) + .getTransportClient(eq(mTransportComponent), argThat(mExtras::kindofEquals), any()); + verifyNoMoreInteractions(mTransportClientManager); + } + + @Test + public void testGet_callTwice_returnsSameTransport() { + IntermediateEncryptingTransport transport1 = + mIntermediateEncryptingTransportManager.get(mEncryptingTransportIntent); + IntermediateEncryptingTransport transport2 = + mIntermediateEncryptingTransportManager.get(mEncryptingTransportIntent); + + assertEquals(transport1, transport2); + } + + @Test + public void testCleanup_disposesTransportClient() { + when(mTransportClientManager.getTransportClient(any(), any(), any())) + .thenReturn(mTransportClient); + + IntermediateEncryptingTransport transport = + mIntermediateEncryptingTransportManager.get(mEncryptingTransportIntent); + mIntermediateEncryptingTransportManager.cleanup(mEncryptingTransportIntent); + + verify(mTransportClientManager, times(1)).getTransportClient(any(), any(), any()); + verify(mTransportClientManager, times(1)) + .disposeOfTransportClient(eq(mTransportClient), any()); + verifyNoMoreInteractions(mTransportClientManager); + } + + @Test + public void testCleanup_removesCachedTransport() { + when(mTransportClientManager.getTransportClient(any(), any(), any())) + .thenReturn(mTransportClient); + + IntermediateEncryptingTransport transport1 = + mIntermediateEncryptingTransportManager.get(mEncryptingTransportIntent); + mIntermediateEncryptingTransportManager.cleanup(mEncryptingTransportIntent); + IntermediateEncryptingTransport transport2 = + mIntermediateEncryptingTransportManager.get(mEncryptingTransportIntent); + + assertNotSame(transport1, transport2); + } +} diff --git a/packages/BackupEncryption/test/unittest/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportTest.java b/packages/BackupEncryption/test/unittest/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportTest.java new file mode 100644 index 000000000000..cc4b0ab1bb36 --- /dev/null +++ b/packages/BackupEncryption/test/unittest/src/com/android/server/backup/encryption/transport/IntermediateEncryptingTransportTest.java @@ -0,0 +1,77 @@ +/* + * 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.backup.encryption.transport; + +import static junit.framework.Assert.assertEquals; + +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import android.platform.test.annotations.Presubmit; + +import androidx.test.runner.AndroidJUnit4; + +import com.android.internal.backup.IBackupTransport; +import com.android.server.backup.transport.TransportClient; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@Presubmit +@RunWith(AndroidJUnit4.class) +public class IntermediateEncryptingTransportTest { + @Mock private IBackupTransport mRealTransport; + @Mock private TransportClient mTransportClient; + + private IntermediateEncryptingTransport mIntermediateEncryptingTransport; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + mIntermediateEncryptingTransport = new IntermediateEncryptingTransport(mTransportClient); + } + + @Test + public void testGetDelegate_callsConnect() throws Exception { + when(mTransportClient.connect(anyString())).thenReturn(mRealTransport); + + IBackupTransport ret = mIntermediateEncryptingTransport.getDelegate(); + + assertEquals(mRealTransport, ret); + verify(mTransportClient, times(1)).connect(anyString()); + verifyNoMoreInteractions(mTransportClient); + } + + @Test + public void testGetDelegate_callTwice_callsConnectOnce() throws Exception { + when(mTransportClient.connect(anyString())).thenReturn(mRealTransport); + + IBackupTransport ret1 = mIntermediateEncryptingTransport.getDelegate(); + IBackupTransport ret2 = mIntermediateEncryptingTransport.getDelegate(); + + assertEquals(mRealTransport, ret1); + assertEquals(mRealTransport, ret2); + verify(mTransportClient, times(1)).connect(anyString()); + verifyNoMoreInteractions(mTransportClient); + } +} diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 8f474704097e..1f923aff0cea 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1004,9 +1004,9 @@ <!-- [CHAR_LIMIT=40] Label for battery level chart when charging --> <string name="power_charging"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="state">%2$s</xliff:g></string> <!-- [CHAR_LIMIT=40] Label for estimated remaining duration of battery charging --> - <string name="power_remaining_charging_duration_only"><xliff:g id="time">%1$s</xliff:g> left until fully charged</string> + <string name="power_remaining_charging_duration_only"><xliff:g id="time">%1$s</xliff:g> left until charged</string> <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration --> - <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="time">%2$s</xliff:g> until fully charged</string> + <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="time">%2$s</xliff:g> until charged</string> <!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed --> <string name="battery_info_status_unknown">Unknown</string> diff --git a/packages/SettingsLib/search/Android.bp b/packages/SettingsLib/search/Android.bp index 15c8367cf727..d398aa5c44ac 100644 --- a/packages/SettingsLib/search/Android.bp +++ b/packages/SettingsLib/search/Android.bp @@ -1,7 +1,9 @@ -java_library { +android_library { name: "SettingsLib-search", - host_supported: true, srcs: ["src/**/*.java"], + + sdk_version: "system_current", + min_sdk_version: "21", } java_plugin { @@ -9,9 +11,11 @@ java_plugin { processor_class: "com.android.settingslib.search.IndexableProcessor", static_libs: [ "javapoet-prebuilt-jar", - "SettingsLib-search", ], - srcs: ["processor-src/**/*.java"], + srcs: [ + "processor-src/**/*.java", + "src/com/android/settingslib/search/SearchIndexable.java" + ], java_resource_dirs: ["resources"], } diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_low_ram_stack_button_background.xml b/packages/SettingsLib/search/AndroidManifest.xml index bff97f6f8fe4..970728365f5c 100644 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_low_ram_stack_button_background.xml +++ b/packages/SettingsLib/search/AndroidManifest.xml @@ -1,5 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (C) 2017 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. @@ -11,12 +12,10 @@ ~ 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. + ~ limitations under the License --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" > - <corners android:radius="@dimen/borderless_button_radius" /> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.settingslib.search"> - <solid android:color="?attr/clearAllBackgroundColor" /> - -</shape> +</manifest>
\ No newline at end of file diff --git a/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java b/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java index 10fc685015b7..5dc9061a81a0 100644 --- a/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java +++ b/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java @@ -143,7 +143,7 @@ public class IndexableProcessor extends AbstractProcessor { final TypeSpec baseClass = TypeSpec.classBuilder(CLASS_BASE) .addModifiers(Modifier.PUBLIC) - .addSuperinterface(ClassName.get(SearchIndexableResources.class)) + .addSuperinterface(ClassName.get(PACKAGE, "SearchIndexableResources")) .addField(providers) .addMethod(baseConstructorBuilder.build()) .addMethod(addIndex) @@ -210,4 +210,4 @@ public class IndexableProcessor extends AbstractProcessor { mFiler = processingEnvironment.getFiler(); mMessager = processingEnvironment.getMessager(); } -} +}
\ No newline at end of file diff --git a/packages/SettingsLib/search/src/com/android/settingslib/search/Indexable.java b/packages/SettingsLib/search/src/com/android/settingslib/search/Indexable.java new file mode 100644 index 000000000000..e68b0d1d6798 --- /dev/null +++ b/packages/SettingsLib/search/src/com/android/settingslib/search/Indexable.java @@ -0,0 +1,66 @@ +/* + * 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.settingslib.search; + +import android.content.Context; +import android.provider.SearchIndexableResource; + +import java.util.List; + +/** + * Interface for classes whose instances can provide data for indexing. + * + * See {@link android.provider.SearchIndexableResource} and {@link SearchIndexableRaw}. + */ +public interface Indexable { + + /** + * Interface for classes whose instances can provide data for indexing. + */ + interface SearchIndexProvider { + /** + * Return a list of references for indexing. + * + * See {@link android.provider.SearchIndexableResource} + * + * @param context the context. + * @param enabled hint telling if the data needs to be considered into the search results + * or not. + * @return a list of {@link android.provider.SearchIndexableResource} references. + * Can be null. + */ + List<SearchIndexableResource> getXmlResourcesToIndex(Context context, boolean enabled); + + /** + * Return a list of raw data for indexing. See {@link SearchIndexableRaw} + * + * @param context the context. + * @param enabled hint telling if the data needs to be considered into the search results + * or not. + * @return a list of {@link SearchIndexableRaw} references. Can be null. + */ + List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled); + + /** + * Return a list of data keys that cannot be indexed. See {@link SearchIndexableRaw} + * + * @param context the context. + * @return a list of {@link SearchIndexableRaw} references. Can be null. + */ + List<String> getNonIndexableKeys(Context context); + } +} diff --git a/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexableRaw.java b/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexableRaw.java new file mode 100644 index 000000000000..021ca3362aab --- /dev/null +++ b/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexableRaw.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.settingslib.search; + +import android.content.Context; +import android.provider.SearchIndexableData; + +/** + * Indexable raw data for Search. + * + * This is the raw data used by the Indexer and should match its data model. + * + * See {@link Indexable} and {@link android.provider.SearchIndexableResource}. + */ +public class SearchIndexableRaw extends SearchIndexableData { + + /** + * Title's raw data. + */ + public String title; + + /** + * Summary's raw data when the data is "ON". + */ + public String summaryOn; + + /** + * Summary's raw data when the data is "OFF". + */ + public String summaryOff; + + /** + * Entries associated with the raw data (when the data can have several values). + */ + public String entries; + + /** + * Keywords' raw data. + */ + public String keywords; + + /** + * Fragment's or Activity's title associated with the raw data. + */ + public String screenTitle; + + public SearchIndexableRaw(Context context) { + super(context); + } +} diff --git a/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexableResources.java b/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexableResources.java index 300d360e0057..976647b3e88f 100644 --- a/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexableResources.java +++ b/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexableResources.java @@ -32,4 +32,4 @@ public interface SearchIndexableResources { * as a device binary. */ void addIndex(Class indexClass); -} +}
\ No newline at end of file diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java index 6a906719d3fa..19c666459723 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -865,6 +865,10 @@ public class ApplicationsState { void handleRebuildList() { AppFilter filter; Comparator<AppEntry> comparator; + + if (!mResumed) { + return; + } synchronized (mRebuildSync) { if (!mRebuildRequested) { return; @@ -1069,8 +1073,8 @@ public class ApplicationsState { } } if (rebuildingSessions != null) { - for (int i = 0; i < rebuildingSessions.size(); i++) { - rebuildingSessions.get(i).handleRebuildList(); + for (Session session : rebuildingSessions) { + session.handleRebuildList(); } } diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/ThreadUtils.java b/packages/SettingsLib/src/com/android/settingslib/utils/ThreadUtils.java index 5c9a06f91e6a..4e052f1aeca4 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/ThreadUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/ThreadUtils.java @@ -26,7 +26,7 @@ public class ThreadUtils { private static volatile Thread sMainThread; private static volatile Handler sMainThreadHandler; - private static volatile ExecutorService sSingleThreadExecutor; + private static volatile ExecutorService sThreadExecutor; /** * Returns true if the current thread is the UI thread. @@ -64,10 +64,11 @@ public class ThreadUtils { * @Return A future of the task that can be monitored for updates or cancelled. */ public static Future postOnBackgroundThread(Runnable runnable) { - if (sSingleThreadExecutor == null) { - sSingleThreadExecutor = Executors.newSingleThreadExecutor(); + if (sThreadExecutor == null) { + sThreadExecutor = Executors.newFixedThreadPool( + Runtime.getRuntime().availableProcessors()); } - return sSingleThreadExecutor.submit(runnable); + return sThreadExecutor.submit(runnable); } /** diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java index f8697a19c7ab..95a4f69b287c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java @@ -269,7 +269,7 @@ public class ApplicationsStateRoboTest { } @Test - public void testDefaultSessionLoadsAll() { + public void testDefaultSession_isResumed_LoadsAll() { mSession.onResume(); addApp(HOME_PACKAGE_NAME, 1); @@ -296,6 +296,19 @@ public class ApplicationsStateRoboTest { } @Test + public void testDefaultSession_isPaused_NotLoadsAll() { + mSession.onResume(); + + addApp(HOME_PACKAGE_NAME, 1); + addApp(LAUNCHABLE_PACKAGE_NAME, 2); + mSession.mResumed = false; + mSession.rebuild(ApplicationsState.FILTER_EVERYTHING, ApplicationsState.SIZE_COMPARATOR); + processAllMessages(); + + verify(mCallbacks, never()).onRebuildComplete(mAppEntriesCaptor.capture()); + } + + @Test public void testCustomSessionLoadsIconsOnly() { mSession.setSessionFlags(ApplicationsState.FLAG_SESSION_REQUEST_ICONS); mSession.onResume(); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java index 26db124c0041..5114b00d2711 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java @@ -50,7 +50,7 @@ public class ThreadUtilsTest { } @Test - public void testPostOnMainThread_shouldRunOnMainTread() { + public void testPostOnMainThread_shouldRunOnMainThread() { TestRunnable cr = new TestRunnable(); ShadowLooper.pauseMainLooper(); ThreadUtils.postOnMainThread(cr); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 365923ea8643..046ffc3c36bb 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -2242,9 +2242,6 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT, SecureSettingsProto.PackageVerifier.USER_CONSENT); - dumpSetting(s, p, - Settings.Secure.PACKAGE_VERIFIER_STATE, - SecureSettingsProto.PackageVerifier.STATE); p.end(packageVerifierToken); final long parentalControlToken = p.start(SecureSettingsProto.PARENTAL_CONTROL); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 6ea3db366f66..86625faab4d6 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -17,8 +17,7 @@ package android.provider; import static com.google.android.collect.Sets.newHashSet; - -import static junit.framework.Assert.assertTrue; +import static com.google.common.truth.Truth.assertWithMessage; import static java.lang.reflect.Modifier.isFinal; import static java.lang.reflect.Modifier.isPublic; @@ -655,7 +654,6 @@ public class SettingsBackupTest { Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME, Settings.Secure.NUM_ROTATION_SUGGESTIONS_ACCEPTED, Settings.Secure.ODI_CAPTIONS_ENABLED, - Settings.Secure.PACKAGE_VERIFIER_STATE, Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT, Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE, Settings.Secure.PAYMENT_SERVICE_SEARCH_URI, @@ -721,7 +719,8 @@ public class SettingsBackupTest { Settings.Secure.BIOMETRIC_DEBUG_ENABLED, Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED, Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED, - Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED); + Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED, + Settings.Secure.FACE_UNLOCK_RE_ENROLL); @Test public void systemSettingsBackedUpOrBlacklisted() { @@ -754,12 +753,11 @@ public class SettingsBackupTest { Set<String> settings, Set<String> settingsToBackup, Set<String> blacklist) { Set<String> settingsNotBackedUp = difference(settings, settingsToBackup); Set<String> settingsNotBackedUpOrBlacklisted = difference(settingsNotBackedUp, blacklist); - assertTrue( - "Settings not backed up or blacklisted", - settingsNotBackedUpOrBlacklisted.isEmpty()); + assertWithMessage("Settings not backed up or blacklisted") + .that(settingsNotBackedUpOrBlacklisted).isEmpty(); - assertTrue( - "blacklisted settings backed up", intersect(settingsToBackup, blacklist).isEmpty()); + assertWithMessage("blacklisted settings backed up") + .that(intersect(settingsToBackup, blacklist)).isEmpty(); } private static Set<String> getCandidateSettings( diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index b2ff4b3268b2..c1cc2616511b 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -172,6 +172,8 @@ <!-- Permissions needed to test system only camera devices --> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.SYSTEM_CAMERA" /> + <!-- Permissions needed for CTS camera test: RecordingTest.java when assuming shell id --> + <uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- Permission needed to enable/disable Bluetooth/Wifi --> <uses-permission android:name="android.permission.MANAGE_BLUETOOTH_WHEN_WIRELESS_CONSENT_REQUIRED" /> <uses-permission android:name="android.permission.MANAGE_WIFI_WHEN_WIRELESS_CONSENT_REQUIRED" /> @@ -238,7 +240,7 @@ <activity android:name=".BugreportWarningActivity" - android:theme="@android:style/Theme.DeviceDefault.Dialog.Alert" + android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:exported="false" /> diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 602fe3ec12fd..2a41aa6bb8f6 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -37,6 +37,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; +import android.app.admin.DevicePolicyManager; import android.content.ClipData; import android.content.Context; import android.content.DialogInterface; @@ -107,6 +108,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -157,6 +160,8 @@ public class BugreportProgressService extends Service { private static final String TAG = "BugreportProgressService"; private static final boolean DEBUG = false; + private Intent startSelfIntent; + private static final String AUTHORITY = "com.android.shell"; // External intents sent by dumpstate. @@ -235,6 +240,24 @@ public class BugreportProgressService extends Service { private static final String NOTIFICATION_CHANNEL_ID = "bugreports"; + /** + * Always keep the newest 8 bugreport files. + */ + private static final int MIN_KEEP_COUNT = 8; + + /** + * Always keep bugreports taken in the last week. + */ + private static final long MIN_KEEP_AGE = DateUtils.WEEK_IN_MILLIS; + + private static final String BUGREPORT_MIMETYPE = "application/vnd.android.bugreport"; + + /** Always keep just the last 3 remote bugreport's files around. */ + private static final int REMOTE_BUGREPORT_FILES_AMOUNT = 3; + + /** Always keep remote bugreport files created in the last day. */ + private static final long REMOTE_MIN_KEEP_AGE = DateUtils.DAY_IN_MILLIS; + private final Object mLock = new Object(); /** Managed bugreport info (keyed by id) */ @@ -281,6 +304,7 @@ public class BugreportProgressService extends Service { mMainThreadHandler = new Handler(Looper.getMainLooper()); mServiceHandler = new ServiceHandler("BugreportProgressServiceMainThread"); mScreenshotHandler = new ScreenshotHandler("BugreportProgressServiceScreenshotThread"); + startSelfIntent = new Intent(this, this.getClass()); mScreenshotsDir = new File(getFilesDir(), SCREENSHOT_DIR); if (!mScreenshotsDir.exists()) { @@ -307,6 +331,9 @@ public class BugreportProgressService extends Service { public int onStartCommand(Intent intent, int flags, int startId) { Log.v(TAG, "onStartCommand(): " + dumpIntent(intent)); if (intent != null) { + if (!intent.hasExtra(EXTRA_ORIGINAL_INTENT) && !intent.hasExtra(EXTRA_ID)) { + return START_NOT_STICKY; + } // Handle it in a separate thread. final Message msg = mServiceHandler.obtainMessage(); msg.what = MSG_SERVICE_COMMAND; @@ -352,10 +379,11 @@ public class BugreportProgressService extends Service { private final BugreportInfo mInfo; - BugreportCallbackImpl(String name, @Nullable String title, @Nullable String description) { + BugreportCallbackImpl(String name, @Nullable String title, @Nullable String description, + @BugreportParams.BugreportMode int type) { // pid not used in this workflow, so setting default = 0 mInfo = new BugreportInfo(mContext, 0 /* pid */, name, - 100 /* max progress*/, title, description); + 100 /* max progress*/, title, description, type); } @Override @@ -380,10 +408,9 @@ public class BugreportProgressService extends Service { @Override public void onFinished() { + // TODO: Make all callback functions lock protected. trackInfoWithId(); - // Stop running on foreground, otherwise share notification cannot be dismissed. - onBugreportFinished(mInfo.id); - stopSelfWhenDone(); + sendBugreportFinishedBroadcast(); } /** @@ -400,6 +427,90 @@ public class BugreportProgressService extends Service { } return; } + + private void sendBugreportFinishedBroadcast() { + final String bugreportFileName = mInfo.name + ".zip"; + final File bugreportFile = new File(BUGREPORT_DIR, bugreportFileName); + final String bugreportFilePath = bugreportFile.getAbsolutePath(); + if (bugreportFile.length() == 0) { + Log.e(TAG, "Bugreport file empty. File path = " + bugreportFilePath); + return; + } + if (mInfo.type == BugreportParams.BUGREPORT_MODE_REMOTE) { + sendRemoteBugreportFinishedBroadcast(bugreportFilePath, bugreportFile); + } else { + cleanupOldFiles(MIN_KEEP_COUNT, MIN_KEEP_AGE); + final Intent intent = new Intent(INTENT_BUGREPORT_FINISHED); + intent.putExtra(EXTRA_BUGREPORT, bugreportFilePath); + addScreenshotToIntent(intent); + mContext.sendBroadcast(intent, android.Manifest.permission.DUMP); + onBugreportFinished(mInfo.id); + } + } + + private void sendRemoteBugreportFinishedBroadcast(String bugreportFileName, + File bugreportFile) { + cleanupOldFiles(REMOTE_BUGREPORT_FILES_AMOUNT, REMOTE_MIN_KEEP_AGE); + final Intent intent = new Intent(DevicePolicyManager.ACTION_REMOTE_BUGREPORT_DISPATCH); + final Uri bugreportUri = getUri(mContext, bugreportFile); + final String bugreportHash = generateFileHash(bugreportFileName); + if (bugreportHash == null) { + Log.e(TAG, "Error generating file hash for remote bugreport"); + return; + } + intent.setDataAndType(bugreportUri, BUGREPORT_MIMETYPE); + intent.putExtra(DevicePolicyManager.EXTRA_REMOTE_BUGREPORT_HASH, bugreportHash); + intent.putExtra(EXTRA_BUGREPORT, bugreportFileName); + mContext.sendBroadcastAsUser(intent, UserHandle.SYSTEM, + android.Manifest.permission.DUMP); + } + + private void addScreenshotToIntent(Intent intent) { + final String screenshotFileName = mInfo.name + ".png"; + final File screenshotFile = new File(BUGREPORT_DIR, screenshotFileName); + final String screenshotFilePath = screenshotFile.getAbsolutePath(); + if (screenshotFile.length() > 0) { + intent.putExtra(EXTRA_SCREENSHOT, screenshotFilePath); + } + return; + } + + private String generateFileHash(String fileName) { + String fileHash = null; + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + FileInputStream input = new FileInputStream(new File(fileName)); + byte[] buffer = new byte[65536]; + int size; + while ((size = input.read(buffer)) > 0) { + md.update(buffer, 0, size); + } + input.close(); + byte[] hashBytes = md.digest(); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < hashBytes.length; i++) { + sb.append(String.format("%02x", hashBytes[i])); + } + fileHash = sb.toString(); + } catch (IOException | NoSuchAlgorithmException e) { + Log.e(TAG, "generating file hash for bugreport file failed " + fileName, e); + } + return fileHash; + } + } + + static void cleanupOldFiles(final int minCount, final long minAge) { + new AsyncTask<Void, Void, Void>() { + @Override + protected Void doInBackground(Void... params) { + try { + FileUtils.deleteOlderFiles(new File(BUGREPORT_DIR), minCount, minAge); + } catch (RuntimeException e) { + Log.e(TAG, "RuntimeException deleting old files", e); + } + return null; + } + }.execute(); } /** @@ -598,7 +709,7 @@ public class BugreportProgressService extends Service { + " screenshot file fd: " + screenshotFd); BugreportCallbackImpl bugreportCallback = new BugreportCallbackImpl(bugreportName, - shareTitle, shareDescription); + shareTitle, shareDescription, bugreportType); try { mBugreportManager.startBugreport(bugreportFd, screenshotFd, new BugreportParams(bugreportType), executor, bugreportCallback); @@ -711,6 +822,9 @@ public class BugreportProgressService extends Service { } else { mForegroundId = id; Log.d(TAG, "Start running as foreground service on id " + mForegroundId); + // Explicitly starting the service so that stopForeground() does not crash + // Workaround for b/140997620 + startForegroundService(startSelfIntent); startForeground(mForegroundId, notification); } } @@ -1925,10 +2039,19 @@ public class BugreportProgressService extends Service { String shareDescription; /** + * Type of the bugreport + */ + int type; + + /** * Constructor for tracked bugreports - typically called upon receiving BUGREPORT_STARTED. */ BugreportInfo(Context context, int id, int pid, String name, int max) { - this(context, pid, name, max, null, null); + // bugreports triggered by STARTED broadcast do not use callback functions, + // onFinished() callback method is the only function where type is used. + // Set type to -1 as it is unused in this workflow. + // This constructor will soon be removed. + this(context, pid, name, max, null, null, -1); this.id = id; } @@ -1936,13 +2059,14 @@ public class BugreportProgressService extends Service { * Constructor for tracked bugreports - typically called upon receiving BUGREPORT_REQUESTED. */ BugreportInfo(Context context, int pid, String name, int max, @Nullable String shareTitle, - @Nullable String shareDescription) { + @Nullable String shareDescription, int type) { this.context = context; this.pid = pid; this.name = name; this.max = this.realMax = max; this.shareTitle = shareTitle == null ? "" : shareTitle; this.shareDescription = shareDescription == null ? "" : shareDescription; + this.type = type; } /** diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 37fefc2d37d7..0c582c4ec5e9 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -170,39 +170,3 @@ android_app { required: ["privapp_whitelist_com.android.systemui"], } - -// Only used for products that are shipping legacy Recents -android_app { - name: "SystemUIWithLegacyRecents", - overrides: [ - "SystemUI", - ], - - platform_apis: true, - certificate: "platform", - privileged: true, - - dxflags: ["--multi-dex"], - optimize: { - proguard_flags_files: ["proguard.flags", "legacy/recents/proguard.flags"], - }, - - static_libs: [ - "SystemUI-core", - ], - libs: [ - "telephony-common", - ], - - kotlincflags: ["-Xjvm-default=enable"], - - srcs: [ - "legacy/recents/src/**/*.java", - "legacy/recents/src/**/I*.aidl", - ], - resource_dirs: [ - "legacy/recents/res", - ], - - manifest: "legacy/recents/AndroidManifest.xml", -} diff --git a/packages/SystemUI/legacy/recents/AndroidManifest.xml b/packages/SystemUI/legacy/recents/AndroidManifest.xml deleted file mode 100644 index 0d8b3cd26c1a..000000000000 --- a/packages/SystemUI/legacy/recents/AndroidManifest.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * Copyright (c) 2018 Google Inc. - * - * 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" - xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - xmlns:tools="http://schemas.android.com/tools" - package="com.android.systemui" - android:sharedUserId="android.uid.systemui" - coreApp="true"> - - <application - android:name="com.android.systemui.SystemUIApplication"> - - <!-- Service used by secondary users to register themselves with the system user. --> - <service android:name=".recents.RecentsSystemUserService" - android:exported="false" - android:permission="com.android.systemui.permission.SELF" /> - - <!-- Alternate Recents --> - <activity android:name=".recents.RecentsActivity" - android:label="@string/accessibility_desc_recent_apps" - android:exported="false" - android:launchMode="singleInstance" - android:excludeFromRecents="true" - android:stateNotNeeded="true" - android:resumeWhilePausing="true" - android:resizeableActivity="true" - android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden" - android:theme="@style/RecentsTheme.Wallpaper"> - <intent-filter> - <action android:name="com.android.systemui.recents.TOGGLE_RECENTS" /> - </intent-filter> - </activity> - - </application> -</manifest> diff --git a/packages/SystemUI/legacy/recents/proguard.flags b/packages/SystemUI/legacy/recents/proguard.flags deleted file mode 100644 index c3589491865d..000000000000 --- a/packages/SystemUI/legacy/recents/proguard.flags +++ /dev/null @@ -1,14 +0,0 @@ --keepclassmembers class ** { - public void onBusEvent(**); - public void onInterprocessBusEvent(**); -} --keepclassmembers class ** extends **.EventBus$InterprocessEvent { - public <init>(android.os.Bundle); -} - --keep class com.android.systemui.recents.views.TaskView { - public int getDim(); - public void setDim(int); - public float getTaskProgress(); - public void setTaskProgress(float); -}
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_fast_toggle_app_home_exit.xml b/packages/SystemUI/legacy/recents/res/anim/recents_fast_toggle_app_home_exit.xml deleted file mode 100644 index 69edcc757ba9..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_fast_toggle_app_home_exit.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2012, 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. -*/ ---> -<!-- Recents Activity --> -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="top"> - <alpha android:fromAlpha="1.0" android:toAlpha="1.0" - android:fillEnabled="true" - android:fillBefore="true" android:fillAfter="true" - android:duration="250"/> -</set> diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_from_launcher_enter.xml b/packages/SystemUI/legacy/recents/res/anim/recents_from_launcher_enter.xml deleted file mode 100644 index 00b3dfda135e..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_from_launcher_enter.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2012, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="normal"> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:fillEnabled="true" - android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/linear_out_slow_in" - android:duration="150"/> -</set> diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_from_launcher_exit.xml b/packages/SystemUI/legacy/recents/res/anim/recents_from_launcher_exit.xml deleted file mode 100644 index 33831b8c0a32..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_from_launcher_exit.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2012, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="top"> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:fillEnabled="true" - android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/recents_from_launcher_exit_interpolator" - android:duration="133"/> -</set> diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_from_unknown_enter.xml b/packages/SystemUI/legacy/recents/res/anim/recents_from_unknown_enter.xml deleted file mode 100644 index da1dee007546..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_from_unknown_enter.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2012, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="top"> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:fillEnabled="true" - android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/linear" - android:duration="200"/> -</set> diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_from_unknown_exit.xml b/packages/SystemUI/legacy/recents/res/anim/recents_from_unknown_exit.xml deleted file mode 100644 index 31cf26a9fdfd..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_from_unknown_exit.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2012, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="normal"> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:fillEnabled="true" - android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/fast_out_slow_in" - android:duration="200"/> -</set> diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_bounce.xml b/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_bounce.xml deleted file mode 100644 index 74f2814b2ce8..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_bounce.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal"> - - - <translate android:fromYDelta="0" android:toYDelta="2%" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/fast_out_slow_in" - android:duration="133"/> - - <scale android:fromXScale="1.0" android:toXScale="0.98" - android:fromYScale="1.0" android:toYScale="0.98" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@android:interpolator/fast_out_slow_in" - android:duration="133" /> - - <translate android:fromYDelta="0" android:toYDelta="-2%" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/recents_launch_prev_affiliated_task_bounce_ydelta" - android:startOffset="133" - android:duration="217"/> - - <scale android:fromXScale="1.0" android:toXScale="1.02040816326531" - android:fromYScale="1.0" android:toYScale="1.02040816326531" - android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true" - android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@interpolator/recents_launch_next_affiliated_task_bounce_scale" - android:startOffset="133" - android:duration="217" /> -</set>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_source.xml b/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_source.xml deleted file mode 100644 index f0fd68458801..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_source.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal"> - - <alpha android:fromAlpha="1.0" android:toAlpha="0.6" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/accelerate_cubic" - android:duration="150"/> - - <scale android:fromXScale="1.0" android:toXScale="0.9" - android:fromYScale="1.0" android:toYScale="0.9" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@android:interpolator/fast_out_slow_in" - android:duration="300" /> -</set>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_target.xml b/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_target.xml deleted file mode 100644 index 170ac829c3c2..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_launch_next_affiliated_task_target.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top"> - - <translate android:fromYDelta="110%" android:toYDelta="0%" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/decelerate_quint" - android:startOffset="50" - android:duration="250" /> -</set>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_bounce.xml b/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_bounce.xml deleted file mode 100644 index b19167da3dde..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_bounce.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top"> - - <translate android:fromYDelta="0%" android:toYDelta="10%" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/fast_out_slow_in" - android:duration="133" /> - - <translate android:fromYDelta="0%" android:toYDelta="-10%" - android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true" - android:interpolator="@interpolator/recents_launch_prev_affiliated_task_bounce_ydelta" - android:startOffset="133" - android:duration="217" /> -</set>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_source.xml b/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_source.xml deleted file mode 100644 index ad5341bf8ff3..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_source.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top"> - - <translate android:fromYDelta="0%" android:toYDelta="110%" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/accelerate_quint" - android:duration="300" /> -</set>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_target.xml b/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_target.xml deleted file mode 100644 index 7687f0286f25..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_launch_prev_affiliated_task_target.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal"> - - <alpha android:fromAlpha="0.6" android:toAlpha="1.0" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/decelerate_cubic" - android:startOffset="75" - android:duration="150"/> - - <scale android:fromXScale="0.9" android:toXScale="1.0" - android:fromYScale="0.9" android:toYScale="1.0" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/linear_out_slow_in" - android:pivotX="50%p" android:pivotY="50%p" - android:startOffset="75" - android:duration="225" /> -</set>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_to_launcher_enter.xml b/packages/SystemUI/legacy/recents/res/anim/recents_to_launcher_enter.xml deleted file mode 100644 index 544ec88d2bfa..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_to_launcher_enter.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2012, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="normal"> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:fillEnabled="true" - android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/recents_to_launcher_enter_interpolator" - android:duration="133"/> -</set> diff --git a/packages/SystemUI/legacy/recents/res/anim/recents_to_launcher_exit.xml b/packages/SystemUI/legacy/recents/res/anim/recents_to_launcher_exit.xml deleted file mode 100644 index 226edb85d049..000000000000 --- a/packages/SystemUI/legacy/recents/res/anim/recents_to_launcher_exit.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2012, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="top"> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:fillEnabled="true" - android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/linear_out_slow_in" - android:duration="1"/> -</set> diff --git a/packages/SystemUI/legacy/recents/res/drawable-hdpi/recents_lower_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-hdpi/recents_lower_gradient.9.png Binary files differdeleted file mode 100644 index 17100f773a16..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-hdpi/recents_lower_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-hdpi/recents_status_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-hdpi/recents_status_gradient.9.png Binary files differdeleted file mode 100644 index e969d4c26717..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-hdpi/recents_status_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-mdpi/recents_lower_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-mdpi/recents_lower_gradient.9.png Binary files differdeleted file mode 100644 index b53bd8f92a00..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-mdpi/recents_lower_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-mdpi/recents_status_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-mdpi/recents_status_gradient.9.png Binary files differdeleted file mode 100644 index 657f710ac8d6..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-mdpi/recents_status_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-xhdpi/recents_lower_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-xhdpi/recents_lower_gradient.9.png Binary files differdeleted file mode 100644 index 09606f629b67..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-xhdpi/recents_lower_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-xhdpi/recents_status_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-xhdpi/recents_status_gradient.9.png Binary files differdeleted file mode 100644 index a444c551d430..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-xhdpi/recents_status_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_lower_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_lower_gradient.9.png Binary files differdeleted file mode 100644 index 427cad9f6326..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_lower_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_status_gradient.9.png b/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_status_gradient.9.png Binary files differdeleted file mode 100644 index 29cf44bf381f..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_status_gradient.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_task_shadow.9.png b/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_task_shadow.9.png Binary files differdeleted file mode 100644 index 36e7e45494ef..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable-xxhdpi/recents_task_shadow.9.png +++ /dev/null diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_dismiss_dark.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_dismiss_dark.xml deleted file mode 100644 index b837ebef78eb..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_dismiss_dark.xml +++ /dev/null @@ -1,29 +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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" -android:width="24dp" -android:height="24dp" -android:viewportWidth="24" -android:viewportHeight="24"> - -<path - android:fillColor="@color/recents_task_bar_dark_icon_color" - android:pathData="M18.3 5.71a.996 .996 0 0 0-1.41 0L12 10.59 7.11 5.7A.996 .996 0 1 0 5.7 -7.11L10.59 12 5.7 16.89a.996 .996 0 1 0 1.41 1.41L12 13.41l4.89 4.89a.996 .996 0 -1 0 1.41-1.41L13.41 12l4.89-4.89c.38-.38 .38 -1.02 0-1.4z" /> -<path - android:pathData="M0 0h24v24H0z" /> -</vector>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_dismiss_light.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_dismiss_light.xml deleted file mode 100644 index 2b2081404b69..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_dismiss_light.xml +++ /dev/null @@ -1,29 +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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" -android:width="24dp" -android:height="24dp" -android:viewportWidth="24" -android:viewportHeight="24"> - -<path - android:fillColor="@color/recents_task_bar_light_icon_color" - android:pathData="M18.3 5.71a.996 .996 0 0 0-1.41 0L12 10.59 7.11 5.7A.996 .996 0 1 0 5.7 -7.11L10.59 12 5.7 16.89a.996 .996 0 1 0 1.41 1.41L12 13.41l4.89 4.89a.996 .996 0 -1 0 1.41-1.41L13.41 12l4.89-4.89c.38-.38 .38 -1.02 0-1.4z" /> -<path - android:pathData="M0 0h24v24H0z" /> -</vector>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_empty.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_empty.xml deleted file mode 100644 index 5506de1d583f..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_empty.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="100dp" - android:height="132dp" - android:viewportWidth="100" - android:viewportHeight="132"> - - <path - android:fillColor="#5AFFFFFF" - android:pathData="M86.91,68.67H13.09c-4.96,0-9,4.04-9,9V119c0,4.96,4.04,9,9,9h73.82c4.96,0,9-4.04,9-9V77.67 -C95.91,72.7,91.87,68.67,86.91,68.67z M27.59,77.27h26.72v3.94H27.59V77.27z -M18.73,74.74c2.49,0,4.5,2.01,4.5,4.5 -c0,2.49-2.01,4.5-4.5,4.5s-4.5-2.01-4.5-4.5C14.23,76.75,16.24,74.74,18.73,74.74z -M89.91,119c0,1.65-1.35,3-3,3H13.09 c-1.65,0-3-1.35-3-3V88.67h79.82V119z" /> - <path - android:fillColor="#5AFFFFFF" - android:pathData="M86.91,36.3H13.09c-4.96,0-9,4.04-9,9v23c1.65-1.58,3.71-2.73,6-3.28v-9.08h79.82v9.08 -c2.29,0.55,4.35,1.69,6,3.28v-23C95.91,40.34,91.87,36.3,86.91,36.3z -M18.73,51.38c-2.49,0-4.5-2.01-4.5-4.5s2.01-4.5,4.5-4.5 -s4.5,2.01,4.5,4.5S21.22,51.38,18.73,51.38z M54.31,48.84H27.59v-3.94h26.72V48.84z" /> - <path - android:fillColor="#5AFFFFFF" - android:pathData="M86.91,4H13.09c-4.96,0-9,4.04-9,9v22.94c1.65-1.58,3.71-2.73,6-3.28V24h79.82v8.67 -c2.29,0.55,4.35,1.69,6,3.28V13C95.91,8.04,91.87,4,86.91,4z -M18.73,18.5c-2.49,0-4.5-2.01-4.5-4.5s2.01-4.5,4.5-4.5 -s4.5,2.01,4.5,4.5S21.22,18.5,18.73,18.5z M54.31,15.97H27.59v-3.94h26.72V15.97z" /> - <path - android:pathData="M 0 0 H 100 V 132 H 0 V 0 Z" /> -</vector>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_grid_task_view_focus_frame_background.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_grid_task_view_focus_frame_background.xml deleted file mode 100644 index 4987f9bcf610..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_grid_task_view_focus_frame_background.xml +++ /dev/null @@ -1,19 +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. ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="#61FFFFFF" /> - <corners android:radius="@dimen/recents_grid_task_view_focused_frame_rounded_corners_radius"/> -</shape>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_info_dark.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_info_dark.xml deleted file mode 100644 index 555a69ae9123..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_info_dark.xml +++ /dev/null @@ -1,24 +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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24.0dp" - android:height="24.0dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="@color/recents_task_bar_dark_icon_color" - android:pathData="M12.000000,2.000000C6.500000,2.000000 2.000000,6.500000 2.000000,12.000000s4.500000,10.000000 10.000000,10.000000c5.500000,0.000000 10.000000,-4.500000 10.000000,-10.000000S17.500000,2.000000 12.000000,2.000000zM13.000000,17.000000l-2.000000,0.000000l0.000000,-6.000000l2.000000,0.000000L13.000000,17.000000zM13.000000,9.000000l-2.000000,0.000000L11.000000,7.000000l2.000000,0.000000L13.000000,9.000000z"/> -</vector> diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_info_light.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_info_light.xml deleted file mode 100644 index 65e7bf5fa41d..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_info_light.xml +++ /dev/null @@ -1,24 +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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24.0dp" - android:height="24.0dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:pathData="M12.000000,2.000000C6.500000,2.000000 2.000000,6.500000 2.000000,12.000000s4.500000,10.000000 10.000000,10.000000c5.500000,0.000000 10.000000,-4.500000 10.000000,-10.000000S17.500000,2.000000 12.000000,2.000000zM13.000000,17.000000l-2.000000,0.000000l0.000000,-6.000000l2.000000,0.000000L13.000000,17.000000zM13.000000,9.000000l-2.000000,0.000000L11.000000,7.000000l2.000000,0.000000L13.000000,9.000000z" - android:fillColor="#FFFFFF"/> -</vector> diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_lock_to_app_pin.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_lock_to_app_pin.xml deleted file mode 100644 index 317f858f662d..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_lock_to_app_pin.xml +++ /dev/null @@ -1,25 +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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24.0dp" - android:height="24.0dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - - <path - android:fillColor="#FFffffff" - android:pathData="M16.000000,12.000000L16.000000,4.000000l1.000000,0.000000L17.000000,2.000000L7.000000,2.000000l0.000000,2.000000l1.000000,0.000000l0.000000,8.000000l-2.000000,2.000000l0.000000,2.000000l5.200000,0.000000l0.000000,6.000000l1.600000,0.000000l0.000000,-6.000000L18.000000,16.000000l0.000000,-2.000000L16.000000,12.000000z"/> -</vector> diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_lock_to_task_button_bg.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_lock_to_task_button_bg.xml deleted file mode 100644 index 8a8164a94122..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_lock_to_task_button_bg.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="#ff9cdfd9"> - <item> - <shape android:shape="oval"> - <solid android:color="#9cc8c4" /> - <size android:width="@dimen/recents_lock_to_app_size" - android:height="@dimen/recents_lock_to_app_size" /> - </shape> - </item> -</ripple>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_move_task_fullscreen_dark.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_move_task_fullscreen_dark.xml deleted file mode 100644 index fd468c1ff25e..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_move_task_fullscreen_dark.xml +++ /dev/null @@ -1,37 +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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <group - android:translateX="-252.000000" - android:translateY="-602.000000"> - <group - android:translateX="109.000000" - android:translateY="514.000000"> - <group - android:translateX="144.000000" - android:translateY="89.000000"> - <path - android:strokeColor="@color/recents_task_bar_dark_icon_color" - android:strokeWidth="2" - android:pathData="M17,17 L5,17 L5,5 L17,5 L17,17 Z" /> - </group> - </group> - </group> -</vector>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_move_task_fullscreen_light.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_move_task_fullscreen_light.xml deleted file mode 100644 index 532290637d74..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_move_task_fullscreen_light.xml +++ /dev/null @@ -1,37 +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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <group - android:translateX="-252.000000" - android:translateY="-602.000000"> - <group - android:translateX="109.000000" - android:translateY="514.000000"> - <group - android:translateX="144.000000" - android:translateY="89.000000"> - <path - android:strokeColor="@color/recents_task_bar_light_icon_color" - android:strokeWidth="2" - android:pathData="M19,19 L3,19 L3,3 L19,3 L19,5 L19,18 L19,19 Z" /> - </group> - </group> - </group> -</vector>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/drawable/recents_stack_action_background.xml b/packages/SystemUI/legacy/recents/res/drawable/recents_stack_action_background.xml deleted file mode 100644 index 2a40dd0ec613..000000000000 --- a/packages/SystemUI/legacy/recents/res/drawable/recents_stack_action_background.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- -Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2 (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. ---> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight"> - <item android:id="@android:id/mask"> - <shape> - <corners android:radius="@dimen/recents_task_view_rounded_corners_radius" /> - <solid android:color="@android:color/white" /> - </shape> - </item> -</ripple>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/interpolator/recents_from_launcher_exit_interpolator.xml b/packages/SystemUI/legacy/recents/res/interpolator/recents_from_launcher_exit_interpolator.xml deleted file mode 100644 index 4a7fff67eac5..000000000000 --- a/packages/SystemUI/legacy/recents/res/interpolator/recents_from_launcher_exit_interpolator.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> -<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android" - android:controlX1="0" - android:controlY1="0" - android:controlX2="0.8" - android:controlY2="1" /> diff --git a/packages/SystemUI/legacy/recents/res/interpolator/recents_launch_next_affiliated_task_bounce_scale.xml b/packages/SystemUI/legacy/recents/res/interpolator/recents_launch_next_affiliated_task_bounce_scale.xml deleted file mode 100644 index c4e5d972222c..000000000000 --- a/packages/SystemUI/legacy/recents/res/interpolator/recents_launch_next_affiliated_task_bounce_scale.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> -<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android" - android:pathData="M 0,0 c 0.8,0 0.2,1 1,1" /> diff --git a/packages/SystemUI/legacy/recents/res/interpolator/recents_launch_prev_affiliated_task_bounce_ydelta.xml b/packages/SystemUI/legacy/recents/res/interpolator/recents_launch_prev_affiliated_task_bounce_ydelta.xml deleted file mode 100644 index 40a08b97160d..000000000000 --- a/packages/SystemUI/legacy/recents/res/interpolator/recents_launch_prev_affiliated_task_bounce_ydelta.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> -<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android" - android:pathData="M 0,0 c 0.6,0 0.2,1 1,1" /> diff --git a/packages/SystemUI/legacy/recents/res/interpolator/recents_to_launcher_enter_interpolator.xml b/packages/SystemUI/legacy/recents/res/interpolator/recents_to_launcher_enter_interpolator.xml deleted file mode 100644 index c61dfd87d842..000000000000 --- a/packages/SystemUI/legacy/recents/res/interpolator/recents_to_launcher_enter_interpolator.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> -<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android" - android:controlX1="0.4" - android:controlY1="0" - android:controlX2="1" - android:controlY2="1" /> diff --git a/packages/SystemUI/legacy/recents/res/layout/recents.xml b/packages/SystemUI/legacy/recents/res/layout/recents.xml deleted file mode 100644 index ae89631219fb..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <!-- Recents View --> - <com.android.systemui.recents.views.RecentsView - android:id="@+id/recents_view" - android:layout_width="match_parent" - android:layout_height="match_parent"> - </com.android.systemui.recents.views.RecentsView> - - <!-- Incompatible task overlay --> - <ViewStub android:id="@+id/incompatible_app_overlay_stub" - android:inflatedId="@+id/incompatible_app_overlay" - android:layout="@layout/recents_incompatible_app_overlay" - android:layout_width="match_parent" - android:layout_height="128dp" - android:layout_gravity="center_horizontal|top" /> - - <!-- Nav Bar Scrim View --> - <ImageView - android:id="@+id/nav_bar_scrim" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:scaleType="fitXY" - android:src="@drawable/recents_lower_gradient" /> -</FrameLayout> diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_empty.xml b/packages/SystemUI/legacy/recents/res/layout/recents_empty.xml deleted file mode 100644 index d7f058ce4a9d..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_empty.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" - android:drawableTop="@drawable/recents_empty" - android:drawablePadding="25dp" - android:textSize="16sp" - android:drawableTint="?attr/wallpaperTextColor" - android:textColor="?attr/wallpaperTextColor" - android:text="@string/recents_empty_message" - android:fontFamily="sans-serif" - android:visibility="gone" />
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_grid_task_view.xml b/packages/SystemUI/legacy/recents/res/layout/recents_grid_task_view.xml deleted file mode 100644 index 1c9b9ac5f5f2..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_grid_task_view.xml +++ /dev/null @@ -1,35 +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. ---> -<com.android.systemui.recents.views.grid.GridTaskView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true"> - <com.android.systemui.recents.views.grid.GridTaskViewThumbnail - android:id="@+id/task_view_thumbnail" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <include layout="@layout/recents_task_view_header" /> - - <!-- TODO: Move this into a view stub --> - <include layout="@layout/recents_task_view_lock_to_app"/> - - <!-- The incompatible app toast --> - <include layout="@layout/recents_task_view_incompatible_app_toast"/> -</com.android.systemui.recents.views.grid.GridTaskView> - - diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_incompatible_app_overlay.xml b/packages/SystemUI/legacy/recents/res/layout/recents_incompatible_app_overlay.xml deleted file mode 100644 index a1c1e5bd32c7..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_incompatible_app_overlay.xml +++ /dev/null @@ -1,31 +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. ---> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:alpha="0" - android:background="#88000000" - android:forceHasOverlappingRendering="false"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:drawableTop="@drawable/recents_info_light" - android:drawablePadding="8dp" - android:text="@string/dock_non_resizeble_failed_to_dock_text" - android:textColor="@android:color/white" /> -</FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_low_ram_stack_action_button.xml b/packages/SystemUI/legacy/recents/res/layout/recents_low_ram_stack_action_button.xml deleted file mode 100644 index dca891103c4e..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_low_ram_stack_action_button.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. - --> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="26dp" - android:paddingEnd="26dp" - android:paddingTop="17dp" - android:paddingBottom="17dp" - android:text="@string/recents_stack_action_button_label" - android:textSize="14sp" - android:textColor="#FFFFFF" - android:textAllCaps="true" - android:fontFamily="sans-serif-medium" - android:background="@drawable/recents_low_ram_stack_button_background" - android:visibility="invisible" - android:forceHasOverlappingRendering="false" - style="?attr/clearAllStyle" /> diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_search_bar.xml b/packages/SystemUI/legacy/recents/res/layout/recents_search_bar.xml deleted file mode 100644 index 915283e30f65..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_search_bar.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/search_bg_transparent"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/recents_search_bar_label" - android:textColor="#99ffffff" - android:textSize="18sp" - android:textAllCaps="true" /> -</FrameLayout> - diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_stack_action_button.xml b/packages/SystemUI/legacy/recents/res/layout/recents_stack_action_button.xml deleted file mode 100644 index 4707a8ca843f..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_stack_action_button.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- 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. ---> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="14dp" - android:paddingEnd="14dp" - android:paddingTop="12dp" - android:paddingBottom="12dp" - android:text="@string/recents_stack_action_button_label" - android:textSize="14sp" - android:textColor="?attr/wallpaperTextColor" - android:textAllCaps="true" - android:shadowColor="#99000000" - android:shadowDx="0" - android:shadowDy="2" - android:shadowRadius="5" - android:fontFamily="sans-serif-medium" - android:background="@drawable/recents_stack_action_background" - android:visibility="invisible" - android:forceHasOverlappingRendering="false" - style="?attr/clearAllStyle" /> diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_task_view.xml b/packages/SystemUI/legacy/recents/res/layout/recents_task_view.xml deleted file mode 100644 index 015e4a2006bb..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_task_view.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<com.android.systemui.recents.views.TaskView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true"> - <com.android.systemui.recents.views.TaskViewThumbnail - android:id="@+id/task_view_thumbnail" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <include layout="@layout/recents_task_view_header" /> - - <!-- TODO: Move this into a view stub --> - <include layout="@layout/recents_task_view_lock_to_app"/> - - <!-- The incompatible app toast --> - <include layout="@layout/recents_task_view_incompatible_app_toast"/> -</com.android.systemui.recents.views.TaskView> - - diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header.xml b/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header.xml deleted file mode 100644 index 1734506dbaba..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- The layouts params are calculated in TaskViewHeader.java --> -<com.android.systemui.recents.views.TaskViewHeader - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/task_view_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top|center_horizontal"> - <com.android.systemui.recents.views.FixedSizeImageView - android:id="@+id/icon" - android:contentDescription="@string/recents_app_info_button_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|start" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="16dp" - android:paddingEnd="12dp" /> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|start" - android:textSize="16sp" - android:textColor="#ffffffff" - android:text="@string/recents_empty_message" - android:fontFamily="sans-serif-medium" - android:singleLine="true" - android:maxLines="1" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:forceHasOverlappingRendering="false" /> - <com.android.systemui.recents.views.FixedSizeImageView - android:id="@+id/move_task" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|end" - android:padding="@dimen/recents_task_view_header_button_padding" - android:src="@drawable/star" - android:background="?android:selectableItemBackground" - android:alpha="0" - android:visibility="gone" /> - <com.android.systemui.recents.views.FixedSizeImageView - android:id="@+id/dismiss_task" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|end" - android:padding="@dimen/recents_task_view_header_button_padding" - android:src="@drawable/recents_dismiss_light" - android:background="?android:selectableItemBackground" - android:alpha="0" - android:visibility="gone" /> - - <!-- The app overlay shows as the user long-presses on the app icon --> - <ViewStub android:id="@+id/app_overlay_stub" - android:inflatedId="@+id/app_overlay" - android:layout="@layout/recents_task_view_header_overlay" - android:layout_width="match_parent" - android:layout_height="match_parent" /> -</com.android.systemui.recents.views.TaskViewHeader> diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header_overlay.xml b/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header_overlay.xml deleted file mode 100644 index cf09b1d108ec..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header_overlay.xml +++ /dev/null @@ -1,52 +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. ---> -<!-- The layouts params are calculated in TaskViewHeader.java --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <com.android.systemui.recents.views.FixedSizeImageView - android:id="@+id/app_icon" - android:contentDescription="@string/recents_app_info_button_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|start" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="16dp" - android:paddingEnd="12dp" /> - <TextView - android:id="@+id/app_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|start" - android:textSize="16sp" - android:textColor="#ffffffff" - android:text="@string/recents_empty_message" - android:fontFamily="sans-serif-medium" - android:singleLine="true" - android:maxLines="2" - android:ellipsize="marquee" - android:fadingEdge="horizontal" /> - <com.android.systemui.recents.views.FixedSizeImageView - android:id="@+id/app_info" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|end" - android:padding="@dimen/recents_task_view_header_button_padding" - android:background="?android:selectableItemBackground" - android:src="@drawable/recents_info_light" /> -</FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header_progress_bar.xml b/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header_progress_bar.xml deleted file mode 100644 index f3526322f52d..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_header_progress_bar.xml +++ /dev/null @@ -1,22 +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. ---> -<ProgressBar - xmlns:android="http://schemas.android.com/apk/res/android" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:indeterminateOnly="false" - android:visibility="invisible" />
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_incompatible_app_toast.xml b/packages/SystemUI/legacy/recents/res/layout/recents_task_view_incompatible_app_toast.xml deleted file mode 100644 index d573d6b881d2..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_incompatible_app_toast.xml +++ /dev/null @@ -1,26 +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. ---> -<ViewStub - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/incompatible_app_toast_stub" - android:inflatedId="@+id/incompatible_app_toast" - android:layout="@*android:layout/transient_notification" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|center_horizontal" - android:layout_marginTop="48dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" />
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_lock_to_app.xml b/packages/SystemUI/legacy/recents/res/layout/recents_task_view_lock_to_app.xml deleted file mode 100644 index 8cece1149ce7..000000000000 --- a/packages/SystemUI/legacy/recents/res/layout/recents_task_view_lock_to_app.xml +++ /dev/null @@ -1,34 +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. ---> -<com.android.systemui.statusbar.AlphaOptimizedFrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/lock_to_app_fab" - android:layout_width="@dimen/recents_lock_to_app_size" - android:layout_height="@dimen/recents_lock_to_app_size" - android:layout_gravity="bottom|end" - android:layout_marginEnd="15dp" - android:layout_marginBottom="15dp" - android:translationZ="4dp" - android:contentDescription="@string/recents_lock_to_app_button_label" - android:background="@drawable/recents_lock_to_task_button_bg" - android:visibility="invisible" - android:alpha="0"> - <ImageView - android:layout_width="@dimen/recents_lock_to_app_icon_size" - android:layout_height="@dimen/recents_lock_to_app_icon_size" - android:layout_gravity="center" - android:src="@drawable/recents_lock_to_app_pin" /> -</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/values-af/strings.xml b/packages/SystemUI/legacy/recents/res/values-af/strings.xml deleted file mode 100644 index 736c81034c06..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-af/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Oorsig."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Maak <xliff:g id="APP">%s</xliff:g> toe."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> is toegemaak."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Alle onlangse programme is toegemaak."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Maak <xliff:g id="APP">%s</xliff:g>-programinligting oop."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Begin tans <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Geen onlangse items nie"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Jy het alles toegemaak"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Programinligting"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"skermvaspen"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"soek"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Kon nie <xliff:g id="APP">%s</xliff:g> begin nie."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is in veiligmodus gedeaktiveer."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Vee alles uit"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Sleep hierheen om verdeelde skerm te gebruik"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Verdeel horisontaal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Verdeel vertikaal"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Verdeel gepasmaak"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Verdeel skerm na bo"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Verdeel skerm na links"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Verdeel skerm na regs"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-am/strings.xml b/packages/SystemUI/legacy/recents/res/values-am/strings.xml deleted file mode 100644 index 2870be712779..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-am/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"አጠቃላይ እይታ።"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> አስወግድ።"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ተሰናብቷል።"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"ሁሉም የቅርብ ጊዜ ማመልከቻዎች ተሰናብተዋል።"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"የ<xliff:g id="APP">%s</xliff:g> መተግበሪያ መረጃውን ይክፈቱ።"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> በመጀመር ላይ።"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ምንም የቅርብ ጊዜ ንጥሎች የሉም"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"ሁሉንም ነገር አጽድተዋል"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"የመተግበሪያ መረጃ"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ማያ ገጽ መሰካት"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ፈልግ"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>ን መጀመር አልተቻለም።"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> በጥንቃቄ ሁነታ ውስጥ ታግዷል።"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ሁሉንም አጽዳ"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"የተከፈለ ማያ ገጽን ለመጠቀም እዚህ ላይ ይጎትቱ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"አግድም ክፈል"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ቁልቁል ክፈል"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"በብጁ ክፈል"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"ማያ ገጽ ወደ ላይ ክፈል"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"ማያ ገጽ ወደ ግራ ክፈል"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"ማያ ገጽ ወደ ቀኝ ክፈል"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ar/strings.xml b/packages/SystemUI/legacy/recents/res/values-ar/strings.xml deleted file mode 100644 index 004de41891a0..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ar/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"النظرة عامة"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"إزالة <xliff:g id="APP">%s</xliff:g>"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"تمَّت إزالة <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"تمَّت إزالة كل التطبيقات المستخدمة مؤخرًا."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"فتح معلومات تطبيق <xliff:g id="APP">%s</xliff:g>"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"جارٍ بدء <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ليست هناك عناصر تم استخدامها مؤخرًا"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"لقد محوتَ كل شيء"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"معلومات التطبيق"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"تثبيت الشاشة"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"بحث"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"تعذَّر بدء <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"تم إيقاف <xliff:g id="APP">%s</xliff:g> في الوضع الآمن."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"محو الكل"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"اسحب هنا لاستخدام وضع تقسيم الشاشة"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"تقسيم أفقي"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"تقسيم رأسي"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"تقسيم مخصَّص"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"تقسيم الشاشة بمحاذاة الجزء العلوي"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"تقسيم الشاشة بمحاذاة اليسار"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"تقسيم الشاشة بمحاذاة اليمين"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-as/strings.xml b/packages/SystemUI/legacy/recents/res/values-as/strings.xml deleted file mode 100644 index c742dab230e6..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-as/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"অৱলোকন।"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"শেহতীয়া-ৰ তালিকাৰ পৰা <xliff:g id="APP">%s</xliff:g>ক আঁতৰাওক।"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"শেহতীয়া-ৰ তালিকাৰ পৰা <xliff:g id="APP">%s</xliff:g>ক আঁতৰোৱা হ’ল।"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"শেহতীয়া-ৰ তালিকাৰ পৰা সকলো এপ্লিকেশ্বন আঁতৰোৱা হ’ল।"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> এপ্লিকেশ্বনৰ তথ্য খোলক।"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g>ক আৰম্ভ কৰা হৈছে।"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"কোনো শেহতীয়া বস্তু নাই"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"আপুনি সকলো খালী কৰিলে"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"এপ্লিকেশ্বনৰ তথ্য"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"স্ক্ৰীণ পিনিং"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"সন্ধান কৰক"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>ক আৰম্ভ কৰিব পৰা নগ’ল।"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g>টো সুৰক্ষিত ম’ডত অক্ষম কৰা হ’ল।"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"সকলো মচক"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"বিভাজিত স্ক্ৰীণ ব্যৱহাৰ কৰিবলৈ ইয়ালৈ টানি আনি এৰক"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"আনুভূমিকভাৱে বিভাজন কৰক"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"উলম্বভাৱে বিভাজন কৰক"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"কাষ্টম বিভাজন কৰক"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"স্ক্ৰীণখনক ওপৰফাললৈ ভাগ কৰক"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"স্ক্ৰীণখনক বাওঁফাললৈ ভাগ কৰক"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"স্ক্ৰীণখনক সোঁফাললৈ ভাগ কৰক"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-az/strings.xml b/packages/SystemUI/legacy/recents/res/values-az/strings.xml deleted file mode 100644 index 76ae02aa0f24..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-az/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"İcmal."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> tətbiqini silin."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> silindi."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Bütün son tətbiqlər silindi."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> tətbiq məlumatını açın."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> başladılır."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Ən son element yoxdur"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Hər şeyi sildiniz"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Tətbiq məlumatı"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ekran sancağı"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"axtarış"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> başladılmadı."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> təhlükəsiz rejimdə deaktiv edildi."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Hamısını silin"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Bölünmüş ekrandan istifadə etmək üçün bura sürüşdürün"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Horizontal Bölün"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Vertikal Bölün"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Fərdi Bölün"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Ekranı yuxarıya doğru bölün"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Ekranı sola doğru bölün"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Ekranı sağa doğru bölün"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/legacy/recents/res/values-b+sr+Latn/strings.xml deleted file mode 100644 index 3117eeac77f7..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-b+sr+Latn/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Pregled."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Odbacite aplikaciju <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Aplikacija <xliff:g id="APP">%s</xliff:g> je odbačena."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Sve nedavno korišćene aplikacije su odbačene."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Otvorite informacije o aplikaciji <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Pokreće se <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nema nedavnih stavki"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Obrisali ste sve"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informacije o aplikaciji"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"kačenje ekrana"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"pretraži"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Pokretanje aplikacije <xliff:g id="APP">%s</xliff:g> nije uspelo."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplikacija <xliff:g id="APP">%s</xliff:g> je onemogućena u bezbednom režimu."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Obriši sve"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Prevucite ovde da biste koristili razdeljeni ekran"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Podeli horizontalno"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Podeli vertikalno"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Podeli prilagođeno"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Podeli ekran nagore"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Podeli ekran nalevo"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Podeli ekran nadesno"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-be/strings.xml b/packages/SystemUI/legacy/recents/res/values-be/strings.xml deleted file mode 100644 index 812184651e6e..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-be/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Агляд."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Закрыць праграму \"<xliff:g id="APP">%s</xliff:g>\"."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Праграма \"<xliff:g id="APP">%s</xliff:g>\" закрыта."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Усе нядаўнія праграмы закрыты."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Адкрыць інфармацыю пра праграму \"<xliff:g id="APP">%s</xliff:g>\"."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Запускаецца праграма \"<xliff:g id="APP">%s</xliff:g>\"."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Няма нядаўніх элементаў"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Вы ўсё выдалілі"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Інфармацыя пра праграму"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"замацаванне экрана"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"пошук"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Не ўдалося запусціць праграму \"<xliff:g id="APP">%s</xliff:g>\"."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Праграма \"<xliff:g id="APP">%s</xliff:g>\" адключана ў бяспечным рэжыме."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Ачысціць усё"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Перацягніце сюды, каб перайсці ў рэжым падзеленага экрана"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Падзяліць гарызантальна"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Падзяліць вертыкальна"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Падзяліць іншым чынам"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Падзяліць экран зверху"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Падзяліць экран злева"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Падзяліць экран справа"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-bg/strings.xml b/packages/SystemUI/legacy/recents/res/values-bg/strings.xml deleted file mode 100644 index 3dda34fa00be..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-bg/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Общ преглед."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Отхвърляне на <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Приложението <xliff:g id="APP">%s</xliff:g> е отхвърлено."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Всички скорошни приложения са отхвърлени."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Отворете информацията за приложението <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> се стартира."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Няма скорошни елементи"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Изчистихте всичко"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Информация за приложението"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"фиксиране на екрана"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"търсене"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> не можа да стартира."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Приложението <xliff:g id="APP">%s</xliff:g> е деактивирано в безопасния режим."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Изчистване на всичко"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Преместете тук с плъзгане, за да използвате режим за разделен екран"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Хоризонтално разделяне"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Вертикално разделяне"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Персонализирано разделяне"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Разделяне на екрана нагоре"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Разделяне на екрана наляво"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Разделяне на екрана надясно"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-bn/strings.xml b/packages/SystemUI/legacy/recents/res/values-bn/strings.xml deleted file mode 100644 index b22672e1dc6a..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-bn/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"এক নজরে।"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> খারিজ করুন।"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> খারিজ করা হয়েছে।"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"সব সাম্প্রতিক অ্যাপ্লিকেশন খারিজ করা হয়েছে।"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> অ্যাপ্লিকেশনের তথ্য খুলুন।"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> শুরু করা হচ্ছে।"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"কোনো সাম্প্রতিক আইটেম নেই"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"আপনি সবকিছু মুছে দিয়েছেন"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"অ্যাপ্লিকেশনের তথ্য"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"স্ক্রিন পিন করা"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"খুঁজুন"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> চালু করা যায়নি।"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"নিরাপদ মোডে <xliff:g id="APP">%s</xliff:g> বন্ধ করা আছে।"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"সবগুলি মুছে দিন"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"স্প্লিট স্ক্রিন ব্যবহার করতে এখানে টেনে আনুন"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"অনুভূমিক স্প্লিট করুন"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"উল্লম্ব স্প্লিট করুন"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"কাস্টম স্প্লিট করুন"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"স্ক্রিনটি উপরের দিকে স্প্লিট করুন"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"স্ক্রিনটি বাঁদিকে স্প্লিট করুন"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"স্ক্রিনটি ডানদিকে স্প্লিট করুন"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-bs/strings.xml b/packages/SystemUI/legacy/recents/res/values-bs/strings.xml deleted file mode 100644 index 8e149ba800bb..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-bs/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Pregled."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Odbaci aplikaciju <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Aplikacija <xliff:g id="APP">%s</xliff:g> je odbačena."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Sve nedavno korištene aplikacije su odbačene."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Otvaranje informacija o aplikaciji <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Pokretanje aplikacije <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nema nedavnih stavki"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Sve ste obrisali"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informacije o aplikaciji"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"kačenje ekrana"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"pretraži"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Aplikacija <xliff:g id="APP">%s</xliff:g> nije pokrenuta."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplikacija <xliff:g id="APP">%s</xliff:g> je onemogućena u sigurnom načinu rada."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Obriši sve"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Povucite ovdje za korištenje podijeljenog ekrana"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Podjela po horizontali"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Podjela po vertikali"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Prilagođena podjela"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Dijeli ekran nagore"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Dijeli ekran nalijevo"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Dijeli ekran nadesno"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ca/strings.xml b/packages/SystemUI/legacy/recents/res/values-ca/strings.xml deleted file mode 100644 index fff525ce6fd6..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ca/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Aplicacions recents."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Ignora <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"S\'ha ignorat <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"S\'han ignorat totes les aplicacions recents."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Obre la informació sobre l\'aplicació <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"S\'està iniciant <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No hi ha cap element recent"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Ho has esborrat tot"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informació de l\'aplicació"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"fixació de pantalla"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"cerca"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"No s\'ha pogut iniciar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"En mode segur, l\'aplicació <xliff:g id="APP">%s</xliff:g> està desactivada."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Esborra-ho tot"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arrossega-ho aquí per utilitzar la pantalla dividida"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Divisió horitzontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Divisió vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Divisió personalitzada"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Divideix la pantalla cap amunt"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Divideix la pantalla cap a l\'esquerra"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Divideix la pantalla cap a la dreta"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-cs/strings.xml b/packages/SystemUI/legacy/recents/res/values-cs/strings.xml deleted file mode 100644 index 200f7a8aded7..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-cs/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Přehled"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Zavřít aplikaci <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Aplikace <xliff:g id="APP">%s</xliff:g> byla odebrána."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Všechny naposledy použité aplikace byly odstraněny."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Otevře informace o aplikaci <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Spouštění aplikace <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Žádné nedávné položky"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Vše je vymazáno"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informace o aplikaci"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"připnutí obrazovky"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"hledat"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Aplikaci <xliff:g id="APP">%s</xliff:g> nelze spustit."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplikace <xliff:g id="APP">%s</xliff:g> je v nouzovém režimu zakázána."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Vymazat vše"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Přetáhnutím sem aktivujete rozdělenou obrazovku"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Vodorovné rozdělení"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Svislé rozdělení"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Vlastní rozdělení"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Rozdělit obrazovku nahoru"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Rozdělit obrazovku vlevo"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Rozdělit obrazovku vpravo"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-da/strings.xml b/packages/SystemUI/legacy/recents/res/values-da/strings.xml deleted file mode 100644 index 0a1690e4dd59..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-da/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Oversigt."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Fjern <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> er fjernet."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Alle de seneste apps er fjernet."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Åbn appoplysningerne for <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> åbnes."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Ingen nye elementer"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Du har ryddet alt"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Appoplysninger"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"skærmfastholdelse"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"søg"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> kunne ikke åbnes."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> er deaktiveret i sikker tilstand."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Ryd alle"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Træk hertil for at bruge opdelt skærm"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Opdel vandret"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Opdel lodret"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Opdel brugerdefineret"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Opdelt skærm øverst"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Opdelt skærm til venstre"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Opdelt skærm til højre"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-de/strings.xml b/packages/SystemUI/legacy/recents/res/values-de/strings.xml deleted file mode 100644 index 4a089bff6b79..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-de/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Übersicht."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> entfernen."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> wurde entfernt."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Alle kürzlich verwendeten Apps wurden entfernt."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Infos zur <xliff:g id="APP">%s</xliff:g> App öffnen."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> wird gestartet."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Keine kürzlich verwendeten Elemente"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Du hast alles gelöscht"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"App-Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"Bildschirm anpinnen"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"Suchen"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> konnte nicht gestartet werden."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ist im abgesicherten Modus deaktiviert."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Alle löschen"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Hierher ziehen, um den Bildschirm zu teilen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Geteilt – horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Geteilt – vertikal"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Geteilt – benutzerdefiniert"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Geteilten Bildschirm oben anzeigen"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Geteilten Bildschirm links anzeigen"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Geteilten Bildschirm rechts anzeigen"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-el/strings.xml b/packages/SystemUI/legacy/recents/res/values-el/strings.xml deleted file mode 100644 index 90baf52342e8..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-el/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Επισκόπηση."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Παράβλεψη εφαρμογής <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Η εφαρμογή <xliff:g id="APP">%s</xliff:g> απορρίφθηκε."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Όλες οι πρόσφατες εφαρμογές παραβλέφθηκαν."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Άνοιγμα πληροφοριών εφαρμογής <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Έναρξη εφαρμογής <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Δεν υπάρχουν πρόσφατα στοιχεία"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Διαγράψατε όλα τα στοιχεία"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Πληροφορίες εφαρμογής"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"καρφίτσωμα οθόνης"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"αναζήτηση"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Δεν ήταν δυνατή η έναρξη της εφαρμογής <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Η εφαρμογή <xliff:g id="APP">%s</xliff:g> έχει απενεργοποιηθεί στην ασφαλή λειτουργία."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Διαγραφή όλων"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Σύρετε εδώ για να χρησιμοποιήσετε τον διαχωρισμό οθόνης"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Οριζόντιος διαχωρισμός"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Κάθετος διαχωρισμός"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Προσαρμοσμένος διαχωρισμός"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Διαχωρισμός οθόνης στην κορυφή"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Διαχωρισμός οθόνης στα αριστερά"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Διαχωρισμός οθόνης στα δεξιά"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-en-rAU/strings.xml b/packages/SystemUI/legacy/recents/res/values-en-rAU/strings.xml deleted file mode 100644 index af1d055d65d2..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-en-rAU/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dismiss <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dismissed."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"All recent applications dismissed."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Open <xliff:g id="APP">%s</xliff:g> application info."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starting <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No recent items"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"You\'ve cleared everything"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"screen pinning"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"search"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Clear all"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Drag here to use split screen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Split Horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Split Vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Split screen to the top"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Split screen to the left"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Split screen to the right"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-en-rCA/strings.xml b/packages/SystemUI/legacy/recents/res/values-en-rCA/strings.xml deleted file mode 100644 index af1d055d65d2..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-en-rCA/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dismiss <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dismissed."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"All recent applications dismissed."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Open <xliff:g id="APP">%s</xliff:g> application info."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starting <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No recent items"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"You\'ve cleared everything"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"screen pinning"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"search"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Clear all"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Drag here to use split screen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Split Horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Split Vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Split screen to the top"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Split screen to the left"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Split screen to the right"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-en-rGB/strings.xml b/packages/SystemUI/legacy/recents/res/values-en-rGB/strings.xml deleted file mode 100644 index af1d055d65d2..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-en-rGB/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dismiss <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dismissed."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"All recent applications dismissed."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Open <xliff:g id="APP">%s</xliff:g> application info."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starting <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No recent items"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"You\'ve cleared everything"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"screen pinning"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"search"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Clear all"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Drag here to use split screen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Split Horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Split Vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Split screen to the top"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Split screen to the left"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Split screen to the right"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-en-rIN/strings.xml b/packages/SystemUI/legacy/recents/res/values-en-rIN/strings.xml deleted file mode 100644 index af1d055d65d2..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-en-rIN/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dismiss <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dismissed."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"All recent applications dismissed."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Open <xliff:g id="APP">%s</xliff:g> application info."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starting <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No recent items"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"You\'ve cleared everything"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"screen pinning"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"search"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Clear all"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Drag here to use split screen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Split Horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Split Vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Split screen to the top"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Split screen to the left"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Split screen to the right"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-en-rXC/strings.xml b/packages/SystemUI/legacy/recents/res/values-en-rXC/strings.xml deleted file mode 100644 index ceb6b1330558..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-en-rXC/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dismiss <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dismissed."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"All recent applications dismissed."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Open <xliff:g id="APP">%s</xliff:g> application info."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starting <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No recent items"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"You\'ve cleared everything"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"screen pinning"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"search"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Clear all"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Drag here to use split screen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Split Horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Split Vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Split screen to the top"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Split screen to the left"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Split screen to the right"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-es-rUS/strings.xml b/packages/SystemUI/legacy/recents/res/values-es-rUS/strings.xml deleted file mode 100644 index f212b027a1ec..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Recientes"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Permite descartar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Se descartó <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Se descartaron todas las aplicaciones recientes."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Permite abrir la información de la aplicación de <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Iniciando <xliff:g id="APP">%s</xliff:g>"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No hay elementos recientes"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Todo borrado"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Información de la aplicación"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"Fijar pantalla"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"Buscar"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"No se pudo iniciar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> está inhabilitada en modo seguro."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Borrar todo"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arrastra hasta aquí para usar la pantalla dividida"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"División horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"División vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"División personalizada"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Dividir pantalla en la parte superior"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Dividir pantalla a la izquierda"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Dividir pantalla a la derecha"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-es/strings.xml b/packages/SystemUI/legacy/recents/res/values-es/strings.xml deleted file mode 100644 index 8bcfe84a6700..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-es/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Aplicaciones recientes."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Cerrar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Se ha ignorado la aplicación <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Se han ignorado todas las aplicaciones recientes."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Abre la información de la aplicación <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Iniciando la aplicación <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"No hay elementos recientes"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Has borrado todo"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Información de la aplicación"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"fijar pantalla"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"buscar"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"No se ha podido iniciar la aplicación <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"La aplicación <xliff:g id="APP">%s</xliff:g> se ha inhabilitado en modo seguro."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Borrar todo"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arrastra el elemento hasta aquí para utilizar la pantalla dividida"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"División horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"División vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"División personalizada"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Dividir la pantalla en la parte superior"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Dividir la pantalla a la izquierda"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Dividir la pantalla a la derecha"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-et/strings.xml b/packages/SystemUI/legacy/recents/res/values-et/strings.xml deleted file mode 100644 index c1903af60ec9..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-et/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Ülevaade."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Rakendusest <xliff:g id="APP">%s</xliff:g> loobumine."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Rakendusest <xliff:g id="APP">%s</xliff:g> on loobutud."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Kõikidest hiljutistest rakendustest on loobutud."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Rakenduse <xliff:g id="APP">%s</xliff:g> teabe avamine."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Rakenduse <xliff:g id="APP">%s</xliff:g> käivitamine."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Hiljutisi üksusi pole"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Olete kõik ära kustutanud"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Rakenduse teave"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ekraanikuva kinnitamine"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"otsi"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Rakendust <xliff:g id="APP">%s</xliff:g> ei saanud käivitada."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Rakendus <xliff:g id="APP">%s</xliff:g> on turvarežiimis keelatud."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Kustuta kõik"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Jagatud ekraani kasutamiseks lohistage siia"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Horisontaalne poolitamine"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Vertikaalne poolitamine"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Kohandatud poolitamine"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Poolita ekraan üles"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Poolita ekraan vasakule"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Poolita ekraan paremale"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-eu/strings.xml b/packages/SystemUI/legacy/recents/res/values-eu/strings.xml deleted file mode 100644 index 91e250f50411..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-eu/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Ikuspegi orokorra."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Baztertu <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Baztertu da <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Baztertu dira azken aplikazio guztiak."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Ireki <xliff:g id="APP">%s</xliff:g> aplikazioari buruzko informazioa."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> abiarazten."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Ez dago azkenaldi honetako ezer"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Dena garbitu duzu"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Aplikazioaren informazioa"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"pantaila-ainguratzea"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"bilatu"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Ezin izan da abiarazi <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> desgaituta dago modu seguruan."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Garbitu guztiak"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arrastatu hona pantaila zatitzeko"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Zatitze horizontala"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Zatitze bertikala"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Zatitze pertsonalizatua"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Zatitu pantaila eta ezarri goian"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Zatitu pantaila eta ezarri ezkerrean"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Zatitu pantaila eta ezarri eskuinean"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-fa/strings.xml b/packages/SystemUI/legacy/recents/res/values-fa/strings.xml deleted file mode 100644 index 61e87c113774..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-fa/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"نمای کلی."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"رد کردن <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> نادیده گرفته شد."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"همه برنامههای اخیر رد شدند."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"باز کردن اطلاعات برنامه <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> درحال شروع به کار است."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"بدون موارد اخیر"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"همهچیز را پاک کردهاید"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"اطلاعات برنامه"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"پین کردن صفحه"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"جستجو"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> شروع نشد."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> در حالت ایمن غیرفعال است."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"پاک کردن همه"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"برای استفاده از تقسیم صفحه، به اینجا بکشید"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"تقسیم افقی"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"تقسیم عمودی"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"سفارشی کردن تقسیم"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"تقسیم کردن صفحه به بالا"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"تقسیم کردن صفحه به چپ"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"تقسیم کردن صفحه به راست"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-fi/strings.xml b/packages/SystemUI/legacy/recents/res/values-fi/strings.xml deleted file mode 100644 index bf2e46112abc..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-fi/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Viimeisimmät"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Hylkää <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> hylättiin."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Kaikki viimeisimmät sovellukset on hylätty."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Avaa sovelluksen <xliff:g id="APP">%s</xliff:g> tiedot."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Käynnistetään <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Ei viimeaikaisia kohteita"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Kaikki on hoidettu"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Sovellustiedot"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"näytön kiinnitys"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"haku"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ei käynnistynyt."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> on poistettu käytöstä vikasietotilassa."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Poista kaikki"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Jaa näyttö vetämällä tähän."</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Vaakasuuntainen jako"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Pystysuuntainen jako"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Oma jako"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Jaa näyttö ylös"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Jaa näyttö vasemmalle"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Jaa näyttö oikealle"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-fr-rCA/strings.xml b/packages/SystemUI/legacy/recents/res/values-fr-rCA/strings.xml deleted file mode 100644 index e60727e38074..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-fr-rCA/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Aperçu"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Supprimer <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> supprimée."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Toutes les applications récentes ont été supprimées."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Ouvre les détails de l\'application <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Lancement de <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Aucun élément récent"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Vous avez tout effacé"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Détails de l\'application"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"épinglage d\'écran"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"rechercher"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Impossible de lancer <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> est désactivée en mode sans échec."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Tout effacer"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Glissez l\'élément ici pour utiliser l\'écran partagé"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Séparation horizontale"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Séparation verticale"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Séparation personnalisée"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Écran partagé dans le haut"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Écran partagé à la gauche"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Écran partagé à la droite"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-fr/strings.xml b/packages/SystemUI/legacy/recents/res/values-fr/strings.xml deleted file mode 100644 index 5b0d611c2588..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-fr/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Aperçu"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Supprimer l\'application <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Application <xliff:g id="APP">%s</xliff:g> supprimée."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Toutes les applications récentes ont été supprimées."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Ouvre les informations sur l\'application <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Lancement de l\'application <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Aucun élément récent"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Vous avez tout effacé"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informations sur l\'application"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"épinglage d\'écran"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"rechercher"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Impossible de lancer l\'application <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"L\'application <xliff:g id="APP">%s</xliff:g> est désactivée en mode sécurisé."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Tout fermer"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Faire glisser ici pour utiliser l\'écran partagé"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Séparation horizontale"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Séparation verticale"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Séparation personnalisée"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Partager l\'écran en haut"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Partager l\'écran sur la gauche"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Partager l\'écran sur la droite"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-gl/strings.xml b/packages/SystemUI/legacy/recents/res/values-gl/strings.xml deleted file mode 100644 index 008c7761c8e7..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-gl/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Visión xeral."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Rexeita <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Rexeitouse <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Rexeitáronse todas as aplicacións recentes."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Abre a información da aplicación <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Iniciando <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Non hai elementos recentes"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Borraches todo"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Información da aplicación"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"fixación de pantalla"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"buscar"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Non se puido iniciar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"A aplicación <xliff:g id="APP">%s</xliff:g> está desactivada no modo seguro."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Borrar todo"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arrastra aquí para usar a pantalla dividida"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Dividir horizontalmente"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Dividir verticalmente"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Dividir de xeito personalizado"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Dividir pantalla arriba"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Dividir pantalla á esquerda"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Dividir pantalla á dereita"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-gu/strings.xml b/packages/SystemUI/legacy/recents/res/values-gu/strings.xml deleted file mode 100644 index 33dc7e8c7ee0..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-gu/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"ઝલક."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> કાઢી નાખો."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> કાઢી નાખી."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"તાજેતરની બધી ઍપ્લિકેશનો કાઢી નાખવામાં આવી."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g>ની ઍપ્લિકેશન માહિતી ખોલો."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g>ને શરૂ કરી રહ્યાં છીએ."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"તાજેતરની કોઈ આઇટમ નથી"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"તમે બધું સાફ કર્યું"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ઍપ્લિકેશનની માહિતી"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"સ્ક્રીન પિનિંગ"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"શોધો"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>ને શરૂ કરી શકાઈ નથી."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"સુરક્ષિત મોડમાં <xliff:g id="APP">%s</xliff:g>ને બંધ કરવામાં આવી છે."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"બધું સાફ કરો"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"વિભાજિત સ્ક્રીનનો ઉપયોગ કરવા માટે અહીં ખેંચો"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"સ્ક્રીનને આડી વિભાજિત કરો"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"સ્ક્રીનને ઊભી વિભાજિત કરો"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"સ્ક્રીનને કસ્ટમ વિભાજિત કરો"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"સ્ક્રીનને ઉપરની તરફ વિભાજિત કરો"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"સ્ક્રીનને ડાબી તરફ વિભાજિત કરો"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"સ્ક્રીનને જમણી તરફ વિભાજિત કરો"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-hi/strings.xml b/packages/SystemUI/legacy/recents/res/values-hi/strings.xml deleted file mode 100644 index 3f19f3378348..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-hi/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"खास जानकारी."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> को खारिज करें."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> खारिज किया गया."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"हाल के सभी ऐप्लिकेशन खारिज कर दिए गए हैं."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ऐप्लिकेशन की जानकारी खोलें."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> शुरू किया जा रहा है."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"हाल का कोई आइटम नहीं है"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"आपने सब कुछ हटा दिया है"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ऐप्लिकेशन की जानकारी"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"स्क्रीन पिन करना"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"खोजें"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> शुरू नहीं किया जा सका."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> को सुरक्षित-मोड में बंद किया गया."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"सभी ऐप्लिकेशन बंद करें"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"स्क्रीन को दो हिस्सों में बाँटने (स्प्लिट स्क्रीन) के लिए यहां से खींचें और छोड़ें"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"क्षैतिज रूप से दो हिस्सों में बाँटें (स्प्लिट करें)"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"लम्बवत रूप से दो हिस्सों में बाँटें (स्प्लिट करें)"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"अपने मुताबिक दो हिस्सों में बाँटें (स्प्लिट स्क्रीन करें)"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"ऊपर की ओर दूसरी स्क्रीन बनाएं"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"बाईं ओर दूसरी स्क्रीन बनाएं"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"दाईं ओर दूसरी स्क्रीन बनाएं"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-hr/strings.xml b/packages/SystemUI/legacy/recents/res/values-hr/strings.xml deleted file mode 100644 index 88926a4f8c76..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-hr/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Pregled."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Odbacivanje aplikacije <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Odbačena je aplikacija <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Odbačene su sve nedavne aplikacije."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Otvaranje informacija o aplikaciji <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Pokreće se aplikacija <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nema nedavnih stavki"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Izbrisali ste sve"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informacije o aplikaciji"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"prikačivanje zaslona"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"pretraživanje"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Aplikacija <xliff:g id="APP">%s</xliff:g> nije pokrenuta."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplikacija <xliff:g id="APP">%s</xliff:g> onemogućena je u sigurnom načinu."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Izbriši sve"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Povucite ovdje da biste upotrebljavali podijeljeni zaslon"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Podijeli vodoravno"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Podijeli okomito"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Podijeli prilagođeno"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Podijeli zaslon na vrhu"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Podijeli zaslon slijeva"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Podijeli zaslon zdesna"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-hu/strings.xml b/packages/SystemUI/legacy/recents/res/values-hu/strings.xml deleted file mode 100644 index d0429e76fb40..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-hu/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Áttekintés."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"A(z) <xliff:g id="APP">%s</xliff:g> elvetése."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> eltávolítva."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Az összes alkalmazás eltávolítva a nemrég használtak közül."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"A(z) <xliff:g id="APP">%s</xliff:g> alkalmazás adatainak megnyitása."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"A(z) <xliff:g id="APP">%s</xliff:g> indítása."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nincsenek mostanában használt elemek"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Mindent törölt"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Az alkalmazás adatai"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"képernyő rögzítése"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"keresés"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Nem lehet elindítani a következőt: <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"A(z) <xliff:g id="APP">%s</xliff:g> csökkentett módban le van tiltva."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Összes törlése"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Húzza ide az osztott képernyő használatához"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Osztott vízszintes"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Osztott függőleges"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Osztott egyéni"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Osztott képernyő felülre"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Osztott képernyő balra"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Osztott képernyő jobbra"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-hy/strings.xml b/packages/SystemUI/legacy/recents/res/values-hy/strings.xml deleted file mode 100644 index c56b691ed126..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-hy/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Համատեսք:"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Հեռացնել <xliff:g id="APP">%s</xliff:g> հավելվածը ցուցակից:"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> հավելվածը հեռացվել է ցուցակից:"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Բոլոր վերջին հավելվածները հեռացվել են ցուցակից:"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Բացել <xliff:g id="APP">%s</xliff:g> հավելվածի մասին տեղեկությունները"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> հավելվածը գործարկվում է:"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Այստեղ դեռ ոչինչ չկա"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Ցուցակը դատարկ է"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Հավելվածի մասին"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"էկրանի ամրացում"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"որոնում"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Չհաջողվեց գործարկել <xliff:g id="APP">%s</xliff:g> հավելվածը:"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> հավելվածը անվտանգ ռեժիմում անջատված է:"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Ջնջել բոլորը"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Քաշեք այստեղ՝ էկրանի տրոհումն օգտագործելու համար"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Հորիզոնական տրոհում"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Ուղղահայաց տրոհում"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Հատուկ տրոհում"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Տրոհել էկրանը վերևից"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Տրոհել էկրանը ձախից"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Տրոհել էկրանն աջից"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-in/strings.xml b/packages/SystemUI/legacy/recents/res/values-in/strings.xml deleted file mode 100644 index aa9dcfe1b197..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-in/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Ringkasan."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Hapus <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dihapus."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Semua aplikasi yang baru dibuka telah dihapus."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Buka info aplikasi <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Memulai <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Tidak ada item yang baru dibuka"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Anda sudah menghapus semua"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Info Aplikasi"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"pin ke layar"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"telusuri"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Tidak dapat memulai <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> dinonaktifkan dalam mode aman."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Hapus semua"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Tarik ke sini untuk menggunakan layar terpisah"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Pisahkan Horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Pisahkan Vertikal"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Pisahkan Khusus"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Pisahkan layar ke atas"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Pisahkan layar ke kiri"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Pisahkan layar ke kanan"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-is/strings.xml b/packages/SystemUI/legacy/recents/res/values-is/strings.xml deleted file mode 100644 index e0a555e63976..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-is/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Yfirlit."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Fjarlægja <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> fjarlægt."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Öll nýleg forrit fjarlægð."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Opna forritsupplýsingar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Ræsir <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Engin nýleg atriði"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Þú hefur hreinsað allt"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Forritsupplýsingar"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"skjáfesting"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"leita"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Ekki var hægt að ræsa <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Slökkt er á <xliff:g id="APP">%s</xliff:g> í öruggri stillingu."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Hreinsa allt"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Dragðu hingað til að skipta skjánum"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Lárétt skipting"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Lóðrétt skipting"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Sérsniðin skipting"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Skipta skjá að ofanverðu"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Skipta skjá til vinstri"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Skipta skjá til hægri"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-it/strings.xml b/packages/SystemUI/legacy/recents/res/values-it/strings.xml deleted file mode 100644 index e04d56038ac1..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-it/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Panoramica."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Elimina <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> eliminata."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Tutte le applicazioni recenti sono state rimosse."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Mostra informazioni sull\'applicazione <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Avvio di <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nessun elemento recente"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Hai cancellato tutto"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informazioni sull\'applicazione"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"blocco su schermo"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"cerca"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Impossibile avviare <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"L\'app <xliff:g id="APP">%s</xliff:g> è stata disattivata in modalità provvisoria."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Cancella tutto"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Trascina qui per utilizzare la modalità Schermo diviso"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Divisione in orizzontale"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Divisione in verticale"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Divisione personalizzata"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Schermo diviso in alto"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Schermo diviso a sinistra"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Schermo diviso a destra"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-iw/strings.xml b/packages/SystemUI/legacy/recents/res/values-iw/strings.xml deleted file mode 100644 index a96c709b4be6..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-iw/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"סקירה כללית."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"הסרה של <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> הוסרה."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"כל האפליקציות האחרונות הוסרו."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"פתיחת מידע על האפליקציה <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"מפעיל את <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"אין פריטים אחרונים"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"מחקת הכול"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"מידע על האפליקציה"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"הקפאת מסך"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"חיפוש"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"לא ניתן היה להפעיל את <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> מושבתת במצב בטוח."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ניקוי הכול"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"יש לגרור לכאן כדי להשתמש במסך מפוצל"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"פיצול אופקי"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"פיצול אנכי"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"פיצול מותאם אישית"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"פיצול מסך למעלה"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"פיצול מסך לשמאל"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"פיצול מסך לימין"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ja/strings.xml b/packages/SystemUI/legacy/recents/res/values-ja/strings.xml deleted file mode 100644 index 4d7524c72300..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ja/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"最近"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g>を削除します。"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g>を削除しました。"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"最近のアプリをすべて削除しました。"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g>のアプリ情報を開きます。"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g>を開始しています。"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"最近のアイテムはありません"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"すべてのタスクを削除しました"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"アプリ情報"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"画面固定"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"検索"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>を開始できませんでした。"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g>はセーフモードでは無効になります。"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"すべて消去"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"分割画面を使用するにはここにドラッグします"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"横に分割"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"縦に分割"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"分割（カスタム）"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"画面を上に分割"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"画面を左に分割"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"画面を右に分割"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ka/strings.xml b/packages/SystemUI/legacy/recents/res/values-ka/strings.xml deleted file mode 100644 index 088388bfdc70..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ka/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"მიმოხილვა"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g>-ის დახურვა."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> დაიხურა."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"ყველა ბოლოდროინდელი აპლიკაცია დაიხურა."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> აპლიკაციის ინფორმაციის გახსნა."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"მიმდინარეობს <xliff:g id="APP">%s</xliff:g>-ის გაშვება."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ბოლოდროინდელი ერთეულები არ არის"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"ყველაფერი გასუფთავდა"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"აპლიკაციის ინფორმაცია"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ეკრანზე ჩამაგრება"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ძიება"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>-ის გაშვება ვერ მოხერხდა."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> გათიშულია უსაფრთხო რეჟიმში."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ყველას გასუფთავება"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"ეკრანის გასაყოფად ჩავლებით გადმოიტანეთ აქ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"ჰორიზონტალური გაყოფა"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ვერტიკალური გაყოფა"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"მორგებული გაყოფა"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"ეკრანის გაყოფა ზემოთ"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"ეკრანის გაყოფა მარცხნივ"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"ეკრანის გაყოფა მარჯვნივ"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-kk/strings.xml b/packages/SystemUI/legacy/recents/res/values-kk/strings.xml deleted file mode 100644 index 9d4e01c138ee..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-kk/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Жалпы ақпарат."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> қолданбасын өшіру."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> өшірілді."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Барлық қолданбалар \"Соңғылар\" тізімінен өшірілді."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> қолданбасы туралы ақпаратты ашу."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> іске қосылды."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Ешқандай соңғы элементтер жоқ"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Барлығын өшірдіңіз"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Қолданба туралы ақпарат"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"экранды бекіту"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"іздеу"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> іске қосылмады."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> қауіпсіз режимде өшіріледі."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Барлығын өшіру"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Экранды бөлу үшін осы жерге сүйреңіз"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Көлденеңінен бөлу"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Тігінен бөлу"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Бөлу (арнаулы)"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Экранды жоғары жағынан бөлу"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Экранды сол жағынан бөлу"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Экранды оң жағынан бөлу"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-km/strings.xml b/packages/SystemUI/legacy/recents/res/values-km/strings.xml deleted file mode 100644 index b7bfba67bbcf..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-km/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"ទិដ្ឋភាពរួម។"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"ច្រានចោល <xliff:g id="APP">%s</xliff:g> ។"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"បានច្រានចោល <xliff:g id="APP">%s</xliff:g> ។"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"បានច្រានចោលកម្មវិធីថ្មីៗទាំងអស់។"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"បើកព័ត៌មានកម្មវិធី <xliff:g id="APP">%s</xliff:g> ។"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"កំពុងចាប់ផ្ដើម <xliff:g id="APP">%s</xliff:g> ។"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"មិនមានធាតុថ្មីៗទេ"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"អ្នកបានសម្អាតអ្វីៗគ្រប់យ៉ាង"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ព័ត៌មានកម្មវិធី"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ការភ្ជាប់អេក្រង់"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ស្វែងរក"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"មិនអាចចាប់ផ្ដើម <xliff:g id="APP">%s</xliff:g> បានទេ។"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ត្រូវបានបិទដំណើរការក្នុងមុខងារសុវត្ថិភាព។"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"សម្អាតទាំងអស់"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"អូសនៅទីនេះដើម្បីប្រើអេក្រង់បំបែក"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"បំបែកផ្តេក"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"បំបែកបញ្ឈរ"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"បំបែកផ្ទាល់ខ្លួន"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"បំបែកអេក្រង់ទៅខាងលើ"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"បំបែកអេក្រង់ទៅខាងឆ្វេង"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"បំបែកអេក្រង់ទៅខាងស្តាំ"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-kn/strings.xml b/packages/SystemUI/legacy/recents/res/values-kn/strings.xml deleted file mode 100644 index 84894c12c7e8..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-kn/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"ಸಮಗ್ರ ನೋಟ."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> ವಜಾಗೊಳಿಸಿ."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ವಜಾಗೊಳಿಸಲಾಗಿದೆ."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"ಇತ್ತೀಚಿನ ಎಲ್ಲಾ ಆ್ಯಪ್ಗಳನ್ನು ವಜಾಗೊಳಿಸಲಾಗಿದೆ."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ಆ್ಯಪ್ ಮಾಹಿತಿ ತೆರೆಯಿರಿ."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಐಟಂಗಳಿಲ್ಲ"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"ನೀವು ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸಿರುವಿರಿ"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ಆ್ಯಪ್ ಮಾಹಿತಿ"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ಸ್ಕ್ರೀನ್ ಪಿನ್ನಿಂಗ್"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ಹುಡುಕಾಟ"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ಪ್ರಾರಂಭಿಸಲು ಸಾದ್ಯವಾಗಲಿಲ್ಲ."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ಅನ್ನು ಸುರಕ್ಷಿತ ಮೋಡ್ನಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸಿ"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"ವಿಭಜಿತ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಬಳಸಲು ಇಲ್ಲಿ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"ಅಡ್ಡಲಾಗಿ ವಿಭಜಿಸಿದ"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ಲಂಬವಾಗಿ ವಿಭಜಿಸಿದ"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"ಕಸ್ಟಮ್ ವಿಭಜಿಸಿದ"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"ಮೇಲ್ಭಾಗಕ್ಕೆ ಸ್ಕ್ರೀನ್ ಅನ್ನು ವಿಭಜಿಸಿ"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"ಎಡಕ್ಕೆ ಸ್ಕ್ರೀನ್ ಅನ್ನು ವಿಭಜಿಸಿ"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"ಬಲಕ್ಕೆ ಸ್ಕ್ರೀನ್ ಅನ್ನು ವಿಭಜಿಸಿ"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ko/strings.xml b/packages/SystemUI/legacy/recents/res/values-ko/strings.xml deleted file mode 100644 index ee856bd21418..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ko/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"최근 사용"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g>을(를) 닫습니다."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> 애플리케이션을 닫았습니다."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"최근 사용한 애플리케이션을 모두 닫았습니다."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> 애플리케이션 정보를 엽니다."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g>을(를) 시작하는 중입니다."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"최근 항목이 없습니다."</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"모든 항목을 삭제했습니다."</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"애플리케이션 정보"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"화면 고정"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"검색"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>을(를) 시작할 수 없습니다."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g>은(는) 안전 모드에서 사용 중지됩니다."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"모두 삭제"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"여기를 드래그하여 분할 화면 사용하기"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"수평 분할"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"수직 분할"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"맞춤 분할"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"위쪽으로 화면 분할"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"왼쪽으로 화면 분할"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"오른쪽으로 화면 분할"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ky/strings.xml b/packages/SystemUI/legacy/recents/res/values-ky/strings.xml deleted file mode 100644 index 879e492f6330..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ky/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Сереп салуу."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> колдонмосун өчүрүү."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> колдонмосу өчүрүлдү."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Акыркы колдонмолордун баары өчүрүлдү."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> колдонмосу жөнүндө маалыматты ачыңыз."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ачылууда."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Акыркы колдонмолор жок"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Баарын тазаладыңыз"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Колдонмо жөнүндө маалымат"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"экран кадоо"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"издөө"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> колдонмосу ачылган жок"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> коопсуз режиминде өчүрүлдү."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Баарын тазалоо"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Экранды бөлүү үчүн бул жерге сүйрөңүз"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Туурасынан бөлүү"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Тигинен бөлүү"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Ыңгайлаштырылган бөлүү"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Экранды өйдө жакка бөлүү"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Экранды сол жакка бөлүү"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Экранды оң жакка бөлүү"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-lo/strings.xml b/packages/SystemUI/legacy/recents/res/values-lo/strings.xml deleted file mode 100644 index 17f56b457ad7..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-lo/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"ພາບຮວມ."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"ປິດ <xliff:g id="APP">%s</xliff:g> ໄວ້."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"ປິດ <xliff:g id="APP">%s</xliff:g> ແລ້ວ."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"ທຸກແອັບພລິເຄຊັນບໍ່ດົນມານີ້ຖືກປິດໄວ້ແລ້ວ."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"ເປີດຂໍ້ມູນແອັບພລິເຄຊັນ <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"ກຳລັງເປີດ <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ບໍ່ມີລາຍການຫຼ້າສຸດ"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"ທ່ານລຶບລ້າງທຸກຢ່າງແລ້ວ"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ຂໍ້ມູນແອັບພລິເຄຊັນ"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ການປັກໝຸດໜ້າຈໍ"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ຊອກຫາ"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"ບໍ່ສາມາດເລີ່ມ <xliff:g id="APP">%s</xliff:g> ໄດ້."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ຖືກປິດໃຊ້ໃນໂໝດຄວາມມປອດໄພ."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ລຶບລ້າງທັງໝົດ"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"ລາກມາບ່ອນນີ້ເພື່ອໃຊ້ການແບ່ງໜ້າຈໍ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"ການແຍກລວງຂວາງ"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ການແຍກລວງຕັ້ງ"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"ການແຍກກຳນົດເອງ"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"ແຍກໜ້າຈໍໄປທາງເທິງ"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"ແຍກໜ້າຈໍໄປທາງຊ້າຍ"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"ແຍກໜ້າຈໍໄປທາງຂວາ"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-lt/strings.xml b/packages/SystemUI/legacy/recents/res/values-lt/strings.xml deleted file mode 100644 index 4a9eb83bf3d5..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-lt/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Apžvalga."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Atsisakyti programos „<xliff:g id="APP">%s</xliff:g>“."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Atsisakyta programos „<xliff:g id="APP">%s</xliff:g>“."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Atsisakyta visų naujausių programų."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Atidaryti programos „<xliff:g id="APP">%s</xliff:g>“ informaciją."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Paleidžiama programa „<xliff:g id="APP">%s</xliff:g>“."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nėra jokių naujausių elementų"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Viską išvalėte"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Programos informacija"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ekrano prisegimas"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ieškoti"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Nepavyko paleisti programos „<xliff:g id="APP">%s</xliff:g>“."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Programa „<xliff:g id="APP">%s</xliff:g>“ išjungta saugos režimu."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Išvalyti viską"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Vilkite čia, kad naudotumėte skaidytą ekraną"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Horizontalus skaidymas"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Vertikalus skaidymas"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Tinkintas skaidymas"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Skaidyti ekraną į viršų"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Skaidyti ekraną į kairę"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Skaidyti ekraną į dešinę"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-lv/strings.xml b/packages/SystemUI/legacy/recents/res/values-lv/strings.xml deleted file mode 100644 index 7d87e0033777..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-lv/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Pārskats."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Nerādīt lietotni <xliff:g id="APP">%s</xliff:g>"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Vairs netiek rādīta lietotne <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Vairs netiek rādīta neviena nesen izmantotā lietojumprogramma."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Atveriet lietojumprogrammas <xliff:g id="APP">%s</xliff:g> informāciju."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Notiek lietotnes <xliff:g id="APP">%s</xliff:g> palaišana."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nav nesenu vienumu"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Visi uzdevumi ir notīrīti"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Lietojumprogrammas informācija"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"Piespraust ekrānu"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"Meklēt"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Nevarēja palaist lietotni <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Lietotne <xliff:g id="APP">%s</xliff:g> ir atspējota drošajā režīmā."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Notīrīt visu"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Velciet šeit, lai izmantotu ekrāna sadalīšanu"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Horizontāls dalījums"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Vertikāls dalījums"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Pielāgots dalījums"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Sadalīt ekrānu augšdaļā"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Sadalīt ekrānu kreisajā pusē"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Sadalīt ekrānu labajā pusē"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-mk/strings.xml b/packages/SystemUI/legacy/recents/res/values-mk/strings.xml deleted file mode 100644 index d8ced0b55310..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-mk/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Преглед."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Отфрлете ја <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> е отфрлена."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Сите неодамнешни апликации се отфрлени."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Отворете информации за апликацијата <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Се стартува <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Нема неодамнешни ставки"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Избришавте сѐ"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Информации за апликацијата"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"прикачување екран"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"пребарувај"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> не можеше да се стартува."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> е оневозможена во безбеден режим."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Избриши сѐ"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Повлечете тука за да користите поделен екран"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Подели хоризонтално"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Подели вертикално"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Подели приспособено"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Подели го екранот во горниот дел"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Подели го екранот на левата страна"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Подели го екранот на десната страна"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ml/strings.xml b/packages/SystemUI/legacy/recents/res/values-ml/strings.xml deleted file mode 100644 index 6dd797e450e9..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ml/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"അവലോകനം."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> ഡിസ്മിസ് ചെയ്യുക."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ഡിസ്മിസ് ചെയ്തു."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"അടുത്തിടെയുള്ള എല്ലാ ആപ്പുകളും ഡിസ്മിസ് ചെയ്തു."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ആപ്പ് വിവരങ്ങൾ തുറക്കുക."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ആരംഭിക്കുന്നു."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"സമീപകാല ഇനങ്ങൾ ഒന്നുമില്ല"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"നിങ്ങൾ എല്ലാം മായ്ച്ചിരിക്കുന്നു"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ആപ്പ് വിവരങ്ങൾ"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"സ്ക്രീൻ പിൻ ചെയ്യൽ"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"തിരയുക"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ആരംഭിക്കാനായില്ല"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"സുരക്ഷിത മോഡിൽ <xliff:g id="APP">%s</xliff:g> പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"എല്ലാം മായ്ക്കുക"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"സ്പ്ലിറ്റ് സ്ക്രീൻ ഉപയോഗിക്കാൻ, ഇവിടെ വലിച്ചിടുക"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"തിരശ്ചീനമായി സ്പ്ലിറ്റ് ചെയ്യുക"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ലംബമായി സ്പ്ലിറ്റ് ചെയ്യുക"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"ഇഷ്ടാനുസൃതമായി സ്പ്ലിറ്റ് ചെയ്യുക"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"സ്ക്രീൻ മുകളിലോട്ട് സ്പ്ലിറ്റ് ചെയ്യുക"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"സ്ക്രീൻ ഇടത്തോട്ട് സ്പ്ലിറ്റ് ചെയ്യുക"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"സ്ക്രീൻ വലത്തോട്ട് സ്പ്ലിറ്റ് ചെയ്യുക"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-mn/strings.xml b/packages/SystemUI/legacy/recents/res/values-mn/strings.xml deleted file mode 100644 index 205f56c233d0..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-mn/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Тойм."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g>-г үл хэрэгсэнэ үү."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g>-г үл хэрэгссэн."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Саяхны бүх аппыг үл хэрэгссэн."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> аппын мэдээллийг нээнэ үү."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g>-г эхлүүлж байна."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Саяхны зүйлс алга"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Та бүгдийг нь устгасан"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Аппын мэдээлэл"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"дэлгэц тогтоох"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"хайх"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>-г эхлүүлж чадсангүй."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g>-г аюулгүй горимд идэвхгүй болгосон."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Бүгдийг устгах"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Хуваасан дэлгэцийг ашиглахын тулд энд чирэх"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Хэвтээ чиглэлд хуваах"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Босоо чиглэлд хуваах"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Хүссэн хэлбэрээр хуваах"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Дэлгэцийг дээд хэсэгт хуваах"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Дэлгэцийг зүүн хэсэгт хуваах"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Дэлгэцийг баруун хэсэгт хуваах"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-mr/strings.xml b/packages/SystemUI/legacy/recents/res/values-mr/strings.xml deleted file mode 100644 index 51bce6d41422..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-mr/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"अवलोकन."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> डिसमिस करा."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> डिसमिस केले"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"अलीकडील सर्व अॅप्लिकेशन डिसमिस झाले."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> अॅप्लिकेशन माहिती उघडा."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> सुरू करत आहे."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"कोणतेही अलीकडील आयटम नाहीत"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"तुम्ही सर्वकाही साफ केले"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"अॅप्लिकेशन माहिती"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"स्क्रीन पिन करणे"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"शोधा"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> सुरू करता आले नाही."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> सुरक्षित मोडमध्ये बंद केले आहे."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"सर्व साफ करा"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"स्प्लिट स्क्रीन वापर करण्यासाठी येथे ड्रॅग करा"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"आडवे स्प्लिट करा"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"उभे स्प्लिट करा"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"कस्टम स्प्लिट करा"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"स्क्रीन वर स्प्लिट करा"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"स्क्रीन डावीकडे स्प्लिट करा"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"स्क्रीन उजवीकडे स्प्लिट करा"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ms/strings.xml b/packages/SystemUI/legacy/recents/res/values-ms/strings.xml deleted file mode 100644 index ae4461d19b78..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ms/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Ikhtisar."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Ketepikan <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> diketepikan."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Semua aplikasi terbaharu diketepikan."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Buka maklumat aplikasi <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Memulakan <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Tiada item terbaharu"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Anda telah mengetepikan semua item"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Maklumat Aplikasi"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"penyematan skrin"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"cari"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Tidak dapat memulakan <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> dilumpuhkan dalam mod selamat."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Kosongkan semua"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Seret ke sini untuk menggunakan skrin pisah"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Pisah Mendatar"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Pisah Menegak"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Pisah Tersuai"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Pisahkan skrin ke atas"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Pisahkan skrin ke kiri"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Pisahkan skrin ke kanan"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-my/strings.xml b/packages/SystemUI/legacy/recents/res/values-my/strings.xml deleted file mode 100644 index 7b5870e1c123..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-my/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"အနှစ်ချုပ်။"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> ကို ပယ်မည်။"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ကို ဖယ်ထုတ်ထားသည်။"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"လတ်တလော အပလီကေးရှင်းအားလုံး ဖယ်ထုတ်ထားသည်။"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> အပလီကေးရှင်း အချက်အလက်ကို ဖွင့်မည်။"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ကို စတင်နေသည်။"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"လတ်တလော ဖွင့်ထားသည်များ မရှိပါ"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"အားလုံးကို ဖယ်ရှားပြီးပါပြီ"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"အပလီကေးရှင်း အချက်အလက်"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"မျက်နှာပြင် ပင်ထိုးမှု"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ရှာရန်"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ကို စတင်၍ မရပါ။"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"အန္တရာယ်ကင်းမှု စနစ်တွင် <xliff:g id="APP">%s</xliff:g> ကို ပိတ်ထားပါသည်။"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"အားလုံး ဖယ်ရှားရန်"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းကို အသုံးပြုရန် ဤနေရာသို့ ဖိဆွဲပါ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"အလျားလိုက် ခွဲရန်"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ဒေါင်လိုက် ခွဲရန်"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"စိတ်ကြိုက် ခွဲရန်"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"မျက်နှာပြင်ကို အပေါ်သို့ ခွဲရန်"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"မျက်နှာပြင်ကို ဘယ်ဘက်သို့ ခွဲရန်"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"မျက်နှာပြင်ကို ညာဘက်သို့ ခွဲရန်"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-nb/strings.xml b/packages/SystemUI/legacy/recents/res/values-nb/strings.xml deleted file mode 100644 index 176986ab5132..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-nb/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Oversikt."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Avvis <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> er avvist."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Alle nylig brukte apper er avvist."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Åpne appinformasjonen for <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starter <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Ingen nylige elementer"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Du har fjernet alt"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Appinformasjon"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"én-appsmodus"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"søk"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Kunne ikke starte <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> er slått av i sikker modus."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Fjern alt"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Dra hit for å bruke delt skjerm"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Del horisontalt"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Del vertikalt"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Del tilpasset"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Delt skjerm øverst"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Delt skjerm til venstre"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Delt skjerm til høyre"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ne/strings.xml b/packages/SystemUI/legacy/recents/res/values-ne/strings.xml deleted file mode 100644 index 011383337348..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ne/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"परिदृश्य।"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> खारेज गर्नुहोस्।"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> खारेज गरिएको छ।"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"हालका सबै अनुप्रयोगहरू खारेज गरियो।"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> अनुप्रयोग सम्बन्धी जानकारी खोल्नुहोस्।"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> सुरु गर्दै।"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"हालसालैको कुनै पनि वस्तु छैन"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"तपाईंले सबै कुरा खाली गर्नुभएको छ"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"अनुप्रयोगको जानकारी"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"स्क्रिन पिनिसङ"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"खोज्नुहोस्"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> सुरु गर्न सकिएन।"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> लाई सुरक्षित मोडमा असक्षम पारिएको छ।"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"सबै हटाउनुहोस्"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"विभाजित स्क्रिनको प्रयोग गर्न यहाँ तान्नुहोस्"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"तेर्सो रूपमा विभाजन गर्नुहोस्"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ठाडो रूपमा विभाजन गर्नुहोस्"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"आफू अनुकूल विभाजन गर्नुहोस्"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"विभाजित स्क्रिन शीर्ष स्थानमा राख्नुहोस्"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"विभाजित स्क्रिन बायाँतर्फ राख्नुहोस्"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"विभाजित स्क्रिन दायाँतर्फ राख्नुहोस्"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-nl/strings.xml b/packages/SystemUI/legacy/recents/res/values-nl/strings.xml deleted file mode 100644 index 97140229319a..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-nl/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overzicht."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> sluiten."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> verwijderd."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Alle recente apps gesloten."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"App-gegevens voor <xliff:g id="APP">%s</xliff:g> openen."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> starten."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Geen recente items"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Je hebt alles gewist"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"App-informatie"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"scherm vastzetten"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"zoeken"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Kan <xliff:g id="APP">%s</xliff:g> niet starten."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is uitgeschakeld in de veilige modus"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Alles wissen"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Sleep hier naartoe om het scherm te splitsen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Horizontaal splitsen"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Verticaal splitsen"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Aangepast splitsen"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Scherm bovenaan gesplitst"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Scherm links gesplitst"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Scherm rechts gesplitst"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-or/strings.xml b/packages/SystemUI/legacy/recents/res/values-or/strings.xml deleted file mode 100644 index 7ffcc94194a7..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-or/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"ସଂକ୍ଷିପ୍ତ ବିବରଣୀ"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> ଖାରଜ।"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ଖାରଜ କରିଦିଆଗଲା।"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"ସମସ୍ତ ସମ୍ପ୍ରତି ଆପ୍ଲିକେସନ୍ଗୁଡ଼ିକ ଖାରଜ କରାଯାଇଛି।"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ଆପ୍ଲିକେସନ୍ ସୂଚନା ଖୋଲନ୍ତୁ।"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ଆରମ୍ଭ ହେଉଛି।"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"କୌଣସି ସାମ୍ପ୍ରତିକ ଆଇଟମ୍ ନାହିଁ"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"ଆପଣ ସୁବୁକିଛି ଖାଲି କରିଦେଇଛନ୍ତି"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ଆପ୍ଲିକେସନ୍ ସୂଚନା"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ସ୍କ୍ରିନ୍ ଲକ୍"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ଖୋଜନ୍ତୁ"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> କୁ ଆରମ୍ଭ କରାଯାଇପାରିଲା ନାହିଁ।"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ସୁରକ୍ଷିତ-ମୋଡ୍ରେ ଅକ୍ଷମ ଅଟେ।"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ସବୁ ଖାଲି କରନ୍ତୁ"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"ସ୍ପ୍ଲିଟ୍ ସ୍କ୍ରିନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ଏଠାକୁ ଡ୍ରାଗ୍ କରନ୍ତୁ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"ଭୂସମାନ୍ତରଭାବରେ ଭାଗ କରନ୍ତୁ"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ଭୂଲମ୍ବଭାବରେ ଭାଗ କରନ୍ତୁ"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"କଷ୍ଟମ୍ କରି ଭାଗ କରନ୍ତୁ"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"ସ୍କ୍ରିନ୍କୁ ଉପର ଆଡ଼କୁ ଭାଗ କରନ୍ତୁ"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"ସ୍କ୍ରିନ୍କୁ ବାମ ଆଡ଼କୁ ଭାଗ କରନ୍ତୁ"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"ସ୍କ୍ରିନ୍କୁ ଡାହାଣ ଆଡ଼କୁ ଭାଗ କରନ୍ତୁ"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-pa/strings.xml b/packages/SystemUI/legacy/recents/res/values-pa/strings.xml deleted file mode 100644 index 4608561fa1ce..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-pa/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"ਰੂਪ-ਰੇਖਾ।"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਖਾਰਜ ਕਰੋ।"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ਖਾਰਜ ਕੀਤੀ ਗਈ।"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"ਸਾਰੀਆਂ ਹਾਲੀਆ ਐਪਲੀਕੇਸ਼ਨਾਂ ਖਾਰਜ ਕੀਤੀਆਂ ਗਈਆਂ।"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ਐਪਲੀਕੇਸ਼ਨਾਂ ਜਾਣਕਾਰੀ ਖੋਲ੍ਹੋ।"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ਕੋਈ ਹਾਲੀਆ ਆਈਟਮਾਂ ਨਹੀਂ"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"ਤੁਸੀਂ ਸਭ ਕੁਝ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਹੈ"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ਐਪਲੀਕੇਸ਼ਨ ਜਾਣਕਾਰੀ"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ਖੋਜ"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕਰ ਸਕੇ।"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ-ਮੋਡ ਵਿੱਚ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ।"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ਸਭ ਕਲੀਅਰ ਕਰੋ"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਇੱਥੇ ਘਸੀਟੋ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"ਲੇਟਵੀਂ ਵੰਡ"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"ਖੜ੍ਹਵੀਂ ਵੰਡ"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"ਵਿਉਂਤੀ ਵੰਡ"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"ਸਕ੍ਰੀਨ ਨੂੰ ਉੱਪਰ ਵੱਲ ਵੰਡੋ"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"ਸਕ੍ਰੀਨ ਨੂੰ ਖੱਬੇ ਪਾਸੇ ਵੰਡੋ"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"ਸਕ੍ਰੀਨ ਨੂੰ ਸੱਜੇ ਪਾਸੇ ਵੰਡੋ"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-pl/strings.xml b/packages/SystemUI/legacy/recents/res/values-pl/strings.xml deleted file mode 100644 index 50b4ad009490..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-pl/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Przegląd."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Zamknij aplikację <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Aplikacja <xliff:g id="APP">%s</xliff:g> została zamknięta."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Wszystkie ostatnie aplikacje zostały zamknięte."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Otwórz informacje o aplikacji <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Uruchamiam aplikację <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Brak ostatnich elementów"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Wszystko zostało wyczyszczone"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informacje o aplikacji"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"przypinanie ekranu"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"szukaj"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Nie udało się uruchomić aplikacji <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplikacja <xliff:g id="APP">%s</xliff:g> została wyłączona w trybie bezpiecznym."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Wyczyść wszystko"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Przeciągnij tutaj, by podzielić ekran"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Podziel poziomo"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Podziel pionowo"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Podziel niestandardowo"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Podziel ekran u góry"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Podziel ekran z lewej"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Podziel ekran z prawej"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-pt-rBR/strings.xml b/packages/SystemUI/legacy/recents/res/values-pt-rBR/strings.xml deleted file mode 100644 index b557ad2db67e..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Visão geral."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dispensar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dispensado."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Todos os aplicativos recentes foram dispensados."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Abre informações do aplicativo <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Iniciando <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nenhum item recente"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Você limpou tudo"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informações do aplicativo"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"Fixar tela"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"pesquisar"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Não foi possível iniciar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"O app <xliff:g id="APP">%s</xliff:g> fica desativado no modo de segurança."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Limpar tudo"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arraste aqui para usar a tela dividida"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Divisão horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Divisão vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Divisão personalizada"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Dividir a tela para a parte superior"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Dividir a tela para a esquerda"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Dividir a tela para a direita"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-pt-rPT/strings.xml b/packages/SystemUI/legacy/recents/res/values-pt-rPT/strings.xml deleted file mode 100644 index e62e1c62034a..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Vista geral."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Ignorar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Aplicação <xliff:g id="APP">%s</xliff:g> ignorada."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Todas as aplicações recentes foram ignoradas."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Abrir as informações da aplicação <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"A iniciar a aplicação <xliff:g id="APP">%s</xliff:g>…"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nenhum item recente"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Limpou tudo"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informações da aplicação"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"afixação no ecrã"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"pesquisar"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Não foi possível iniciar a aplicação <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"A aplicação <xliff:g id="APP">%s</xliff:g> está desativada no modo de segurança."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Limpar tudo"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arraste aqui para utilizar o ecrã dividido"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Divisão horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Divisão vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Divisão personalizada"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Ecrã dividido na parte superior"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Ecrã dividido à esquerda"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Ecrã dividido à direita"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-pt/strings.xml b/packages/SystemUI/legacy/recents/res/values-pt/strings.xml deleted file mode 100644 index b557ad2db67e..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-pt/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Visão geral."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dispensar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dispensado."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Todos os aplicativos recentes foram dispensados."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Abre informações do aplicativo <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Iniciando <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nenhum item recente"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Você limpou tudo"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informações do aplicativo"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"Fixar tela"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"pesquisar"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Não foi possível iniciar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"O app <xliff:g id="APP">%s</xliff:g> fica desativado no modo de segurança."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Limpar tudo"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Arraste aqui para usar a tela dividida"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Divisão horizontal"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Divisão vertical"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Divisão personalizada"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Dividir a tela para a parte superior"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Dividir a tela para a esquerda"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Dividir a tela para a direita"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ro/strings.xml b/packages/SystemUI/legacy/recents/res/values-ro/strings.xml deleted file mode 100644 index 7f8f018be6bc..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ro/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Recente."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Închideți <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> a fost închisă."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Toate aplicațiile recente au fost închise."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Deschideți informațiile despre aplicația <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Se inițiază <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Niciun element recent"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Ați șters tot"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informații despre aplicație"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"fixare pe ecran"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"căutați"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> nu a putut porni."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplicația <xliff:g id="APP">%s</xliff:g> este dezactivată în modul sigur."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Ștergeți tot"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Trageți aici pentru a folosi ecranul împărțit"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Împărțiți pe orizontală"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Împărțiți pe verticală"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Împărțiți personalizat"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Împărțiți ecranul în partea de sus"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Împărțiți ecranul la stânga"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Împărțiți ecranul la dreapta"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ru/strings.xml b/packages/SystemUI/legacy/recents/res/values-ru/strings.xml deleted file mode 100644 index 1e988bb21502..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ru/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Обзор."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Удалить приложение <xliff:g id="APP">%s</xliff:g> из списка."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Приложение <xliff:g id="APP">%s</xliff:g> удалено из списка."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Все недавние приложения удалены из списка."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Открыть информацию о приложении <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Запуск приложения <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Здесь пока ничего нет."</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Список пуст."</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Сведения о приложении"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"блокировка в приложении"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"поиск"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Не удалось запустить приложение \"<xliff:g id="APP">%s</xliff:g>\"."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Приложение \"<xliff:g id="APP">%s</xliff:g>\" отключено в безопасном режиме."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Удалить все"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Перетащите сюда, чтобы разделить экран"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Разделить по горизонтали"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Разделить по вертикали"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Разделить по-другому"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Разделить экран по верхнему краю"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Разделить экран по левому краю"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Разделить экран по правому краю"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-si/strings.xml b/packages/SystemUI/legacy/recents/res/values-si/strings.xml deleted file mode 100644 index cae835740254..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-si/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"දළ විශ්ලේෂණය."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> ඉවත ලන්න."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ඉවත දමා ඇත."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"සියලුම මෑත යෙඳුම් ඉවත ලන ලදී."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> යෙදුම් තොරතුරු විවෘත කරයි."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ආරම්භ කරමින්."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"මෑත අයිතම නැත"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"ඔබ සියලු දේ හිස් කර ඇත"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"යෙදුම් තොරතුරු"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"තිර ඇමිණීම"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"සෙවීම"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ආරම්භ කළ නොහැකි විය."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ආරක්ෂිත ප්රකාරය තුළ අබලයි."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"සියල්ල හිස් කරන්න"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"බෙදුම් තිරය භාවිත කිරීමට මෙතැනට අදින්න"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"තිරස්ව වෙන් කරන්න"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"සිරස්ව වෙන් කරන්න"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"අභිමත ලෙස වෙන් කරන්න"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"තිරය ඉහළට බෙදන්න"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"තිරය වමට බෙදන්න"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"තිරය දකුණට බෙදන්න"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-sk/strings.xml b/packages/SystemUI/legacy/recents/res/values-sk/strings.xml deleted file mode 100644 index 9c3a8570d75e..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-sk/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Prehľad"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Zavrieť aplikáciu <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Aplikácia <xliff:g id="APP">%s</xliff:g> bola zrušená."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Všetky nedávne aplikácie boli zrušené."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Otvoriť informácie o aplikácii <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Spúšťa sa aplikácia <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Žiadne nedávne položky"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Vymazali ste všetko"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informácie o aplikácii"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"pripnutie obrazovky"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"hľadať"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Aplikáciu <xliff:g id="APP">%s</xliff:g> sa nepodarilo spustiť."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplikácia <xliff:g id="APP">%s</xliff:g> je v núdzovom režime zakázaná."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Vymazať všetko"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Presuňte okno sem a použite tak rozdelenú obrazovku"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Rozdeliť vodorovné"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Rozdeliť zvislé"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Rozdeliť vlastné"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Rozdelená obrazovka hore"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Rozdelená obrazovka naľavo"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Rozdelená obrazovka napravo"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-sl/strings.xml b/packages/SystemUI/legacy/recents/res/values-sl/strings.xml deleted file mode 100644 index 56b2ddb63314..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-sl/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Pregled."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Opustitev aplikacije <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Aplikacija <xliff:g id="APP">%s</xliff:g> je bila odstranjena."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Vse nedavne aplikacije so bile opuščene."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Odpiranje podatkov o aplikaciji <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Zaganjanje aplikacije <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Ni nedavnih elementov"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Vse ste počistili"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Podatki o aplikaciji"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"pripenjanje zaslona"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"išči"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Aplikacije <xliff:g id="APP">%s</xliff:g> ni bilo mogoče zagnati."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Aplikacija <xliff:g id="APP">%s</xliff:g> je v varnem načinu onemogočena."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Počisti vse"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Povlecite sem za razdeljeni zaslon"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Razdeli vodoravno"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Razdeli navpično"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Razdeli po meri"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Razdeljen zaslon na vrhu"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Razdeljen zaslon na levi"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Razdeljen zaslon na desni"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-sq/strings.xml b/packages/SystemUI/legacy/recents/res/values-sq/strings.xml deleted file mode 100644 index 48aab371087c..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-sq/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Përmbledhja."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Largo <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> është hequr."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Të gjitha aplikacionet e fundit u larguan."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Hap informacionin e aplikacionit <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Po nis <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Nuk ka asnjë artikull të fundit"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"I ke pastruar të gjitha"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Informacioni i aplikacionit"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"kyçja e ekranit"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"kërko"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> nuk mund të nisej."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> është i çaktivizuar në modalitetin e sigurt."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Pastroji të gjitha"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Zvarrit këtu për të përdorur ekranin e ndarë"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Horizontal i ndarë"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Vertikal i ndarë"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"I personalizuar i ndarë"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Ndaje ekranin lart"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Ndaje ekranin në të majtë"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Ndaje ekranin në të djathtë"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-sr/strings.xml b/packages/SystemUI/legacy/recents/res/values-sr/strings.xml deleted file mode 100644 index 9d5f126181bd..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-sr/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Преглед."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Одбаците апликацију <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Апликација <xliff:g id="APP">%s</xliff:g> је одбачена."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Све недавно коришћене апликације су одбачене."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Отворите информације о апликацији <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Покреће се <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Нема недавних ставки"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Обрисали сте све"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Информације о апликацији"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"качење екрана"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"претражи"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Покретање апликације <xliff:g id="APP">%s</xliff:g> није успело."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Апликација <xliff:g id="APP">%s</xliff:g> је онемогућена у безбедном режиму."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Обриши све"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Превуците овде да бисте користили раздељени екран"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Подели хоризонтално"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Подели вертикално"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Подели прилагођено"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Подели екран нагоре"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Подели екран налево"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Подели екран надесно"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-sv/strings.xml b/packages/SystemUI/legacy/recents/res/values-sv/strings.xml deleted file mode 100644 index b2ee34fbd284..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-sv/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Översikt."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Ta bort <xliff:g id="APP">%s</xliff:g> från listan."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> togs bort från listan."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Alla appar har tagits bort från listan Senaste."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Öppna appinformation för <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Startar <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Listan är tom"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Du har tömt listan"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Appinformation"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"fästa skärmen"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"sök"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Det gick inte att starta appen <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> är inaktiverad i säkert läge."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Rensa alla"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Dra hit för att dela upp skärmen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Dela vågrätt"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Dela lodrätt"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Dela anpassat"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Delad skärm till överkanten"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Delad skärm åt vänster"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Delad skärm åt höger"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-sw/strings.xml b/packages/SystemUI/legacy/recents/res/values-sw/strings.xml deleted file mode 100644 index 49e7fb80e435..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-sw/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Muhtasari."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Ondoa <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> imeondolewa."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Programu za hivi majuzi zimeondolewa."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Fungua maelezo kuhusu programu ya <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Inaanzisha <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Hakuna vipengee vya hivi majuzi"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Umeondoa vipengee vyote"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Maelezo ya Programu"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"kubandika kwenye skirini"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"tafuta"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Imeshindwa kuanzisha <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> imezimwa katika hali salama."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Ondoa zote"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Buruta hapa ili utumie skrini iliyogawanywa"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Gawanya Mlalo"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Gawanya Wima"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Maalum Iliyogawanywa"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Gawa skrini kuelekea juu"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Gawa skrini upande wa kushoto"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Gawa skrini upande wa kulia"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-sw600dp/dimens.xml b/packages/SystemUI/legacy/recents/res/values-sw600dp/dimens.xml deleted file mode 100644 index 20d6670cb5b9..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-sw600dp/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright (c) 2012, 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> - <!-- The offsets the tasks animate from when recents is launched while docking --> - <dimen name="recents_task_stack_animation_launched_while_docking_offset">192dp</dimen> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ta/strings.xml b/packages/SystemUI/legacy/recents/res/values-ta/strings.xml deleted file mode 100644 index 91643fd01bdf..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ta/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"மேலோட்டப் பார்வை."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> ஆப்ஸை அகற்றும்."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> அகற்றப்பட்டது."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"அனைத்துச் சமீபத்திய ஆப்ஸும் அகற்றப்பட்டன."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ஆப்ஸ் பற்றிய தகவலைத் திறக்கும்."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ஆப்ஸைத் தொடங்குகிறது."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"சமீபத்தியவை எதுவுமில்லை"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"அனைத்தையும் அழித்துவிட்டீர்கள்"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ஆப்ஸ் பற்றிய தகவல்"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"திரையைப் பின் செய்"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"தேடு"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ஆப்ஸைத் தொடங்க இயலவில்லை."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"பாதுகாப்புப் பயன்முறையில் <xliff:g id="APP">%s</xliff:g> முடக்கப்பட்டது."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"அனைத்தையும் அழி"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"\'திரைப் பிரிப்பைப்\' பயன்படுத்த இங்கே இழுக்கவும்"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"கிடைமட்டமாகப் பிரி"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"செங்குத்தாகப் பிரி"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"தனிப்பயன் விருப்பத்தில் பிரி"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"திரையை மேற்புறமாகப் பிரிக்கும்"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"திரையை இடப்புறமாகப் பிரிக்கும்"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"திரையை வலப்புறமாகப் பிரிக்கும்"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-te/strings.xml b/packages/SystemUI/legacy/recents/res/values-te/strings.xml deleted file mode 100644 index ea4e638aa68c..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-te/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"అవలోకనం."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g>ని తీసివేయండి."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> తీసివేయబడింది."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"అన్ని ఇటీవలి యాప్లు తీసివేయబడ్డాయి."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> యాప్ సమాచారాన్ని తెరుస్తుంది."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g>ని ప్రారంభిస్తోంది."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ఇటీవలి అంశాలు ఏవీ లేవు"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"మీరు అన్నింటినీ తీసివేసారు"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"యాప్ సమాచారం"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"స్క్రీన్కు పిన్ చేయడం"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"వెతుకు"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g>ని ప్రారంభించడం సాధ్యపడలేదు."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> సురక్షిత-మోడ్లో నిలిపివేయబడింది."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"అన్నీ తీసివేయి"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"విభజన స్క్రీన్ను ఉపయోగించడానికి ఇక్కడ లాగండి"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"అడ్డంగా విభజించు"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"నిలువుగా విభజించు"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"అనుకూలంగా విభజించు"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"స్క్రీన్ని ఎగువకు విభజించు"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"స్క్రీన్ని ఎడమ వైపుకి విభజించు"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"స్క్రీన్ని కుడి వైపుకి విభజించు"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-th/strings.xml b/packages/SystemUI/legacy/recents/res/values-th/strings.xml deleted file mode 100644 index b88d05eddace..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-th/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"ภาพรวม"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"ยกเลิก <xliff:g id="APP">%s</xliff:g>"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> ถูกนำออกไปแล้ว"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"ปิดแอปพลิเคชันล่าสุดทั้งหมดแล้ว"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"เปิดข้อมูลแอปพลิเคชัน <xliff:g id="APP">%s</xliff:g>"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"กำลังเริ่มต้น <xliff:g id="APP">%s</xliff:g>"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"ไม่มีรายการล่าสุด"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"คุณได้ล้างทุกอย่างแล้ว"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ข้อมูลแอปพลิเคชัน"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"การตรึงหน้าจอ"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ค้นหา"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"เริ่มใช้ <xliff:g id="APP">%s</xliff:g> ไม่ได้"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> ปิดใช้ในโหมดปลอดภัย"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"ล้างทั้งหมด"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"ลากมาที่นี่เพื่อใช้การแยกหน้าจอ"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"แยกในแนวนอน"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"แยกในแนวตั้ง"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"แยกแบบกำหนดเอง"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"แยกหน้าจอไปด้านบน"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"แยกหน้าจอไปทางซ้าย"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"แยกหน้าจอไปทางขวา"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-tl/strings.xml b/packages/SystemUI/legacy/recents/res/values-tl/strings.xml deleted file mode 100644 index d940d4e5663b..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-tl/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"I-dismiss ang <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Na-dismiss ang <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Na-dismiss ang lahat ng kamakailang application."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Buksan ang impormasyon ng <xliff:g id="APP">%s</xliff:g> application."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Sinisimulan ang <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Walang kamakailang item"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Na-clear mo ang lahat"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Impormasyon ng Application"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"pag-pin sa screen"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"hanapin"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Hindi masimulan ang <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Naka-disable ang <xliff:g id="APP">%s</xliff:g> sa safe-mode."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"I-clear lahat"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"I-drag dito para magamit ang split screen"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"I-split Pahalang"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"I-split Patayo"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"I-split ang screen pataas"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"I-split ang screen pakaliwa"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"I-split ang screen pakanan"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-tr/strings.xml b/packages/SystemUI/legacy/recents/res/values-tr/strings.xml deleted file mode 100644 index 982c57ef79ac..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-tr/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Genel Bakış."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> uygulamasını kapatır."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> kaldırıldı."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Tüm son uygulamalar kapatıldı."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> uygulama bilgilerini açar."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> başlatılıyor."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Yeni öğe yok"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Her şeyi sildiniz"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Uygulama Bilgileri"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ekran sabitleme"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"ara"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> başlatılamadı."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g>, güvenli modda devre dışıdır."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Tümünü temizle"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Ekranı bölünmüş olarak kullanmak için buraya sürükleyin"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Yatay Ayırma"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Dikey Ayırma"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Özel Ayırma"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Ekranı yukarıya doğru böl"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Ekranı sola doğru böl"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Ekranı sağa doğru böl"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-uk/strings.xml b/packages/SystemUI/legacy/recents/res/values-uk/strings.xml deleted file mode 100644 index 0c0b70927d1e..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-uk/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Огляд."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Закрити додаток <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Додаток <xliff:g id="APP">%s</xliff:g> закрито."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Усі останні додатки закрито."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Відкрити інформацію про додаток <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Запуск додатка <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Немає останніх елементів"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Ви очистили все"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Інформація про додаток"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"закріпити екран"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"пошук"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Не вдалося запустити додаток <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Додаток <xliff:g id="APP">%s</xliff:g> вимкнено в безпечному режимі."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Очистити все"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Перетягніть сюди, щоб розділити екран"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Розділити горизонтально"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Розділити вертикально"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Розділити (власний варіант)"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Розділити екран угору"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Розділити екран уліво"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Розділити екран управо"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-ur/strings.xml b/packages/SystemUI/legacy/recents/res/values-ur/strings.xml deleted file mode 100644 index 46033daebe09..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-ur/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"عمومی جائزہ۔"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"<xliff:g id="APP">%s</xliff:g> کو مسترد کریں۔"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> کو مسترد کر دیا گیا۔"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"سبھی حالیہ ایپلیکیشنز کو مسترد کر دیا گیا۔"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ایپلیکیشن کی معلومات کھولیں۔"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> شروع ہو رہی ہے۔"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"کوئی حالیہ آئٹم نہیں"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"آپ نے سب کچھ صاف کر دیا ہے"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"ایپلیکیشن کی معلومات"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"اسکرین کو پن کرنا"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"تلاش کریں"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> کو شروع نہیں کیا جا سکا۔"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"محفوظ موڈ میں <xliff:g id="APP">%s</xliff:g> غیر فعال ہے۔"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"سبھی کو ہٹائیں"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"اسپلٹ اسکرین استعمال کرنے کے لیے یہاں گھسیٹیں"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"بلحاظ افقی تقسیم کریں"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"بلحاظ عمودی تقسیم کریں"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"بلحاظ حسب ضرورت تقسیم کریں"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"اسکرین کو اوپر کی جانب تقسیم کریں"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"اسکرین کو بائیں جانب تقسیم کریں"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"اسکرین کو دائیں جانب تقسیم کریں"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-uz/strings.xml b/packages/SystemUI/legacy/recents/res/values-uz/strings.xml deleted file mode 100644 index 6f8b153b4b5b..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-uz/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Umumiy nazar."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Olib tashlash: <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> olib tashlangan."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Yaqinda ishlatilgan barcha ilovalar olib tashlandi."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"<xliff:g id="APP">%s</xliff:g> ilovasi haqidagi axborotlarni ochadi."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"<xliff:g id="APP">%s</xliff:g> ishga tushirilmoqda."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Yaqinda ishlatilgan ilovalar yoʻq"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Hammasi tozalandi"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Ilova haqida axborot"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ekranni mahkamlash"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"qidiruv"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"<xliff:g id="APP">%s</xliff:g> ilovasi ishga tushmadi."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"Xavfsiz rejimda <xliff:g id="APP">%s</xliff:g> ilovasi yopildi."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Ha"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Ekranni boʻlish xususiyatidan foydalanish uchun bu yerga torting"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Gorizontal yoʻnalishda boʻlish"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Vertikal yoʻnalishda boʻlish"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Boshqa usulda boʻlish"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Ekranni tepaga qadash"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Ekranni chap tomonga qadash"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Ekranni oʻng tomonga qadash"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-vi/strings.xml b/packages/SystemUI/legacy/recents/res/values-vi/strings.xml deleted file mode 100644 index aefeae92a8a4..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-vi/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Tổng quan."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Loại bỏ <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"Đã loại bỏ <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Đã loại bỏ tất cả các ứng dụng gần đây."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Mở thông tin ứng dụng <xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Khởi động <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Không có mục gần đây nào"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Bạn đã xóa mọi nội dung"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Thông tin ứng dụng"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"khóa màn hình"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"tìm kiếm"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Không thể khởi động <xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> bị tắt ở chế độ an toàn."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Xóa tất cả"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Kéo vào đây để sử dụng chế độ chia đôi màn hình"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Chia ngang"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Phân tách dọc"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Tùy chỉnh phân tách"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Chia đôi màn hình lên trên"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Chia đôi màn hình sang trái"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Chia đôi màn hình sang phải"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-zh-rCN/strings.xml b/packages/SystemUI/legacy/recents/res/values-zh-rCN/strings.xml deleted file mode 100644 index 993bfaea9637..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"概览。"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"移除<xliff:g id="APP">%s</xliff:g>。"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"已移除<xliff:g id="APP">%s</xliff:g>"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"已关闭所有最近用过的应用。"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"打开<xliff:g id="APP">%s</xliff:g>应用信息。"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"正在启动<xliff:g id="APP">%s</xliff:g>。"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"近期没有任何内容"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"您已清除所有内容"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"应用信息"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"固定屏幕"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"搜索"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"无法启动<xliff:g id="APP">%s</xliff:g>。"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g>已在安全模式下停用。"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"全部清除"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"拖动到此处即可使用分屏功能"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"水平分割"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"垂直分割"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"自定义分割"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"将屏幕分隔线移到上方"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"将屏幕分隔线移到左侧"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"将屏幕分隔线移到右侧"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-zh-rHK/strings.xml b/packages/SystemUI/legacy/recents/res/values-zh-rHK/strings.xml deleted file mode 100644 index b93d246255cc..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-zh-rHK/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"概覽。"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"關閉「<xliff:g id="APP">%s</xliff:g>」。"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"「<xliff:g id="APP">%s</xliff:g>」已關閉。"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"所有最近使用的應用程式均已關閉。"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"開啟「<xliff:g id="APP">%s</xliff:g>」應用程式的資料。"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"正在啟動「<xliff:g id="APP">%s</xliff:g>」。"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"最近沒有任何項目"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"您已清除所有工作"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"應用程式資料"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"螢幕固定"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"搜尋"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"無法啟動「<xliff:g id="APP">%s</xliff:g>」。"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"「<xliff:g id="APP">%s</xliff:g>」在安全模式下為停用狀態。"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"全部清除"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"拖曳這裡即可分割螢幕"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"水平分割"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"垂直分割"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"自訂分割"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"將分割畫面顯示喺頂部"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"將分割畫面顯示喺左邊"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"將分割畫面顯示喺右邊"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-zh-rTW/strings.xml b/packages/SystemUI/legacy/recents/res/values-zh-rTW/strings.xml deleted file mode 100644 index 54d656dd63b8..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"總覽。"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"關閉「<xliff:g id="APP">%s</xliff:g>」。"</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"「<xliff:g id="APP">%s</xliff:g>」已關閉。"</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"最近使用的應用程式已全部關閉。"</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"開啟「<xliff:g id="APP">%s</xliff:g>」應用程式資訊。"</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"正在啟動「<xliff:g id="APP">%s</xliff:g>」。"</string> - <string name="recents_empty_message" msgid="7967713254531861311">"最近沒有任何項目"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"你已清除所有工作"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"應用程式資訊"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"螢幕固定"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"搜尋"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"無法啟動「<xliff:g id="APP">%s</xliff:g>」。"</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"「<xliff:g id="APP">%s</xliff:g>」在安全模式中為停用狀態。"</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"全部清除"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"拖曳到這裡即可使用分割畫面"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"水平分割"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"垂直分割"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"自訂分割"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"將分割畫面顯示在頂端"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"將分割畫面顯示在左邊"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"將分割畫面顯示在右邊"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values-zu/strings.xml b/packages/SystemUI/legacy/recents/res/values-zu/strings.xml deleted file mode 100644 index 9cbc439a84d0..000000000000 --- a/packages/SystemUI/legacy/recents/res/values-zu/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Buka konke."</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Cashisa i-<xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"I-<xliff:g id="APP">%s</xliff:g> icashisiwe."</string> - <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"Zonke izinhlelo zokusebenza zakamuva zicashisiwe."</string> - <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Vula ulwazi lohlelo lokusebenza le-<xliff:g id="APP">%s</xliff:g>."</string> - <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Iqala i-<xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_empty_message" msgid="7967713254531861311">"Azikho izinto zakamuva"</string> - <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"Usule yonke into"</string> - <string name="recents_app_info_button_label" msgid="8732926607391786762">"Ulwazi lohlelo lokusebenza"</string> - <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"ukuphina isikrini"</string> - <string name="recents_search_bar_label" msgid="638132045925945941">"sesha"</string> - <string name="recents_launch_error_message" msgid="9107963563503438012">"Ayikwazanga ukuqalisa i-<xliff:g id="APP">%s</xliff:g>."</string> - <string name="recents_launch_disabled_message" msgid="826461671965217243">"I-<xliff:g id="APP">%s</xliff:g> ikhutshaziwe kumodi yokuphepha."</string> - <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Sula konke"</string> - <string name="recents_drag_hint_message" msgid="610417221848280136">"Hudulela lapha ukuze usebenzise ukuhlukanisa kwesikrini"</string> - <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Hlukanisa ngokuvundlile"</string> - <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Hlukanisa ngokumile"</string> - <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Hlukanisa ngokwezifiso"</string> - <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Hlukanisela isikrini phezulu"</string> - <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Hlukanisela isikrini ngakwesokunxele"</string> - <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Hlukanisela isikrini ngakwesokudla"</string> -</resources> diff --git a/packages/SystemUI/legacy/recents/res/values/colors.xml b/packages/SystemUI/legacy/recents/res/values/colors.xml deleted file mode 100644 index 88b9b70956ef..000000000000 --- a/packages/SystemUI/legacy/recents/res/values/colors.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * Copyright 2010, 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> - <!-- The disabled recents task bar background color. --> - <color name="recents_task_bar_disabled_background_color">#ff676767</color> - <!-- The default recents task bar background color. --> - <color name="recents_task_bar_default_background_color">#ffe6e6e6</color> - <!-- The default recents task view background color. --> - <color name="recents_task_view_default_background_color">#fff3f3f3</color> - <!-- The recents task bar light text color to be drawn on top of dark backgrounds. --> - <color name="recents_task_bar_light_text_color">#ffeeeeee</color> - <!-- The recents task bar dark text color to be drawn on top of light backgrounds. --> - <color name="recents_task_bar_dark_text_color">#cc000000</color> - <!-- The recents task bar light dismiss icon color to be drawn on top of dark backgrounds. --> - <color name="recents_task_bar_light_icon_color">#ccffffff</color> - <!-- The recents task bar dark dismiss icon color to be drawn on top of light backgrounds. --> - <color name="recents_task_bar_dark_icon_color">#99000000</color> - <!-- The lock to task button background color. --> - <color name="recents_task_view_lock_to_app_button_background_color">#ffe6e6e6</color> - <!-- The lock to task button foreground color. --> - <color name="recents_task_view_lock_to_app_button_color">#ff666666</color> - <!-- The background color for the freeform workspace. --> - <color name="recents_freeform_workspace_bg_color">#33FFFFFF</color> - - <!-- The background color for clear all button on light backgrounds if not transparent. --> - <color name="recents_clear_all_button_bg_light_color">#CCFFFFFF</color> - <!-- The background color for clear all button on dark backgrounds if not transparent. --> - <color name="recents_clear_all_button_bg_dark_color">#CC000000</color> - - <!-- Shadow color for the first pixels around the fake shadow for recents. --> - <color name="fake_shadow_start_color">#44000000</color> - - <!-- Shadow color for the furthest pixels around the fake shadow for recents. --> - <color name="fake_shadow_end_color">#03000000</color> -</resources>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/values/config.xml b/packages/SystemUI/legacy/recents/res/values/config.xml deleted file mode 100644 index 2ff9abf4003d..000000000000 --- a/packages/SystemUI/legacy/recents/res/values/config.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2009, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<!-- These resources are around just to allow their values to be customized - for different hardware and product builds. --> -<resources> - - <!-- Component to be used as the recents implementation. Must implement the - RecentsImplementation interface. This name is in the ComponentName flattened format - (package/class) --> - <string name="config_recentsComponent" translatable="false">com.android.systemui.recents.LegacyRecentsImpl</string> - - <!-- Whether recents should use hardware layers for its taskviews. This flag can be enabled - for devices where the java drawing of round rects may be slow --> - <bool name="config_recents_use_hardware_layers">false</bool> - - <!-- The number of app thumbnails we keep in memory --> - <integer name="config_recents_max_thumbnail_count">10</integer> - - <!-- The number of app icons we keep in memory --> - <integer name="config_recents_max_icon_count">20</integer> - - <!-- Whether to use cheap, less good looking shadows for recents --> - <bool name="config_recents_fake_shadows">false</bool> - - <!-- The duration in seconds to wait before the dismiss buttons are shown. --> - <integer name="recents_task_bar_dismiss_delay_seconds">1000</integer> - - <!-- The duration for animating the task decorations in after transitioning from an app. --> - <integer name="recents_task_enter_from_app_duration">200</integer> - - <!-- The duration for animating the task decorations in after transitioning from an app. --> - <integer name="recents_task_enter_from_affiliated_app_duration">125</integer> - - <!-- The duration for animating the task decorations out before transitioning to an app. --> - <integer name="recents_task_exit_to_app_duration">125</integer> - - <!-- The min animation duration for animating the nav bar scrim in. --> - <integer name="recents_nav_bar_scrim_enter_duration">400</integer> - - <!-- The animation duration for scrolling the stack to a particular item. --> - <integer name="recents_animate_task_stack_scroll_duration">200</integer> - - <!-- The delay to enforce between each alt-tab key press. --> - <integer name="recents_alt_tab_key_delay">200</integer> - - <!-- Svelte specific logic, see RecentsConfiguration.SVELTE_* constants. --> - <integer name="recents_svelte_level">0</integer> - - <!-- Recents: The relative range of visible tasks from the current scroll position - while the stack is focused. --> - <item name="recents_layout_focused_range_min" format="float" type="integer">-3</item> - <item name="recents_layout_focused_range_max" format="float" type="integer">2</item> - - <!-- Recents: The relative range of visible tasks from the current scroll position - while the stack is not focused. --> - <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item> - <item name="recents_layout_unfocused_range_max" format="float" type="integer">2.5</item> -</resources>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/values/dimens.xml b/packages/SystemUI/legacy/recents/res/values/dimens.xml deleted file mode 100644 index 528610e4c990..000000000000 --- a/packages/SystemUI/legacy/recents/res/values/dimens.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright (c) 2006, 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> -<!-- Recents Layout --> - - <!-- The amount to inset the stack, specifically at the top and the other sides. We also - don't want this to change across configurations that Recents can be opened in, so we - define them statically for all display sizes. --> - <dimen name="recents_layout_min_margin">16dp</dimen> - <dimen name="recents_layout_top_margin_phone">16dp</dimen> - <dimen name="recents_layout_top_margin_tablet">32dp</dimen> - <dimen name="recents_layout_top_margin_tablet_xlarge">40dp</dimen> - <dimen name="recents_layout_bottom_margin">16dp</dimen> - <dimen name="recents_layout_side_margin_phone">16dp</dimen> - <dimen name="recents_layout_side_margin_tablet">48dp</dimen> - <dimen name="recents_layout_side_margin_tablet_docked">16dp</dimen> - <dimen name="recents_layout_side_margin_tablet_xlarge">64dp</dimen> - <dimen name="recents_layout_side_margin_tablet_xlarge_docked">16dp</dimen> - - <!-- The height between the top margin and the top of the focused task. --> - <dimen name="recents_layout_top_peek_size">48dp</dimen> - <!-- The height between the bottom margin and the top of task in front of the focused task. --> - <dimen name="recents_layout_bottom_peek_size">56dp</dimen> - - <!-- The offset from the top and bottom of the stack of the focused task. The bottom offset - will be additionally offset by the bottom system insets since it goes under the nav bar - in certain orientations. --> - <dimen name="recents_layout_initial_top_offset_phone_port">128dp</dimen> - <dimen name="recents_layout_initial_bottom_offset_phone_port">80dp</dimen> - <dimen name="recents_layout_initial_top_offset_phone_land">72dp</dimen> - <dimen name="recents_layout_initial_bottom_offset_phone_land">72dp</dimen> - <dimen name="recents_layout_initial_top_offset_tablet">160dp</dimen> - <dimen name="recents_layout_initial_bottom_offset_tablet">112dp</dimen> - - <!-- The min/max translationZ for the tasks in the stack. --> - <dimen name="recents_layout_z_min">3dp</dimen> - <dimen name="recents_layout_z_max">24dp</dimen> - - <!-- The margin between the freeform and stack. We also don't want this to change across - configurations that Recents can be opened in, so we define them statically for all - display sizes. --> - <dimen name="recents_freeform_layout_bottom_margin">16dp</dimen> - - <!-- The padding between each freeform task. --> - <dimen name="recents_freeform_layout_task_padding">8dp</dimen> - -<!-- Recents Views --> - - <!-- The height of a task view bar. This has to be large enough to cover the action bar - height in either orientation at this smallest width. --> - <dimen name="recents_task_view_header_height">56dp</dimen> - <dimen name="recents_task_view_header_height_tablet_land">64dp</dimen> - - <!-- The padding of a button in the recents task view header. --> - <dimen name="recents_task_view_header_button_padding">16dp</dimen> - <dimen name="recents_task_view_header_button_padding_tablet_land">20dp</dimen> - - <!-- The radius of the rounded corners on a task view and its shadow (which can be larger - to create a softer corner effect. --> - <dimen name="recents_task_view_rounded_corners_radius">2dp</dimen> - <dimen name="recents_task_view_shadow_rounded_corners_radius">6dp</dimen> - - <!-- The amount of highlight to make on each task view. --> - <dimen name="recents_task_view_highlight">1dp</dimen> - - <!-- The size of the lock-to-app button and its icon. --> - <dimen name="recents_lock_to_app_size">56dp</dimen> - <dimen name="recents_lock_to_app_icon_size">28dp</dimen> - - <!-- The amount of overscroll allowed when flinging to the end of the stack. --> - <dimen name="recents_fling_overscroll_distance">24dp</dimen> - - <!-- The size of the drag hint text. --> - <dimen name="recents_drag_hint_text_size">14sp</dimen> - - <!-- The min alpha to apply to a task affiliation group color. --> - <item name="recents_task_affiliation_color_min_alpha_percentage" format="float" type="dimen">0.6</item> - - <!-- The amount to offset when animating into an affiliate group. --> - <dimen name="recents_task_stack_animation_affiliate_enter_offset">32dp</dimen> - - <!-- The offsets the tasks animate from when recents is launched while docking --> - <dimen name="recents_task_stack_animation_launched_while_docking_offset">144dp</dimen> - - <!-- The amount to translate when animating the removal of a task. --> - <dimen name="recents_task_view_remove_anim_translation_x">100dp</dimen> - - <!-- The alpha to apply to the recents row when it doesn't have focus --> - <item name="recents_recents_row_dim_alpha" format="float" type="dimen">0.5</item> - - <!-- The speed in dp/s at which the user needs to be scrolling in recents such that we start - loading full resolution screenshots. --> - <dimen name="recents_fast_fling_velocity">600dp</dimen> - -</resources>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/values/dimens_grid.xml b/packages/SystemUI/legacy/recents/res/values/dimens_grid.xml deleted file mode 100644 index febf65b834ee..000000000000 --- a/packages/SystemUI/legacy/recents/res/values/dimens_grid.xml +++ /dev/null @@ -1,28 +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> - <dimen name="recents_grid_padding_left_right">32dp</dimen> - <dimen name="recents_grid_padding_top_bottom">150dp</dimen> - <dimen name="recents_grid_padding_task_view">20dp</dimen> - <dimen name="recents_grid_task_view_header_height">44dp</dimen> - <dimen name="recents_grid_task_view_header_button_padding">8dp</dimen> - <dimen name="recents_grid_task_view_focused_frame_thickness">8dp</dimen> - <dimen name="recents_grid_task_view_rounded_corners_radius">4dp</dimen> - <dimen name="recents_grid_task_view_focused_frame_rounded_corners_radius">8dp</dimen> -</resources> - diff --git a/packages/SystemUI/legacy/recents/res/values/strings.xml b/packages/SystemUI/legacy/recents/res/values/strings.xml deleted file mode 100644 index 4b44ba969d6e..000000000000 --- a/packages/SystemUI/legacy/recents/res/values/strings.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_desc_recent_apps">Overview.</string> - - <!-- Content description to tell the user that this button will remove an application from recents --> - <string name="accessibility_recents_item_will_be_dismissed">Dismiss <xliff:g id="app" example="Calendar">%s</xliff:g>.</string> - <!-- Content description to tell the user an application has been removed from recents --> - <string name="accessibility_recents_item_dismissed"><xliff:g id="app" example="Calendar">%s</xliff:g> dismissed.</string> - <!-- Content description to tell the user all applications has been removed from recents --> - <string name="accessibility_recents_all_items_dismissed">All recent applications dismissed.</string> - <!-- Content description to tell the user that this button will open application info for an application in recents --> - <string name="accessibility_recents_item_open_app_info">Open <xliff:g id="app" example="Calendar">%s</xliff:g> application info.</string> - <!-- Content description to tell the user an application has been launched from recents --> - <string name="accessibility_recents_item_launched">Starting <xliff:g id="app" example="Calendar">%s</xliff:g>.</string> - - <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] --> - <string name="recents_empty_message">No recent items</string> - <!-- Recents: The empty recents string after dismissing all tasks. [CHAR LIMIT=NONE] --> - <string name="recents_empty_message_dismissed_all">You\'ve cleared everything</string> - <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] --> - <string name="recents_app_info_button_label">Application Info</string> - <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] --> - <string name="recents_lock_to_app_button_label">screen pinning</string> - <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] --> - <string name="recents_search_bar_label">search</string> - <!-- Recents: Launch error string. [CHAR LIMIT=NONE] --> - <string name="recents_launch_error_message">Could not start <xliff:g id="app" example="Calendar">%s</xliff:g>.</string> - <!-- Recents: Launch disabled string. [CHAR LIMIT=NONE] --> - <string name="recents_launch_disabled_message"><xliff:g id="app" example="Calendar">%s</xliff:g> is disabled in safe-mode.</string> - <!-- Recents: Stack action button string. [CHAR LIMIT=NONE] --> - <string name="recents_stack_action_button_label">Clear all</string> - <!-- Recents: Hint text that shows on the drop targets to start multiwindow. [CHAR LIMIT=NONE] --> - <string name="recents_drag_hint_message">Drag here to use split screen</string> - - <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] --> - <string name="recents_multistack_add_stack_dialog_split_horizontal">Split Horizontal</string> - <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] --> - <string name="recents_multistack_add_stack_dialog_split_vertical">Split Vertical</string> - <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] --> - <string name="recents_multistack_add_stack_dialog_split_custom">Split Custom</string> - <!-- Recents: Accessibility split to the top --> - <string name="recents_accessibility_split_screen_top">Split screen to the top</string> - <!-- Recents: Accessibility split to the left --> - <string name="recents_accessibility_split_screen_left">Split screen to the left</string> - <!-- Recents: Accessibility split to the right --> - <string name="recents_accessibility_split_screen_right">Split screen to the right</string> - -</resources>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/res/values/styles.xml b/packages/SystemUI/legacy/recents/res/values/styles.xml deleted file mode 100644 index eb16be7c95b6..000000000000 --- a/packages/SystemUI/legacy/recents/res/values/styles.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 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 xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="RecentsTheme" parent="@android:style/Theme.Material"> - <!-- NoTitle --> - <item name="android:windowNoTitle">true</item> - <!-- Misc --> - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:navigationBarColor">@android:color/transparent</item> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - <item name="android:windowAnimationStyle">@null</item> - <item name="android:ambientShadowAlpha">0.35</item> - </style> - - <!-- Recents theme --> - <style name="RecentsTheme.Wallpaper"> - <item name="android:windowBackground">@*android:color/transparent</item> - <item name="android:colorBackgroundCacheHint">@null</item> - <item name="android:windowShowWallpaper">true</item> - <item name="android:windowDisablePreview">true</item> - <item name="clearAllStyle">@style/ClearAllButtonDefaultMargins</item> - <item name="clearAllBackgroundColor">@color/recents_clear_all_button_bg_dark_color</item> - <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> - <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item> - </style> - - <style name="RecentsTheme.Wallpaper.Light"> - <item name="clearAllBackgroundColor">@color/recents_clear_all_button_bg_light_color</item> - <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item> - <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item> - </style> - - <!-- Performance optimized Recents theme (no wallpaper) --> - <style name="RecentsTheme.NoWallpaper"> - <item name="android:windowBackground">@android:color/black</item> - <item name="wallpaperTextColor">@android:color/white</item> - <item name="wallpaperTextColorSecondary">@android:color/white</item> - </style> - - </resources>
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/Constants.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/Constants.java deleted file mode 100644 index 003379fe0bf8..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/Constants.java +++ /dev/null @@ -1,34 +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.systemui.recents; - -/** - * Constants - */ -public class Constants { - - // TODO: Move into RecentsMetrics - public static class Metrics { - // DO NOT MODIFY THE ORDER OF THESE METRICS - public static final int DismissSourceKeyboard = 0; - public static final int DismissSourceSwipeGesture = 1; - public static final int DismissSourceHeaderButton = 2; - @Deprecated - public static final int DismissSourceHistorySwipeGesture = 3; - } - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl deleted file mode 100644 index 90c10992bc94..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl +++ /dev/null @@ -1,38 +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. - */ - -package com.android.systemui.recents; - -import android.graphics.Rect; - -/** - * Due to the fact that RecentsActivity is per-user, we need to establish an - * interface (this) for the system user to callback to the secondary users in - * response to UI events coming in from the system user's SystemUI. - */ -oneway interface IRecentsNonSystemUserCallbacks { - void preloadRecents(); - void cancelPreloadingRecents(); - void showRecents(boolean triggeredFromAltTab, boolean draggingInRecents, boolean animate, - int recentsGrowTarget); - void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey); - void toggleRecents(int recentsGrowTarget); - void onConfigurationChanged(); - void splitPrimaryTask(int topTaskId, int stackCreateMode, in Rect initialBounds); - void onDraggingInRecents(float distanceFromTop); - void onDraggingInRecentsEnded(float velocity); - void showCurrentUserToast(int msgResId, int msgLength); -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl deleted file mode 100644 index e97714486dcf..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl +++ /dev/null @@ -1,36 +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. - */ - -package com.android.systemui.recents; - -import android.graphics.Rect; - -/** - * Due to the fact that RecentsActivity is per-user, we need to establish an - * interface (this) for the non-system user to register itself for callbacks and to - * callback to the system user to update internal state. - */ -oneway interface IRecentsSystemUserCallbacks { - void registerNonSystemUserCallbacks(IBinder nonSystemUserCallbacks, int userId); - - void updateRecentsVisibility(boolean visible); - void startScreenPinning(int taskId); - void sendRecentsDrawnEvent(); - void sendDockingTopTaskEvent(in Rect initialRect); - void sendLaunchRecentsEvent(); - void sendDockedFirstAnimationFrameEvent(); - void setWaitingForTransitionStartEvent(boolean waitingForTransitionStart); -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java deleted file mode 100644 index a150de95fcf0..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java +++ /dev/null @@ -1,750 +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.systemui.recents; - -import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; -import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_RECENT_APPS; - -import android.app.ActivityManager; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Point; -import android.graphics.Rect; -import android.hardware.display.DisplayManager; -import android.os.Handler; -import android.os.IBinder; -import android.os.RemoteException; -import android.os.UserHandle; -import android.util.EventLog; -import android.util.Log; -import android.view.Display; -import android.widget.Toast; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.EventLogConstants; -import com.android.systemui.EventLogTags; -import com.android.systemui.R; -import com.android.systemui.SysUiServiceProvider; -import com.android.systemui.pip.PipUI; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.ConfigurationChangedEvent; -import com.android.systemui.recents.events.activity.DockedFirstAnimationFrameEvent; -import com.android.systemui.recents.events.activity.DockedTopTaskEvent; -import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent; -import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; -import com.android.systemui.recents.events.component.ExpandPipEvent; -import com.android.systemui.recents.events.component.HidePipMenuEvent; -import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent; -import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; -import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; -import com.android.systemui.recents.events.component.ShowUserToastEvent; -import com.android.systemui.recents.events.ui.RecentsDrawnEvent; -import com.android.systemui.recents.events.ui.RecentsGrowingEvent; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.model.RecentsTaskLoader; -import com.android.systemui.shared.system.ActivityManagerWrapper; -import com.android.systemui.stackdivider.Divider; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; - -/** - * An implementation of the SystemUI recents component, which supports both system and secondary - * users. - */ -public class LegacyRecentsImpl implements RecentsImplementation { - - private final static String TAG = "Recents"; - - public final static int EVENT_BUS_PRIORITY = 1; - public final static int BIND_TO_SYSTEM_USER_RETRY_DELAY = 5000; - - public final static Set<String> RECENTS_ACTIVITIES = new HashSet<>(); - static { - RECENTS_ACTIVITIES.add(RecentsImpl.RECENTS_ACTIVITY); - } - - private static final String COUNTER_WINDOW_SUPPORTED = "window_enter_supported"; - private static final String COUNTER_WINDOW_UNSUPPORTED = "window_enter_unsupported"; - private static final String COUNTER_WINDOW_INCOMPATIBLE = "window_enter_incompatible"; - - private static SystemServicesProxy sSystemServicesProxy; - private static RecentsDebugFlags sDebugFlags; - private static RecentsTaskLoader sTaskLoader; - private static RecentsConfiguration sConfiguration; - - private Context mContext; - private SysUiServiceProvider mSysUiServiceProvider; - private Handler mHandler; - private RecentsImpl mImpl; - - // Only For system user, this is the callbacks instance we return to each secondary user - private RecentsSystemUser mSystemToUserCallbacks; - - // Only for secondary users, this is the callbacks instance provided by the system user to make - // calls back - private IRecentsSystemUserCallbacks mUserToSystemCallbacks; - - // The set of runnables to run after binding to the system user's service. - private final ArrayList<Runnable> mOnConnectRunnables = new ArrayList<>(); - - // Only for secondary users, this is the death handler for the binder from the system user - private final IBinder.DeathRecipient mUserToSystemCallbacksDeathRcpt = new IBinder.DeathRecipient() { - @Override - public void binderDied() { - mUserToSystemCallbacks = null; - EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, - EventLogConstants.SYSUI_RECENTS_CONNECTION_USER_SYSTEM_UNBOUND, - sSystemServicesProxy.getProcessUser()); - - // Retry after a fixed duration - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - registerWithSystemUser(); - } - }, BIND_TO_SYSTEM_USER_RETRY_DELAY); - } - }; - - // Only for secondary users, this is the service connection we use to connect to the system user - private final ServiceConnection mUserToSystemServiceConnection = new ServiceConnection() { - @Override - public void onServiceConnected(ComponentName name, IBinder service) { - if (service != null) { - mUserToSystemCallbacks = IRecentsSystemUserCallbacks.Stub.asInterface( - service); - EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, - EventLogConstants.SYSUI_RECENTS_CONNECTION_USER_SYSTEM_BOUND, - sSystemServicesProxy.getProcessUser()); - - // Listen for system user's death, so that we can reconnect later - try { - service.linkToDeath(mUserToSystemCallbacksDeathRcpt, 0); - } catch (RemoteException e) { - Log.e(TAG, "Lost connection to (System) SystemUI", e); - } - - // Run each of the queued runnables - runAndFlushOnConnectRunnables(); - } - - // Unbind ourselves now that we've registered our callbacks. The - // binder to the system user are still valid at this point. - mContext.unbindService(this); - } - - @Override - public void onServiceDisconnected(ComponentName name) { - // Do nothing - } - }; - - /** - * Returns the callbacks interface that non-system users can call. - */ - public IBinder getSystemUserCallbacks() { - return mSystemToUserCallbacks; - } - - public static RecentsTaskLoader getTaskLoader() { - return sTaskLoader; - } - - - public static SystemServicesProxy getSystemServices() { - return sSystemServicesProxy; - } - - public static RecentsConfiguration getConfiguration() { - return sConfiguration; - } - - public static RecentsDebugFlags getDebugFlags() { - return sDebugFlags; - } - - @Override - public void onStart(Context context, SysUiServiceProvider sysUiServiceProvider) { - mContext = context; - mSysUiServiceProvider = sysUiServiceProvider; - final Resources res = mContext.getResources(); - final int defaultTaskBarBackgroundColor = - mContext.getColor(R.color.recents_task_bar_default_background_color); - final int defaultTaskViewBackgroundColor = - mContext.getColor(R.color.recents_task_view_default_background_color); - sDebugFlags = new RecentsDebugFlags(); - sSystemServicesProxy = SystemServicesProxy.getInstance(mContext); - sConfiguration = new RecentsConfiguration(mContext); - sTaskLoader = new RecentsTaskLoader(mContext, - // TODO: Once we start building the AAR, move these into the loader - res.getInteger(R.integer.config_recents_max_thumbnail_count), - res.getInteger(R.integer.config_recents_max_icon_count), - res.getInteger(R.integer.recents_svelte_level)); - sTaskLoader.setDefaultColors(defaultTaskBarBackgroundColor, defaultTaskViewBackgroundColor); - mHandler = new Handler(); - mImpl = new RecentsImpl(mContext); - - // Register with the event bus - EventBus.getDefault().register(this, EVENT_BUS_PRIORITY); - EventBus.getDefault().register(sSystemServicesProxy, EVENT_BUS_PRIORITY); - EventBus.getDefault().register(sTaskLoader, EVENT_BUS_PRIORITY); - - // Due to the fact that RecentsActivity is per-user, we need to establish and interface for - // the system user's Recents component to pass events (like show/hide/toggleRecents) to the - // secondary user, and vice versa (like visibility change, screen pinning). - final int processUser = sSystemServicesProxy.getProcessUser(); - if (sSystemServicesProxy.isSystemUser(processUser)) { - // For the system user, initialize an instance of the interface that we can pass to the - // secondary user - mSystemToUserCallbacks = new RecentsSystemUser(mContext, mImpl); - } else { - // For the secondary user, bind to the primary user's service to get a persistent - // interface to register its implementation and to later update its state - registerWithSystemUser(); - } - } - - @Override - public void onBootCompleted() { - mImpl.onBootCompleted(); - } - - - @Override - public void growRecents() { - EventBus.getDefault().send(new RecentsGrowingEvent()); - } - - /** - * Shows the Recents. - */ - @Override - public void showRecentApps(boolean triggeredFromAltTab) { - ActivityManagerWrapper.getInstance().closeSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS); - int recentsGrowTarget = getComponent(Divider.class).getView().growsRecents(); - int currentUser = sSystemServicesProxy.getCurrentUser(); - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.showRecents(triggeredFromAltTab, false /* draggingInRecents */, - true /* animate */, recentsGrowTarget); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.showRecents(triggeredFromAltTab, false /* draggingInRecents */, - true /* animate */, recentsGrowTarget); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - } - - /** - * Hides the Recents. - */ - @Override - public void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { - int currentUser = sSystemServicesProxy.getCurrentUser(); - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.hideRecents(triggeredFromAltTab, triggeredFromHomeKey); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.hideRecents(triggeredFromAltTab, triggeredFromHomeKey); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - } - - /** - * Toggles the Recents activity. - */ - @Override - public void toggleRecentApps() { - int growTarget = getComponent(Divider.class).getView().growsRecents(); - int currentUser = sSystemServicesProxy.getCurrentUser(); - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.toggleRecents(growTarget); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.toggleRecents(growTarget); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - } - - /** - * Preloads info for the Recents activity. - */ - @Override - public void preloadRecentApps() { - int currentUser = sSystemServicesProxy.getCurrentUser(); - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.preloadRecents(); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.preloadRecents(); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - } - - @Override - public void cancelPreloadRecentApps() { - int currentUser = sSystemServicesProxy.getCurrentUser(); - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.cancelPreloadingRecents(); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.cancelPreloadingRecents(); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - } - - @Override - public boolean splitPrimaryTask(int stackCreateMode, Rect initialBounds, int metricsDockAction) { - Point realSize = new Point(); - if (initialBounds == null) { - mContext.getSystemService(DisplayManager.class).getDisplay(Display.DEFAULT_DISPLAY) - .getRealSize(realSize); - initialBounds = new Rect(0, 0, realSize.x, realSize.y); - } - - int currentUser = sSystemServicesProxy.getCurrentUser(); - ActivityManager.RunningTaskInfo runningTask = - ActivityManagerWrapper.getInstance().getRunningTask(); - final int activityType = runningTask != null - ? runningTask.configuration.windowConfiguration.getActivityType() - : ACTIVITY_TYPE_UNDEFINED; - boolean screenPinningActive = ActivityManagerWrapper.getInstance().isScreenPinningActive(); - boolean isRunningTaskInHomeOrRecentsStack = - activityType == ACTIVITY_TYPE_HOME || activityType == ACTIVITY_TYPE_RECENTS; - if (runningTask != null && !isRunningTaskInHomeOrRecentsStack && !screenPinningActive) { - logDockAttempt(mContext, runningTask.topActivity, runningTask.resizeMode); - if (runningTask.supportsSplitScreenMultiWindow) { - if (metricsDockAction != -1) { - MetricsLogger.action(mContext, metricsDockAction, - runningTask.topActivity.flattenToShortString()); - } - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.splitPrimaryTask(runningTask.id, stackCreateMode, initialBounds); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.splitPrimaryTask(runningTask.id, stackCreateMode, - initialBounds); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - - return true; - } else { - EventBus.getDefault().send(new ShowUserToastEvent( - R.string.dock_non_resizeble_failed_to_dock_text, Toast.LENGTH_SHORT)); - return false; - } - } else { - return false; - } - } - - public static void logDockAttempt(Context ctx, ComponentName activity, int resizeMode) { - if (resizeMode == ActivityInfo.RESIZE_MODE_UNRESIZEABLE) { - MetricsLogger.action(ctx, MetricsEvent.ACTION_WINDOW_DOCK_UNRESIZABLE, - activity.flattenToShortString()); - } - MetricsLogger.count(ctx, getMetricsCounterForResizeMode(resizeMode), 1); - } - - private static String getMetricsCounterForResizeMode(int resizeMode) { - switch (resizeMode) { - case ActivityInfo.RESIZE_MODE_FORCE_RESIZEABLE: - return COUNTER_WINDOW_UNSUPPORTED; - case ActivityInfo.RESIZE_MODE_RESIZEABLE: - case ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION: - return COUNTER_WINDOW_SUPPORTED; - default: - return COUNTER_WINDOW_INCOMPATIBLE; - } - } - - @Override - public void onAppTransitionFinished() { - if (!LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - // Fallback, reset the flag once an app transition ends - EventBus.getDefault().send(new SetWaitingForTransitionStartEvent( - false /* waitingForTransitionStart */)); - } - } - - /** - * Updates on configuration change. - */ - public void onConfigurationChanged(Configuration newConfig) { - int currentUser = sSystemServicesProxy.getCurrentUser(); - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.onConfigurationChanged(); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.onConfigurationChanged(); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - } - - /** - * Handle Recents activity visibility changed. - */ - public final void onBusEvent(final RecentsVisibilityChangedEvent event) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - int processUser = ssp.getProcessUser(); - if (ssp.isSystemUser(processUser)) { - mImpl.onVisibilityChanged(event.applicationContext, event.visible); - } else { - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.updateRecentsVisibility(event.visible); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } - }); - } - - // This will catch the cases when a user launches from recents to another app - // (and vice versa) that is not in the recents stack (such as home or bugreport) and it - // would not reset the wait for transition flag. This will catch it and make sure that the - // flag is reset. - if (!event.visible) { - mImpl.setWaitingForTransitionStart(false); - } - } - - public final void onBusEvent(DockedFirstAnimationFrameEvent event) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - int processUser = ssp.getProcessUser(); - if (ssp.isSystemUser(processUser)) { - final Divider divider = getComponent(Divider.class); - if (divider != null) { - divider.onDockedFirstAnimationFrame(); - } - } else { - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.sendDockedFirstAnimationFrameEvent(); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } - }); - } - } - - /** - * Handle screen pinning request. - */ - public final void onBusEvent(final ScreenPinningRequestEvent event) { - int processUser = sSystemServicesProxy.getProcessUser(); - if (sSystemServicesProxy.isSystemUser(processUser)) { - mImpl.onStartScreenPinning(event.applicationContext, event.taskId); - } else { - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.startScreenPinning(event.taskId); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } - }); - } - } - - public final void onBusEvent(final RecentsDrawnEvent event) { - int processUser = sSystemServicesProxy.getProcessUser(); - if (sSystemServicesProxy.isSystemUser(processUser)) { - final Divider divider = getComponent(Divider.class); - if (divider != null) { - divider.onRecentsDrawn(); - } - } else { - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.sendRecentsDrawnEvent(); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } - }); - } - } - - public final void onBusEvent(final DockedTopTaskEvent event) { - int processUser = sSystemServicesProxy.getProcessUser(); - if (sSystemServicesProxy.isSystemUser(processUser)) { - final Divider divider = getComponent(Divider.class); - if (divider != null) { - divider.onDockedTopTask(); - } - } else { - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.sendDockingTopTaskEvent(event.initialRect); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } - }); - } - } - - public final void onBusEvent(final RecentsActivityStartingEvent event) { - int processUser = sSystemServicesProxy.getProcessUser(); - if (sSystemServicesProxy.isSystemUser(processUser)) { - final Divider divider = getComponent(Divider.class); - if (divider != null) { - divider.onRecentsActivityStarting(); - } - } else { - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.sendLaunchRecentsEvent(); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } - }); - } - } - - public final void onBusEvent(LaunchTaskFailedEvent event) { - // Reset the transition when tasks fail to launch - mImpl.setWaitingForTransitionStart(false); - } - - public final void onBusEvent(ConfigurationChangedEvent event) { - // Update the configuration for the Recents component when the activity configuration - // changes as well - mImpl.onConfigurationChanged(); - } - - public final void onBusEvent(ShowUserToastEvent event) { - int currentUser = sSystemServicesProxy.getCurrentUser(); - if (sSystemServicesProxy.isSystemUser(currentUser)) { - mImpl.onShowCurrentUserToast(event.msgResId, event.msgLength); - } else { - if (mSystemToUserCallbacks != null) { - IRecentsNonSystemUserCallbacks callbacks = - mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); - if (callbacks != null) { - try { - callbacks.showCurrentUserToast(event.msgResId, event.msgLength); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } else { - Log.e(TAG, "No SystemUI callbacks found for user: " + currentUser); - } - } - } - } - - public final void onBusEvent(SetWaitingForTransitionStartEvent event) { - int processUser = sSystemServicesProxy.getProcessUser(); - if (sSystemServicesProxy.isSystemUser(processUser)) { - mImpl.setWaitingForTransitionStart(event.waitingForTransitionStart); - } else { - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.setWaitingForTransitionStartEvent( - event.waitingForTransitionStart); - } catch (RemoteException e) { - Log.e(TAG, "Callback failed", e); - } - } - }); - } - } - - public final void onBusEvent(ExpandPipEvent event) { - PipUI pipUi = getComponent(PipUI.class); - if (pipUi == null) { - return; - } - pipUi.expandPip(); - } - - public final void onBusEvent(HidePipMenuEvent event) { - PipUI pipUi = getComponent(PipUI.class); - if (pipUi == null) { - return; - } - event.getAnimationTrigger().increment(); - pipUi.hidePipMenu(() -> { - event.getAnimationTrigger().increment(); - }, () -> { - event.getAnimationTrigger().decrement(); - }); - event.getAnimationTrigger().decrement(); - } - - /** - * Attempts to register with the system user. - */ - private void registerWithSystemUser() { - final int processUser = sSystemServicesProxy.getProcessUser(); - postToSystemUser(new Runnable() { - @Override - public void run() { - try { - mUserToSystemCallbacks.registerNonSystemUserCallbacks( - new RecentsImplProxy(mImpl), processUser); - } catch (RemoteException e) { - Log.e(TAG, "Failed to register", e); - } - } - }); - } - - /** - * Runs the runnable in the system user's Recents context, connecting to the service if - * necessary. - */ - private void postToSystemUser(final Runnable onConnectRunnable) { - mOnConnectRunnables.add(onConnectRunnable); - if (mUserToSystemCallbacks == null) { - Intent systemUserServiceIntent = new Intent(); - systemUserServiceIntent.setClass(mContext, RecentsSystemUserService.class); - boolean bound = mContext.bindServiceAsUser(systemUserServiceIntent, - mUserToSystemServiceConnection, Context.BIND_AUTO_CREATE, UserHandle.SYSTEM); - EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, - EventLogConstants.SYSUI_RECENTS_CONNECTION_USER_BIND_SERVICE, - sSystemServicesProxy.getProcessUser()); - if (!bound) { - // Retry after a fixed duration - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - registerWithSystemUser(); - } - }, BIND_TO_SYSTEM_USER_RETRY_DELAY); - } - } else { - runAndFlushOnConnectRunnables(); - } - } - - /** - * Runs all the queued runnables after a service connection is made. - */ - private void runAndFlushOnConnectRunnables() { - for (Runnable r : mOnConnectRunnables) { - r.run(); - } - mOnConnectRunnables.clear(); - } - - private <T> T getComponent(Class<T> clazz) { - return mSysUiServiceProvider.getComponent(clazz); - } - - @Override - public void dump(PrintWriter pw) { - pw.println("Recents"); - pw.println(" currentUserId=" + SystemServicesProxy.getInstance(mContext).getCurrentUser()); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivity.java deleted file mode 100644 index a7ccc3a49073..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivity.java +++ /dev/null @@ -1,858 +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.systemui.recents; - -import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_HOME_KEY; - -import android.app.Activity; -import android.app.ActivityOptions; -import android.app.TaskStackBuilder; -import android.app.WallpaperManager; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.res.Configuration; -import android.net.Uri; -import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; -import android.os.SystemClock; -import android.os.UserHandle; -import android.provider.Settings; -import android.util.Log; -import android.view.KeyEvent; -import android.view.View; -import android.view.ViewTreeObserver; -import android.view.ViewTreeObserver.OnPreDrawListener; -import android.view.WindowManager; -import android.view.WindowManager.LayoutParams; - -import com.android.internal.colorextraction.ColorExtractor; -import com.android.internal.content.PackageMonitor; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.internal.util.LatencyTracker; -import com.android.systemui.DejankUtils; -import com.android.systemui.Dependency; -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.colorextraction.SysuiColorExtractor; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent; -import com.android.systemui.recents.events.activity.ConfigurationChangedEvent; -import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted; -import com.android.systemui.recents.events.activity.DockedFirstAnimationFrameEvent; -import com.android.systemui.recents.events.activity.DockedTopTaskEvent; -import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent; -import com.android.systemui.recents.events.activity.EnterRecentsWindowLastAnimationFrameEvent; -import com.android.systemui.recents.events.activity.ExitRecentsWindowFirstAnimationFrameEvent; -import com.android.systemui.recents.events.activity.HideRecentsEvent; -import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent; -import com.android.systemui.recents.events.activity.LaunchTaskSucceededEvent; -import com.android.systemui.recents.events.activity.MultiWindowStateChangedEvent; -import com.android.systemui.recents.events.activity.PackagesChangedEvent; -import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; -import com.android.systemui.recents.events.activity.ToggleRecentsEvent; -import com.android.systemui.recents.events.component.ActivityUnpinnedEvent; -import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent; -import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; -import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; -import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent; -import com.android.systemui.recents.events.ui.DeleteTaskDataEvent; -import com.android.systemui.recents.events.ui.HideIncompatibleAppOverlayEvent; -import com.android.systemui.recents.events.ui.RecentsDrawnEvent; -import com.android.systemui.recents.events.ui.ShowApplicationInfoEvent; -import com.android.systemui.recents.events.ui.ShowIncompatibleAppOverlayEvent; -import com.android.systemui.recents.events.ui.StackViewScrolledEvent; -import com.android.systemui.recents.events.ui.TaskViewDismissedEvent; -import com.android.systemui.recents.events.ui.UserInteractionEvent; -import com.android.systemui.recents.events.ui.focus.DismissFocusedTaskViewEvent; -import com.android.systemui.recents.events.ui.focus.FocusNextTaskViewEvent; -import com.android.systemui.recents.events.ui.focus.FocusPreviousTaskViewEvent; -import com.android.systemui.recents.events.ui.focus.NavigateTaskViewEvent; -import com.android.systemui.recents.events.ui.focus.NavigateTaskViewEvent.Direction; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.model.RecentsTaskLoadPlan; -import com.android.systemui.recents.model.RecentsTaskLoader; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.recents.views.RecentsView; -import com.android.systemui.recents.views.SystemBarScrimViews; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.system.ActivityManagerWrapper; - -import java.io.FileDescriptor; -import java.io.PrintWriter; - -/** - * The main Recents activity that is started from RecentsComponent. - */ -public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreDrawListener, - ColorExtractor.OnColorsChangedListener { - - private final static String TAG = "RecentsActivity"; - private final static boolean DEBUG = false; - - public final static int EVENT_BUS_PRIORITY = LegacyRecentsImpl.EVENT_BUS_PRIORITY + 1; - public final static int INCOMPATIBLE_APP_ALPHA_DURATION = 150; - - private PackageMonitor mPackageMonitor = new PackageMonitor() { - @Override - public void onPackageRemoved(String packageName, int uid) { - RecentsActivity.this.onPackageChanged(packageName, getChangingUserId()); - } - - @Override - public boolean onPackageChanged(String packageName, int uid, String[] components) { - RecentsActivity.this.onPackageChanged(packageName, getChangingUserId()); - return true; - } - - @Override - public void onPackageModified(String packageName) { - RecentsActivity.this.onPackageChanged(packageName, getChangingUserId()); - } - }; - private Handler mHandler = new Handler(); - private long mLastTabKeyEventTime; - private boolean mFinishedOnStartup; - private boolean mIgnoreAltTabRelease; - private boolean mIsVisible; - private boolean mRecentsStartRequested; - private Configuration mLastConfig; - - // Top level views - private RecentsView mRecentsView; - private SystemBarScrimViews mScrimViews; - private View mIncompatibleAppOverlay; - - // Runnables to finish the Recents activity - private Intent mHomeIntent; - - // The trigger to automatically launch the current task - private int mFocusTimerDuration; - private final UserInteractionEvent mUserInteractionEvent = new UserInteractionEvent(); - - // Theme and colors - private SysuiColorExtractor mColorExtractor; - private boolean mUsingDarkText; - - /** - * A common Runnable to finish Recents by launching Home with an animation depending on the - * last activity launch state. Generally we always launch home when we exit Recents rather than - * just finishing the activity since we don't know what is behind Recents in the task stack. - */ - class LaunchHomeRunnable implements Runnable { - - Intent mLaunchIntent; - ActivityOptions mOpts; - - /** - * Creates a finish runnable that starts the specified intent. - */ - public LaunchHomeRunnable(Intent launchIntent, ActivityOptions opts) { - mLaunchIntent = launchIntent; - mOpts = opts; - } - - @Override - public void run() { - try { - mHandler.post(() -> { - ActivityOptions opts = mOpts; - if (opts == null) { - opts = ActivityOptions.makeCustomAnimation(RecentsActivity.this, - R.anim.recents_to_launcher_enter, R.anim.recents_to_launcher_exit); - } - startActivityAsUser(mLaunchIntent, opts.toBundle(), UserHandle.CURRENT); - }); - } catch (Exception e) { - Log.e(TAG, getString(R.string.recents_launch_error_message, "Home"), e); - } - } - } - - /** - * Broadcast receiver to handle messages from the system - */ - final BroadcastReceiver mSystemBroadcastReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context ctx, Intent intent) { - String action = intent.getAction(); - if (action.equals(Intent.ACTION_SCREEN_OFF)) { - // When the screen turns off, dismiss Recents to Home - dismissRecentsToHomeIfVisible(false); - } else if (action.equals(Intent.ACTION_USER_SWITCHED)) { - // When switching users, dismiss Recents to Home similar to screen off - finish(); - } - } - }; - - private final OnPreDrawListener mRecentsDrawnEventListener = - new ViewTreeObserver.OnPreDrawListener() { - @Override - public boolean onPreDraw() { - mRecentsView.getViewTreeObserver().removeOnPreDrawListener(this); - EventBus.getDefault().post(new RecentsDrawnEvent()); - if (LatencyTracker.isEnabled(getApplicationContext())) { - DejankUtils.postAfterTraversal(() -> LatencyTracker.getInstance( - getApplicationContext()).onActionEnd( - LatencyTracker.ACTION_TOGGLE_RECENTS)); - } - DejankUtils.postAfterTraversal(() -> { - LegacyRecentsImpl.getTaskLoader().startLoader(RecentsActivity.this); - LegacyRecentsImpl.getTaskLoader().getHighResThumbnailLoader().setVisible(true); - }); - return true; - } - }; - - /** - * Dismisses recents if we are already visible and the intent is to toggle the recents view. - */ - boolean dismissRecentsToFocusedTask(int logCategory) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (ssp.isRecentsActivityVisible()) { - // If we have a focused Task, launch that Task now - if (mRecentsView.launchFocusedTask(logCategory)) return true; - } - return false; - } - - /** - * Dismisses recents back to the launch target task. - */ - boolean dismissRecentsToLaunchTargetTaskOrHome() { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (ssp.isRecentsActivityVisible()) { - // If we have a focused Task, launch that Task now - if (mRecentsView.launchPreviousTask()) return true; - // If none of the other cases apply, then just go Home - dismissRecentsToHome(true /* animateTaskViews */); - } - return false; - } - - /** - * Dismisses recents if we are already visible and the intent is to toggle the recents view. - */ - boolean dismissRecentsToFocusedTaskOrHome() { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (ssp.isRecentsActivityVisible()) { - // If we have a focused Task, launch that Task now - if (mRecentsView.launchFocusedTask(0 /* logCategory */)) return true; - // If none of the other cases apply, then just go Home - dismissRecentsToHome(true /* animateTaskViews */); - return true; - } - return false; - } - - /** - * Dismisses Recents directly to Home without checking whether it is currently visible. - */ - void dismissRecentsToHome(boolean animateTaskViews) { - dismissRecentsToHome(animateTaskViews, null); - } - - /** - * Dismisses Recents directly to Home without checking whether it is currently visible. - * - * @param overrideAnimation If not null, will override the default animation that is based on - * how Recents was launched. - */ - void dismissRecentsToHome(boolean animateTaskViews, ActivityOptions overrideAnimation) { - DismissRecentsToHomeAnimationStarted dismissEvent = - new DismissRecentsToHomeAnimationStarted(animateTaskViews); - dismissEvent.addPostAnimationCallback(new LaunchHomeRunnable(mHomeIntent, - overrideAnimation)); - ActivityManagerWrapper.getInstance().closeSystemWindows(SYSTEM_DIALOG_REASON_HOME_KEY); - EventBus.getDefault().send(dismissEvent); - } - - /** Dismisses Recents directly to Home if we currently aren't transitioning. */ - boolean dismissRecentsToHomeIfVisible(boolean animated) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (ssp.isRecentsActivityVisible()) { - // Return to Home - dismissRecentsToHome(animated); - return true; - } - return false; - } - - /** Called with the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mFinishedOnStartup = false; - - // In the case that the activity starts up before the Recents component has initialized - // (usually when debugging/pushing the SysUI apk), just finish this activity. - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (ssp == null) { - mFinishedOnStartup = true; - finish(); - return; - } - - // Register this activity with the event bus - EventBus.getDefault().register(this, EVENT_BUS_PRIORITY); - - // Initialize the package monitor - mPackageMonitor.register(this, Looper.getMainLooper(), UserHandle.ALL, - true /* externalStorage */); - - // Select theme based on wallpaper colors - mColorExtractor = Dependency.get(SysuiColorExtractor.class); - mColorExtractor.addOnColorsChangedListener(this); - mUsingDarkText = mColorExtractor.getColors(ColorExtractor.TYPE_DARK, - WallpaperManager.FLAG_SYSTEM).supportsDarkText(); - setTheme(mUsingDarkText ? R.style.RecentsTheme_Wallpaper_Light - : R.style.RecentsTheme_Wallpaper); - - // Set the Recents layout - setContentView(R.layout.recents); - takeKeyEvents(true); - mRecentsView = findViewById(R.id.recents_view); - mScrimViews = new SystemBarScrimViews(this); - getWindow().getAttributes().privateFlags |= - WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY; - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); - } - - mLastConfig = new Configuration(Utilities.getAppConfiguration(this)); - - // Set the window background - mRecentsView.updateBackgroundScrim(getWindow(), isInMultiWindowMode()); - - // Create the home intent runnable - mHomeIntent = new Intent(Intent.ACTION_MAIN, null); - mHomeIntent.addCategory(Intent.CATEGORY_HOME); - mHomeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | - Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); - - // Register the broadcast receiver to handle messages when the screen is turned off - IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_SCREEN_OFF); - filter.addAction(Intent.ACTION_USER_SWITCHED); - registerReceiver(mSystemBroadcastReceiver, filter); - - getWindow().addPrivateFlags(LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION); - } - - @Override - protected void onStart() { - super.onStart(); - - // Reload the stack view whenever we are made visible again - reloadStackView(); - - // Notify that recents is now visible - EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, true)); - MetricsLogger.visible(this, MetricsEvent.OVERVIEW_ACTIVITY); - - // Getting system scrim colors ignoring wallpaper visibility since it should never be grey. - ColorExtractor.GradientColors systemColors = mColorExtractor.getNeutralColors(); - // We don't want to interpolate colors because we're defining the initial state. - // Gradient should be set/ready when you open "Recents". - mRecentsView.setScrimColors(systemColors, false); - - // Notify of the next draw - mRecentsView.getViewTreeObserver().addOnPreDrawListener(mRecentsDrawnEventListener); - - // If Recents was restarted, then it should complete the enter animation with partially - // reset launch state with dock, app and home set to false - Object isRelaunching = getLastNonConfigurationInstance(); - if (isRelaunching != null && isRelaunching instanceof Boolean && (boolean) isRelaunching) { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - launchState.launchedViaDockGesture = false; - launchState.launchedFromApp = false; - launchState.launchedFromHome = false; - onEnterAnimationComplete(); - } - mRecentsStartRequested = false; - } - - @Override - public void onColorsChanged(ColorExtractor colorExtractor, int which) { - if ((which & WallpaperManager.FLAG_SYSTEM) != 0) { - ColorExtractor.GradientColors colors = mColorExtractor.getNeutralColors(); - boolean darkText = colors.supportsDarkText(); - if (darkText != mUsingDarkText) { - mUsingDarkText = darkText; - setTheme(mUsingDarkText ? R.style.RecentsTheme_Wallpaper_Light - : R.style.RecentsTheme_Wallpaper); - mRecentsView.reevaluateStyles(); - } - mRecentsView.setScrimColors(colors, true /* animated */); - } - } - - /** - * Reloads the stack views upon launching Recents. - */ - private void reloadStackView() { - // If the Recents component has preloaded a load plan, then use that to prevent - // reconstructing the task stack - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - RecentsTaskLoadPlan loadPlan = RecentsImpl.consumeInstanceLoadPlan(); - if (loadPlan == null) { - loadPlan = new RecentsTaskLoadPlan(this); - } - - // Start loading tasks according to the load plan - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - if (!loadPlan.hasTasks()) { - loader.preloadTasks(loadPlan, launchState.launchedToTaskId); - } - - RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options(); - loadOpts.runningTaskId = launchState.launchedToTaskId; - loadOpts.numVisibleTasks = launchState.launchedNumVisibleTasks; - loadOpts.numVisibleTaskThumbnails = launchState.launchedNumVisibleThumbnails; - loader.loadTasks(loadPlan, loadOpts); - TaskStack stack = loadPlan.getTaskStack(); - mRecentsView.onReload(stack, mIsVisible); - - // Update the nav bar scrim, but defer the animation until the enter-window event - boolean animateNavBarScrim = !launchState.launchedViaDockGesture; - mScrimViews.updateNavBarScrim(animateNavBarScrim, stack.getTaskCount() > 0, null); - - // If this is a new instance relaunched by AM, without going through the normal mechanisms, - // then we have to manually trigger the enter animation state - boolean wasLaunchedByAm = !launchState.launchedFromHome && - !launchState.launchedFromApp; - if (wasLaunchedByAm) { - EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent()); - } - - // Keep track of whether we launched from the nav bar button or via alt-tab - if (launchState.launchedWithAltTab) { - MetricsLogger.count(this, "overview_trigger_alttab", 1); - } else { - MetricsLogger.count(this, "overview_trigger_nav_btn", 1); - } - - // Keep track of whether we launched from an app or from home - if (launchState.launchedFromApp) { - Task launchTarget = stack.getLaunchTarget(); - int launchTaskIndexInStack = launchTarget != null - ? stack.indexOfTask(launchTarget) - : 0; - MetricsLogger.count(this, "overview_source_app", 1); - // If from an app, track the stack index of the app in the stack (for affiliated tasks) - MetricsLogger.histogram(this, "overview_source_app_index", launchTaskIndexInStack); - } else { - MetricsLogger.count(this, "overview_source_home", 1); - } - - // Keep track of the total stack task count - int taskCount = mRecentsView.getStack().getTaskCount(); - MetricsLogger.histogram(this, "overview_task_count", taskCount); - - // After we have resumed, set the visible state until the next onStop() call - mIsVisible = true; - } - - @Override - public void onEnterAnimationComplete() { - super.onEnterAnimationComplete(); - EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent()); - - // Workaround for b/64694148: The animation started callback is not made (see - // RecentsImpl.getThumbnailTransitionActivityOptions) so reset the transition-waiting state - // once the enter animation has completed. - EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(false)); - } - - @Override - public Object onRetainNonConfigurationInstance() { - return true; - } - - @Override - protected void onPause() { - super.onPause(); - - mIgnoreAltTabRelease = false; - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - - // Notify of the config change - Configuration newDeviceConfiguration = Utilities.getAppConfiguration(this); - int numStackTasks = mRecentsView.getStack().getTaskCount(); - EventBus.getDefault().send(new ConfigurationChangedEvent(false /* fromMultiWindow */, - mLastConfig.orientation != newDeviceConfiguration.orientation, - mLastConfig.densityDpi != newDeviceConfiguration.densityDpi, numStackTasks > 0)); - - mLastConfig.updateFrom(newDeviceConfiguration); - } - - @Override - public void onMultiWindowModeChanged(boolean isInMultiWindowMode) { - super.onMultiWindowModeChanged(isInMultiWindowMode); - - // Set the window background - mRecentsView.updateBackgroundScrim(getWindow(), isInMultiWindowMode); - - // Reload the task stack view if we are still visible to pick up the change in tasks that - // result from entering/exiting multi-window - if (mIsVisible) { - reloadTaskStack(isInMultiWindowMode, true /* sendConfigChangedEvent */); - } - } - - @Override - protected void onStop() { - super.onStop(); - - // Notify that recents is now hidden - mIsVisible = false; - EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, false)); - MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY); - LegacyRecentsImpl.getTaskLoader().getHighResThumbnailLoader().setVisible(false); - - // When recents starts again before onStop, do not reset launch flags so entrance animation - // can run - if (!isChangingConfigurations() && !mRecentsStartRequested) { - // Workaround for b/22542869, if the RecentsActivity is started again, but without going - // through SystemUI, we need to reset the config launch flags to ensure that we do not - // wait on the system to send a signal that was never queued. - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - launchState.reset(); - } - - // Force a gc to attempt to clean up bitmap references more quickly (b/38258699) - LegacyRecentsImpl.getSystemServices().gc(); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - - // In the case that the activity finished on startup, just skip the unregistration below - if (mFinishedOnStartup) { - return; - } - - // Unregister the system broadcast receivers - unregisterReceiver(mSystemBroadcastReceiver); - - // Unregister any broadcast receivers for the task loader - mPackageMonitor.unregister(); - - EventBus.getDefault().unregister(this); - } - - @Override - public void onAttachedToWindow() { - super.onAttachedToWindow(); - EventBus.getDefault().register(mScrimViews, EVENT_BUS_PRIORITY); - } - - @Override - public void onDetachedFromWindow() { - super.onDetachedFromWindow(); - EventBus.getDefault().unregister(mScrimViews); - } - - @Override - public void onTrimMemory(int level) { - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - if (loader != null) { - loader.onTrimMemory(level); - } - } - - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - switch (keyCode) { - case KeyEvent.KEYCODE_TAB: { - int altTabKeyDelay = getResources().getInteger(R.integer.recents_alt_tab_key_delay); - boolean hasRepKeyTimeElapsed = (SystemClock.elapsedRealtime() - - mLastTabKeyEventTime) > altTabKeyDelay; - if (event.getRepeatCount() <= 0 || hasRepKeyTimeElapsed) { - // Focus the next task in the stack - final boolean backward = event.isShiftPressed(); - if (backward) { - EventBus.getDefault().send(new FocusPreviousTaskViewEvent()); - } else { - EventBus.getDefault().send(new FocusNextTaskViewEvent()); - } - mLastTabKeyEventTime = SystemClock.elapsedRealtime(); - - // In the case of another ALT event, don't ignore the next release - if (event.isAltPressed()) { - mIgnoreAltTabRelease = false; - } - } - return true; - } - case KeyEvent.KEYCODE_DPAD_UP: - case KeyEvent.KEYCODE_DPAD_DOWN: - case KeyEvent.KEYCODE_DPAD_LEFT: - case KeyEvent.KEYCODE_DPAD_RIGHT: { - final Direction direction = NavigateTaskViewEvent.getDirectionFromKeyCode(keyCode); - EventBus.getDefault().send(new NavigateTaskViewEvent(direction)); - return true; - } - case KeyEvent.KEYCODE_DEL: - case KeyEvent.KEYCODE_FORWARD_DEL: { - if (event.getRepeatCount() <= 0) { - EventBus.getDefault().send(new DismissFocusedTaskViewEvent()); - - // Keep track of deletions by keyboard - MetricsLogger.histogram(this, "overview_task_dismissed_source", - Constants.Metrics.DismissSourceKeyboard); - return true; - } - } - default: - break; - } - return super.onKeyDown(keyCode, event); - } - - @Override - public void onUserInteraction() { - EventBus.getDefault().send(mUserInteractionEvent); - } - - @Override - public void onBackPressed() { - // Back behaves like the recents button so just trigger a toggle event - EventBus.getDefault().send(new ToggleRecentsEvent()); - } - - /**** EventBus events ****/ - - public final void onBusEvent(ToggleRecentsEvent event) { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - if (launchState.launchedFromHome) { - dismissRecentsToHome(true /* animateTaskViews */); - } else { - dismissRecentsToLaunchTargetTaskOrHome(); - } - } - - public final void onBusEvent(RecentsActivityStartingEvent event) { - mRecentsStartRequested = true; - } - - public final void onBusEvent(HideRecentsEvent event) { - if (event.triggeredFromAltTab) { - // If we are hiding from releasing Alt-Tab, dismiss Recents to the focused app - if (!mIgnoreAltTabRelease) { - dismissRecentsToFocusedTaskOrHome(); - } - } else if (event.triggeredFromHomeKey) { - dismissRecentsToHome(true /* animateTaskViews */); - - // Cancel any pending dozes - EventBus.getDefault().send(mUserInteractionEvent); - } else { - // Do nothing - } - } - - public final void onBusEvent(EnterRecentsWindowLastAnimationFrameEvent event) { - mRecentsView.getViewTreeObserver().addOnPreDrawListener(this); - mRecentsView.invalidate(); - } - - public final void onBusEvent(ExitRecentsWindowFirstAnimationFrameEvent event) { - mRecentsView.getViewTreeObserver().addOnPreDrawListener(this); - mRecentsView.invalidate(); - } - - public final void onBusEvent(DockedFirstAnimationFrameEvent event) { - mRecentsView.getViewTreeObserver().addOnPreDrawListener(this); - mRecentsView.invalidate(); - } - - public final void onBusEvent(CancelEnterRecentsWindowAnimationEvent event) { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - int launchToTaskId = launchState.launchedToTaskId; - if (launchToTaskId != -1 && - (event.launchTask == null || launchToTaskId != event.launchTask.key.id)) { - ActivityManagerWrapper am = ActivityManagerWrapper.getInstance(); - am.cancelWindowTransition(launchState.launchedToTaskId); - } - } - - public final void onBusEvent(ShowApplicationInfoEvent event) { - // Create a new task stack with the application info details activity - Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, - Uri.fromParts("package", event.task.key.getComponent().getPackageName(), null)); - intent.setComponent(intent.resolveActivity(getPackageManager())); - TaskStackBuilder.create(this) - .addNextIntentWithParentStack(intent).startActivities(null, - new UserHandle(event.task.key.userId)); - - // Keep track of app-info invocations - MetricsLogger.count(this, "overview_app_info", 1); - } - - public final void onBusEvent(ShowIncompatibleAppOverlayEvent event) { - if (mIncompatibleAppOverlay == null) { - mIncompatibleAppOverlay = Utilities.findViewStubById(this, - R.id.incompatible_app_overlay_stub).inflate(); - mIncompatibleAppOverlay.setWillNotDraw(false); - mIncompatibleAppOverlay.setVisibility(View.VISIBLE); - } - mIncompatibleAppOverlay.animate() - .alpha(1f) - .setDuration(INCOMPATIBLE_APP_ALPHA_DURATION) - .setInterpolator(Interpolators.ALPHA_IN) - .start(); - } - - public final void onBusEvent(HideIncompatibleAppOverlayEvent event) { - if (mIncompatibleAppOverlay != null) { - mIncompatibleAppOverlay.animate() - .alpha(0f) - .setDuration(INCOMPATIBLE_APP_ALPHA_DURATION) - .setInterpolator(Interpolators.ALPHA_OUT) - .start(); - } - } - - public final void onBusEvent(DeleteTaskDataEvent event) { - // Remove any stored data from the loader - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - loader.deleteTaskData(event.task, false); - - // Remove the task from activity manager - ActivityManagerWrapper.getInstance().removeTask(event.task.key.id); - } - - public final void onBusEvent(TaskViewDismissedEvent event) { - mRecentsView.updateScrimOpacity(); - } - - public final void onBusEvent(AllTaskViewsDismissedEvent event) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (ssp.hasDockedTask()) { - mRecentsView.showEmptyView(event.msgResId); - } else { - // Just go straight home (no animation necessary because there are no more task views) - dismissRecentsToHome(false /* animateTaskViews */); - } - - // Keep track of all-deletions - MetricsLogger.count(this, "overview_task_all_dismissed", 1); - } - - public final void onBusEvent(LaunchTaskSucceededEvent event) { - MetricsLogger.histogram(this, "overview_task_launch_index", event.taskIndexFromStackFront); - } - - public final void onBusEvent(LaunchTaskFailedEvent event) { - // Return to Home - dismissRecentsToHome(true /* animateTaskViews */); - - MetricsLogger.count(this, "overview_task_launch_failed", 1); - } - - public final void onBusEvent(ScreenPinningRequestEvent event) { - MetricsLogger.count(this, "overview_screen_pinned", 1); - } - - public final void onBusEvent(StackViewScrolledEvent event) { - // Once the user has scrolled while holding alt-tab, then we should ignore the release of - // the key - mIgnoreAltTabRelease = true; - } - - public final void onBusEvent(final DockedTopTaskEvent event) { - mRecentsView.getViewTreeObserver().addOnPreDrawListener(mRecentsDrawnEventListener); - mRecentsView.invalidate(); - } - - public final void onBusEvent(final ActivityUnpinnedEvent event) { - if (mIsVisible) { - // Skip the configuration change event as the PiP activity does not actually affect the - // config of recents - reloadTaskStack(isInMultiWindowMode(), false /* sendConfigChangedEvent */); - } - } - - private void reloadTaskStack(boolean isInMultiWindowMode, boolean sendConfigChangedEvent) { - // Reload the task stack completely - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - RecentsTaskLoadPlan loadPlan = new RecentsTaskLoadPlan(this); - loader.preloadTasks(loadPlan, -1 /* runningTaskId */); - - RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options(); - loadOpts.numVisibleTasks = launchState.launchedNumVisibleTasks; - loadOpts.numVisibleTaskThumbnails = launchState.launchedNumVisibleThumbnails; - loader.loadTasks(loadPlan, loadOpts); - - TaskStack stack = loadPlan.getTaskStack(); - int numStackTasks = stack.getTaskCount(); - boolean showDeferredAnimation = numStackTasks > 0; - - if (sendConfigChangedEvent) { - EventBus.getDefault().send(new ConfigurationChangedEvent(true /* fromMultiWindow */, - false /* fromDeviceOrientationChange */, false /* fromDisplayDensityChange */, - numStackTasks > 0)); - } - EventBus.getDefault().send(new MultiWindowStateChangedEvent(isInMultiWindowMode, - showDeferredAnimation, stack)); - } - - @Override - public boolean onPreDraw() { - mRecentsView.getViewTreeObserver().removeOnPreDrawListener(this); - return true; - } - - public void onPackageChanged(String packageName, int userId) { - LegacyRecentsImpl.getTaskLoader().onPackageChanged(packageName); - EventBus.getDefault().send(new PackagesChangedEvent(packageName, userId)); - } - - @Override - public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) { - super.dump(prefix, fd, writer, args); - EventBus.getDefault().dump(prefix, writer); - LegacyRecentsImpl.getTaskLoader().dump(prefix, writer); - - String id = Integer.toHexString(System.identityHashCode(this)); - - writer.print(prefix); writer.print(TAG); - writer.print(" visible="); writer.print(mIsVisible ? "Y" : "N"); - writer.print(" currentTime="); writer.print(System.currentTimeMillis()); - writer.print(" [0x"); writer.print(id); writer.print("]"); - writer.println(); - - if (mRecentsView != null) { - mRecentsView.dump(prefix, writer); - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivityLaunchState.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivityLaunchState.java deleted file mode 100644 index 14fda952b7ac..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivityLaunchState.java +++ /dev/null @@ -1,53 +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.systemui.recents; - -/** - * The launch state of the RecentsActivity. - * - * Current Constraints: - * - needed in onStart() before onNewIntent() - * - needs to be reset when Recents is hidden - * - needs to be computed in Recents component - * - needs to be accessible by views - */ -public class RecentsActivityLaunchState { - - public boolean launchedWithAltTab; - public boolean launchedFromApp; - // Set if the activity that we launched from entered PiP during the transition into Recents - public boolean launchedFromPipApp; - // Set if the next activity that quick-switch will launch is the PiP activity - public boolean launchedWithNextPipApp; - public boolean launchedFromHome; - public boolean launchedViaDragGesture; - public boolean launchedViaDockGesture; - public int launchedToTaskId; - public int launchedNumVisibleTasks; - public int launchedNumVisibleThumbnails; - - public void reset() { - launchedFromHome = false; - launchedFromApp = false; - launchedFromPipApp = false; - launchedWithNextPipApp = false; - launchedToTaskId = -1; - launchedWithAltTab = false; - launchedViaDragGesture = false; - launchedViaDockGesture = false; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsConfiguration.java deleted file mode 100644 index ee53734d175e..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsConfiguration.java +++ /dev/null @@ -1,126 +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.systemui.recents; - -import android.app.ActivityManager; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; - -import android.os.SystemProperties; - -import com.android.systemui.R; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.views.DockState; - -/** - * Represents the dock regions for each orientation. - */ -class DockRegion { - public static DockState[] PHONE_LANDSCAPE = { - // We only allow docking to the left in landscape for now on small devices - DockState.LEFT - }; - public static DockState[] PHONE_PORTRAIT = { - // We only allow docking to the top for now on small devices - DockState.TOP - }; - public static DockState[] TABLET_LANDSCAPE = { - DockState.LEFT, - DockState.RIGHT - }; - public static DockState[] TABLET_PORTRAIT = PHONE_PORTRAIT; -} - -/** - * Application resources that can be retrieved from the application context and are not specifically - * tied to the current activity. - */ -public class RecentsConfiguration { - - private static final int LARGE_SCREEN_MIN_DP = 600; - private static final int XLARGE_SCREEN_MIN_DP = 720; - - // Launch states - public RecentsActivityLaunchState mLaunchState = new RecentsActivityLaunchState(); - - // Since the positions in Recents has to be calculated globally (before the RecentsActivity - // starts), we need to calculate some resource values ourselves, instead of relying on framework - // resources. - public final boolean isLargeScreen; - public final boolean isXLargeScreen; - public final int smallestWidth; - - /** Misc **/ - public boolean fakeShadows; - public int svelteLevel; - - // Whether this product supports Grid-based Recents. If this is field is set to true, then - // Recents will layout task views in a grid mode when there's enough space in the screen. - public boolean isGridEnabled; - - // Support for Android Recents for low ram devices. If this field is set to true, then Recents - // will use the alternative layout. - public boolean isLowRamDevice; - - // Enable drag and drop split from Recents. Disabled for low ram devices. - public boolean dragToSplitEnabled; - - private final Context mAppContext; - - public RecentsConfiguration(Context context) { - // Load only resources that can not change after the first load either through developer - // settings or via multi window - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - mAppContext = context.getApplicationContext(); - Resources res = mAppContext.getResources(); - fakeShadows = res.getBoolean(R.bool.config_recents_fake_shadows); - svelteLevel = res.getInteger(R.integer.recents_svelte_level); - isGridEnabled = SystemProperties.getBoolean("ro.recents.grid", false); - isLowRamDevice = ActivityManager.isLowRamDeviceStatic(); - dragToSplitEnabled = !isLowRamDevice; - - float screenDensity = context.getResources().getDisplayMetrics().density; - smallestWidth = ssp.getDeviceSmallestWidth(); - isLargeScreen = smallestWidth >= (int) (screenDensity * LARGE_SCREEN_MIN_DP); - isXLargeScreen = smallestWidth >= (int) (screenDensity * XLARGE_SCREEN_MIN_DP); - } - - /** - * Returns the activity launch state. - * TODO: This will be refactored out of RecentsConfiguration. - */ - public RecentsActivityLaunchState getLaunchState() { - return mLaunchState; - } - - /** - * Returns the preferred dock states for the current orientation. - * @return a list of dock states for device and its orientation - */ - public DockState[] getDockStatesForCurrentOrientation() { - boolean isLandscape = mAppContext.getResources().getConfiguration().orientation == - Configuration.ORIENTATION_LANDSCAPE; - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - if (config.isLargeScreen) { - return isLandscape ? DockRegion.TABLET_LANDSCAPE : DockRegion.TABLET_PORTRAIT; - } else { - return isLandscape ? DockRegion.PHONE_LANDSCAPE : DockRegion.PHONE_PORTRAIT; - } - } - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsDebugFlags.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsDebugFlags.java deleted file mode 100644 index 19185939c553..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsDebugFlags.java +++ /dev/null @@ -1,29 +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.systemui.recents; - -public class RecentsDebugFlags { - - public static class Static { - // Enables debug drawing for the transition thumbnail - public static final boolean EnableTransitionThumbnailDebugMode = false; - - // Disables enter and exit transitions for other tasks for low ram devices - public static final boolean DisableRecentsLowRamEnterExitAnimation = false; - - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsImpl.java deleted file mode 100644 index 3e5acabfed49..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsImpl.java +++ /dev/null @@ -1,1118 +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. - */ - -package com.android.systemui.recents; - -import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; -import static android.view.View.MeasureSpec; - -import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_RECENT_APPS; - -import android.app.ActivityManager; -import android.app.ActivityOptions; -import android.app.trust.TrustManager; -import android.content.ActivityNotFoundException; -import android.content.ComponentCallbacks2; -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.drawable.Drawable; -import android.os.Handler; -import android.os.SystemClock; -import android.util.ArraySet; -import android.util.Log; -import android.util.MutableBoolean; -import android.util.Pair; -import android.view.LayoutInflater; -import android.view.ViewConfiguration; -import android.view.WindowManager; - -import android.widget.Toast; - -import com.android.systemui.Dependency; -import com.android.systemui.SysUiServiceProvider; -import com.android.systemui.pip.phone.ForegroundThread; -import com.google.android.collect.Lists; - -import com.android.internal.logging.MetricsLogger; -import com.android.internal.policy.DockedDividerUtils; -import com.android.systemui.R; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.DockedTopTaskEvent; -import com.android.systemui.recents.events.activity.EnterRecentsWindowLastAnimationFrameEvent; -import com.android.systemui.recents.events.activity.HideRecentsEvent; -import com.android.systemui.recents.events.activity.LaunchMostRecentTaskRequestEvent; -import com.android.systemui.recents.events.activity.LaunchNextTaskRequestEvent; -import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; -import com.android.systemui.recents.events.activity.ToggleRecentsEvent; -import com.android.systemui.recents.events.component.ActivityPinnedEvent; -import com.android.systemui.recents.events.component.ActivityUnpinnedEvent; -import com.android.systemui.recents.events.component.HidePipMenuEvent; -import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent; -import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; -import com.android.systemui.recents.events.ui.DraggingInRecentsEndedEvent; -import com.android.systemui.recents.events.ui.DraggingInRecentsEvent; -import com.android.systemui.recents.events.ui.TaskSnapshotChangedEvent; -import com.android.systemui.recents.misc.DozeTrigger; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.misc.SysUiTaskStackChangeListener; -import com.android.systemui.recents.model.RecentsTaskLoadPlan; -import com.android.systemui.recents.model.RecentsTaskLoader; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.recents.views.TaskStackLayoutAlgorithm; -import com.android.systemui.recents.views.TaskStackLayoutAlgorithm.VisibilityReport; -import com.android.systemui.recents.views.TaskStackView; -import com.android.systemui.recents.views.TaskViewHeader; -import com.android.systemui.recents.views.TaskViewTransform; -import com.android.systemui.recents.views.grid.TaskGridLayoutAlgorithm; -import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecCompat; -import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecsFuture; -import com.android.systemui.shared.recents.view.RecentsTransition; -import com.android.systemui.shared.system.ActivityManagerWrapper; -import com.android.systemui.stackdivider.DividerView; -import com.android.systemui.statusbar.phone.StatusBar; - -import java.util.ArrayList; -import java.util.List; - -/** - * An implementation of the Recents component for the current user. For secondary users, this can - * be called remotely from the system user. - */ -public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener { - - private final static String TAG = "RecentsImpl"; - - // The minimum amount of time between each recents button press that we will handle - private final static int MIN_TOGGLE_DELAY_MS = 350; - - // The duration within which the user releasing the alt tab (from when they pressed alt tab) - // that the fast alt-tab animation will run. If the user's alt-tab takes longer than this - // duration, then we will toggle recents after this duration. - private final static int FAST_ALT_TAB_DELAY_MS = 225; - - private final static ArraySet<TaskKey> EMPTY_SET = new ArraySet<>(); - - public final static String RECENTS_PACKAGE = "com.android.systemui"; - public final static String RECENTS_ACTIVITY = "com.android.systemui.recents.RecentsActivity"; - - /** - * An implementation of SysUiTaskStackChangeListener, that allows us to listen for changes to the system - * task stacks and update recents accordingly. - */ - class TaskStackListenerImpl extends SysUiTaskStackChangeListener { - - private OverviewProxyService mOverviewProxyService; - - public TaskStackListenerImpl() { - mOverviewProxyService = Dependency.get(OverviewProxyService.class); - } - - @Override - public void onTaskStackChangedBackground() { - // Skip background preloading recents in SystemUI if the overview services is bound - if (mOverviewProxyService.isEnabled()) { - return; - } - - // Check this is for the right user - if (!checkCurrentUserId(mContext, false /* debug */)) { - return; - } - - // Preloads the next task - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - if (config.svelteLevel == RecentsTaskLoader.SVELTE_NONE) { - Rect windowRect = getWindowRect(null /* windowRectOverride */); - if (windowRect.isEmpty()) { - return; - } - - // Load the next task only if we aren't svelte - ActivityManager.RunningTaskInfo runningTaskInfo = - ActivityManagerWrapper.getInstance().getRunningTask(); - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - RecentsTaskLoadPlan plan = new RecentsTaskLoadPlan(mContext); - loader.preloadTasks(plan, -1); - TaskStack stack = plan.getTaskStack(); - RecentsActivityLaunchState launchState = new RecentsActivityLaunchState(); - RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options(); - - synchronized (mBackgroundLayoutAlgorithm) { - // This callback is made when a new activity is launched and the old one is - // paused so ignore the current activity and try and preload the thumbnail for - // the previous one. - updateDummyStackViewLayout(mBackgroundLayoutAlgorithm, stack, windowRect); - - // Launched from app is always the worst case (in terms of how many - // thumbnails/tasks visible) - launchState.launchedFromApp = true; - mBackgroundLayoutAlgorithm.update(plan.getTaskStack(), EMPTY_SET, launchState, - -1 /* lastScrollPPresent */); - VisibilityReport visibilityReport = - mBackgroundLayoutAlgorithm.computeStackVisibilityReport( - stack.getTasks()); - - launchOpts.runningTaskId = runningTaskInfo != null ? runningTaskInfo.id : -1; - launchOpts.numVisibleTasks = visibilityReport.numVisibleTasks; - launchOpts.numVisibleTaskThumbnails = visibilityReport.numVisibleThumbnails; - launchOpts.onlyLoadForCache = true; - launchOpts.onlyLoadPausedActivities = true; - launchOpts.loadThumbnails = true; - } - loader.loadTasks(plan, launchOpts); - } - } - - @Override - public void onActivityPinned(String packageName, int userId, int taskId, int stackId) { - // Check this is for the right user - if (!checkCurrentUserId(mContext, false /* debug */)) { - return; - } - - // This time needs to be fetched the same way the last active time is fetched in - // {@link TaskRecord#touchActiveTime} - LegacyRecentsImpl.getConfiguration().getLaunchState().launchedFromPipApp = true; - LegacyRecentsImpl.getConfiguration().getLaunchState().launchedWithNextPipApp = false; - EventBus.getDefault().send(new ActivityPinnedEvent(taskId)); - consumeInstanceLoadPlan(); - sLastPipTime = System.currentTimeMillis(); - } - - @Override - public void onActivityUnpinned() { - // Check this is for the right user - if (!checkCurrentUserId(mContext, false /* debug */)) { - return; - } - - EventBus.getDefault().send(new ActivityUnpinnedEvent()); - sLastPipTime = -1; - } - - @Override - public void onTaskSnapshotChanged(int taskId, ThumbnailData snapshot) { - // Check this is for the right user - if (!checkCurrentUserId(mContext, false /* debug */)) { - return; - } - - EventBus.getDefault().send(new TaskSnapshotChangedEvent(taskId, snapshot)); - } - } - - protected static RecentsTaskLoadPlan sInstanceLoadPlan; - // Stores the last pinned task time - protected static long sLastPipTime = -1; - // Stores whether we are waiting for a transition to/from recents to start. During this time, - // we disallow the user from manually toggling recents until the transition has started. - private static boolean mWaitingForTransitionStart = false; - // Stores whether or not the user toggled while we were waiting for a transition to/from - // recents. In this case, we defer the toggle state until then and apply it immediately after. - private static boolean mToggleFollowingTransitionStart = true; - - private Runnable mResetToggleFlagListener = new Runnable() { - @Override - public void run() { - setWaitingForTransitionStart(false); - } - }; - - private TrustManager mTrustManager; - protected Context mContext; - protected Handler mHandler; - TaskStackListenerImpl mTaskStackListener; - boolean mDraggingInRecents; - boolean mLaunchedWhileDocking; - - // Task launching - Rect mTmpBounds = new Rect(); - TaskViewTransform mTmpTransform = new TaskViewTransform(); - int mTaskBarHeight; - - // Header (for transition) - TaskViewHeader mHeaderBar; - final Object mHeaderBarLock = new Object(); - private TaskStackView mDummyStackView; - private TaskStackLayoutAlgorithm mBackgroundLayoutAlgorithm; - - // Variables to keep track of if we need to start recents after binding - protected boolean mTriggeredFromAltTab; - protected long mLastToggleTime; - DozeTrigger mFastAltTabTrigger = new DozeTrigger(FAST_ALT_TAB_DELAY_MS, new Runnable() { - @Override - public void run() { - // When this fires, then the user has not released alt-tab for at least - // FAST_ALT_TAB_DELAY_MS milliseconds - showRecents(mTriggeredFromAltTab, false /* draggingInRecents */, true /* animate */, - DividerView.INVALID_RECENTS_GROW_TARGET); - } - }); - - private OverviewProxyService.OverviewProxyListener mOverviewProxyListener = - new OverviewProxyService.OverviewProxyListener() { - @Override - public void onConnectionChanged(boolean isConnected) { - if (!isConnected) { - // Clear everything when the connection to the overview service - LegacyRecentsImpl.getTaskLoader().onTrimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE); - } - } - }; - - // Used to reset the dummy stack view - private final TaskStack mEmptyTaskStack = new TaskStack(); - - public RecentsImpl(Context context) { - mContext = context; - mHandler = new Handler(); - mBackgroundLayoutAlgorithm = new TaskStackLayoutAlgorithm(context, null); - - // Initialize the static foreground thread - ForegroundThread.get(); - - // Register the task stack listener - mTaskStackListener = new TaskStackListenerImpl(); - ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener); - - // Initialize the static configuration resources - mDummyStackView = new TaskStackView(mContext); - reloadResources(); - - mTrustManager = (TrustManager) mContext.getSystemService(Context.TRUST_SERVICE); - } - - public void onBootCompleted() { - // Skip preloading tasks if we are already bound to the service - if (Dependency.get(OverviewProxyService.class).isEnabled()) { - return; - } - - // When we start, preload the data associated with the previous recent tasks. - // We can use a new plan since the caches will be the same. - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - RecentsTaskLoadPlan plan = new RecentsTaskLoadPlan(mContext); - loader.preloadTasks(plan, -1); - RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options(); - launchOpts.numVisibleTasks = loader.getIconCacheSize(); - launchOpts.numVisibleTaskThumbnails = loader.getThumbnailCacheSize(); - launchOpts.onlyLoadForCache = true; - loader.loadTasks(plan, launchOpts); - } - - public void onConfigurationChanged() { - reloadResources(); - mDummyStackView.reloadOnConfigurationChange(); - synchronized (mBackgroundLayoutAlgorithm) { - mBackgroundLayoutAlgorithm.reloadOnConfigurationChange(mContext); - } - } - - /** - * This is only called from the system user's Recents. Secondary users will instead proxy their - * visibility change events through to the system user via - * {@link LegacyRecentsImpl#onBusEvent(RecentsVisibilityChangedEvent)}. - */ - public void onVisibilityChanged(Context context, boolean visible) { - LegacyRecentsImpl.getSystemServices().setRecentsVisibility(visible); - } - - /** - * This is only called from the system user's Recents. Secondary users will instead proxy their - * visibility change events through to the system user via - * {@link LegacyRecentsImpl#onBusEvent(ScreenPinningRequestEvent)}. - */ - public void onStartScreenPinning(Context context, int taskId) { - final StatusBar statusBar = getStatusBar(); - if (statusBar != null) { - statusBar.showScreenPinningRequest(taskId, false); - } - } - - public void showRecents(boolean triggeredFromAltTab, boolean draggingInRecents, - boolean animate, int growTarget) { - final SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - final MutableBoolean isHomeStackVisible = new MutableBoolean(true); - final boolean isRecentsVisible = LegacyRecentsImpl.getSystemServices().isRecentsActivityVisible( - isHomeStackVisible); - final boolean fromHome = isHomeStackVisible.value; - final boolean launchedWhileDockingTask = - LegacyRecentsImpl.getSystemServices().getSplitScreenPrimaryStack() != null; - - mTriggeredFromAltTab = triggeredFromAltTab; - mDraggingInRecents = draggingInRecents; - mLaunchedWhileDocking = launchedWhileDockingTask; - if (mFastAltTabTrigger.isAsleep()) { - // Fast alt-tab duration has elapsed, fall through to showing Recents and reset - mFastAltTabTrigger.stopDozing(); - } else if (mFastAltTabTrigger.isDozing()) { - // Fast alt-tab duration has not elapsed. If this is triggered by a different - // showRecents() call, then ignore that call for now. - // TODO: We can not handle quick tabs that happen between the initial showRecents() call - // that started the activity and the activity starting up. The severity of this - // is inversely proportional to the FAST_ALT_TAB_DELAY_MS duration though. - if (!triggeredFromAltTab) { - return; - } - mFastAltTabTrigger.stopDozing(); - } else if (triggeredFromAltTab) { - // The fast alt-tab detector is not yet running, so start the trigger and wait for the - // hideRecents() call, or for the fast alt-tab duration to elapse - mFastAltTabTrigger.startDozing(); - return; - } - - try { - // Check if the top task is in the home stack, and start the recents activity - final boolean forceVisible = launchedWhileDockingTask || draggingInRecents; - if (forceVisible || !isRecentsVisible) { - ActivityManager.RunningTaskInfo runningTask = - ActivityManagerWrapper.getInstance().getRunningTask(); - startRecentsActivityAndDismissKeyguardIfNeeded(runningTask, - isHomeStackVisible.value || fromHome, animate, growTarget); - } - } catch (ActivityNotFoundException e) { - Log.e(TAG, "Failed to launch RecentsActivity", e); - } - } - - public void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { - if (triggeredFromAltTab && mFastAltTabTrigger.isDozing()) { - // The user has released alt-tab before the trigger has run, so just show the next - // task immediately - showNextTask(); - - // Cancel the fast alt-tab trigger - mFastAltTabTrigger.stopDozing(); - return; - } - - // Defer to the activity to handle hiding recents, if it handles it, then it must still - // be visible - EventBus.getDefault().post(new HideRecentsEvent(triggeredFromAltTab, - triggeredFromHomeKey)); - } - - public void toggleRecents(int growTarget) { - if (ActivityManagerWrapper.getInstance().isScreenPinningActive()) { - return; - } - - // Skip this toggle if we are already waiting to trigger recents via alt-tab - if (mFastAltTabTrigger.isDozing()) { - return; - } - - if (mWaitingForTransitionStart) { - mToggleFollowingTransitionStart = true; - return; - } - - mDraggingInRecents = false; - mLaunchedWhileDocking = false; - mTriggeredFromAltTab = false; - - try { - MutableBoolean isHomeStackVisible = new MutableBoolean(true); - long elapsedTime = SystemClock.elapsedRealtime() - mLastToggleTime; - - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (ssp.isRecentsActivityVisible(isHomeStackVisible)) { - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - if (!launchState.launchedWithAltTab) { - if (LegacyRecentsImpl.getConfiguration().isGridEnabled) { - // Has the user tapped quickly? - boolean isQuickTap = elapsedTime < ViewConfiguration.getDoubleTapTimeout(); - if (isQuickTap) { - EventBus.getDefault().post(new LaunchNextTaskRequestEvent()); - } else { - EventBus.getDefault().post(new LaunchMostRecentTaskRequestEvent()); - } - } else { - // Launch the next focused task - EventBus.getDefault().post(new LaunchNextTaskRequestEvent()); - } - } else { - // If the user has toggled it too quickly, then just eat up the event here (it's - // better than showing a janky screenshot). - // NOTE: Ideally, the screenshot mechanism would take the window transform into - // account - if (elapsedTime < MIN_TOGGLE_DELAY_MS) { - return; - } - - EventBus.getDefault().post(new ToggleRecentsEvent()); - mLastToggleTime = SystemClock.elapsedRealtime(); - } - return; - } else { - // If the user has toggled it too quickly, then just eat up the event here (it's - // better than showing a janky screenshot). - // NOTE: Ideally, the screenshot mechanism would take the window transform into - // account - if (elapsedTime < MIN_TOGGLE_DELAY_MS) { - return; - } - - // Otherwise, start the recents activity - ActivityManager.RunningTaskInfo runningTask = - ActivityManagerWrapper.getInstance().getRunningTask(); - startRecentsActivityAndDismissKeyguardIfNeeded(runningTask, - isHomeStackVisible.value, true /* animate */, growTarget); - - // Only close the other system windows if we are actually showing recents - ActivityManagerWrapper.getInstance().closeSystemWindows( - SYSTEM_DIALOG_REASON_RECENT_APPS); - mLastToggleTime = SystemClock.elapsedRealtime(); - } - } catch (ActivityNotFoundException e) { - Log.e(TAG, "Failed to launch RecentsActivity", e); - } - } - - public void preloadRecents() { - if (ActivityManagerWrapper.getInstance().isScreenPinningActive()) { - return; - } - - // Skip preloading recents when keyguard is showing - final StatusBar statusBar = getStatusBar(); - if (statusBar != null && statusBar.isKeyguardShowing()) { - return; - } - - // Preload only the raw task list into a new load plan (which will be consumed by the - // RecentsActivity) only if there is a task to animate to. Post this to ensure that we - // don't block the touch feedback on the nav bar button which triggers this. - mHandler.post(() -> { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (!ssp.isRecentsActivityVisible(null)) { - ActivityManager.RunningTaskInfo runningTask = - ActivityManagerWrapper.getInstance().getRunningTask(); - if (runningTask == null) { - return; - } - - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - sInstanceLoadPlan = new RecentsTaskLoadPlan(mContext); - loader.preloadTasks(sInstanceLoadPlan, runningTask.id); - TaskStack stack = sInstanceLoadPlan.getTaskStack(); - if (stack.getTaskCount() > 0) { - // Only preload the icon (but not the thumbnail since it may not have been taken - // for the pausing activity) - preloadIcon(runningTask.id); - - // At this point, we don't know anything about the stack state. So only - // calculate the dimensions of the thumbnail that we need for the transition - // into Recents, but do not draw it until we construct the activity options when - // we start Recents - updateHeaderBarLayout(stack, null /* window rect override*/); - } - } - }); - } - - public void cancelPreloadingRecents() { - // Do nothing - } - - public void onDraggingInRecents(float distanceFromTop) { - EventBus.getDefault().sendOntoMainThread(new DraggingInRecentsEvent(distanceFromTop)); - } - - public void onDraggingInRecentsEnded(float velocity) { - EventBus.getDefault().sendOntoMainThread(new DraggingInRecentsEndedEvent(velocity)); - } - - public void onShowCurrentUserToast(int msgResId, int msgLength) { - Toast.makeText(mContext, msgResId, msgLength).show(); - } - - /** - * Transitions to the next recent task in the stack. - */ - public void showNextTask() { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - RecentsTaskLoadPlan plan = new RecentsTaskLoadPlan(mContext); - loader.preloadTasks(plan, -1); - TaskStack focusedStack = plan.getTaskStack(); - - // Return early if there are no tasks in the focused stack - if (focusedStack == null || focusedStack.getTaskCount() == 0) return; - - // Return early if there is no running task - ActivityManager.RunningTaskInfo runningTask = - ActivityManagerWrapper.getInstance().getRunningTask(); - if (runningTask == null) return; - - // Find the task in the recents list - boolean isRunningTaskInHomeStack = - runningTask.configuration.windowConfiguration.getActivityType() - == ACTIVITY_TYPE_HOME; - ArrayList<Task> tasks = focusedStack.getTasks(); - Task toTask = null; - ActivityOptions launchOpts = null; - int taskCount = tasks.size(); - for (int i = taskCount - 1; i >= 1; i--) { - Task task = tasks.get(i); - if (isRunningTaskInHomeStack) { - toTask = tasks.get(i - 1); - launchOpts = ActivityOptions.makeCustomAnimation(mContext, - R.anim.recents_launch_next_affiliated_task_target, - R.anim.recents_fast_toggle_app_home_exit); - break; - } else if (task.key.id == runningTask.id) { - toTask = tasks.get(i - 1); - launchOpts = ActivityOptions.makeCustomAnimation(mContext, - R.anim.recents_launch_prev_affiliated_task_target, - R.anim.recents_launch_prev_affiliated_task_source); - break; - } - } - - // Return early if there is no next task - if (toTask == null) { - ssp.startInPlaceAnimationOnFrontMostApplication( - ActivityOptions.makeCustomInPlaceAnimation(mContext, - R.anim.recents_launch_prev_affiliated_task_bounce)); - return; - } - - // Launch the task - ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(toTask.key, launchOpts, - null /* resultCallback */, null /* resultCallbackHandler */); - } - - /** - * Transitions to the next affiliated task. - */ - public void showRelativeAffiliatedTask(boolean showNextTask) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - RecentsTaskLoadPlan plan = new RecentsTaskLoadPlan(mContext); - loader.preloadTasks(plan, -1); - TaskStack focusedStack = plan.getTaskStack(); - - // Return early if there are no tasks in the focused stack - if (focusedStack == null || focusedStack.getTaskCount() == 0) return; - - // Return early if there is no running task (can't determine affiliated tasks in this case) - ActivityManager.RunningTaskInfo runningTask = - ActivityManagerWrapper.getInstance().getRunningTask(); - final int activityType = runningTask.configuration.windowConfiguration.getActivityType(); - if (runningTask == null) return; - // Return early if the running task is in the home/recents stack (optimization) - if (activityType == ACTIVITY_TYPE_HOME || activityType == ACTIVITY_TYPE_RECENTS) return; - - // Find the task in the recents list - ArrayList<Task> tasks = focusedStack.getTasks(); - Task toTask = null; - ActivityOptions launchOpts = null; - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - Task task = tasks.get(i); - if (task.key.id == runningTask.id) { - if (showNextTask) { - if ((i + 1) < taskCount) { - toTask = tasks.get(i + 1); - launchOpts = ActivityOptions.makeCustomAnimation(mContext, - R.anim.recents_launch_next_affiliated_task_target, - R.anim.recents_launch_next_affiliated_task_source); - } - } else { - if ((i - 1) >= 0) { - toTask = tasks.get(i - 1); - launchOpts = ActivityOptions.makeCustomAnimation(mContext, - R.anim.recents_launch_prev_affiliated_task_target, - R.anim.recents_launch_prev_affiliated_task_source); - } - } - break; - } - } - - // Return early if there is no next task - if (toTask == null) { - if (showNextTask) { - ssp.startInPlaceAnimationOnFrontMostApplication( - ActivityOptions.makeCustomInPlaceAnimation(mContext, - R.anim.recents_launch_next_affiliated_task_bounce)); - } else { - ssp.startInPlaceAnimationOnFrontMostApplication( - ActivityOptions.makeCustomInPlaceAnimation(mContext, - R.anim.recents_launch_prev_affiliated_task_bounce)); - } - return; - } - - // Keep track of actually launched affiliated tasks - MetricsLogger.count(mContext, "overview_affiliated_task_launch", 1); - - // Launch the task - ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(toTask.key, launchOpts, - null /* resultListener */, null /* resultCallbackHandler */); - } - - public void splitPrimaryTask(int taskId, int stackCreateMode, Rect initialBounds) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - - // Make sure we inform DividerView before we actually start the activity so we can change - // the resize mode already. - if (ssp.setTaskWindowingModeSplitScreenPrimary(taskId, stackCreateMode, initialBounds)) { - EventBus.getDefault().send(new DockedTopTaskEvent(initialBounds)); - } - } - - public void setWaitingForTransitionStart(boolean waitingForTransitionStart) { - if (mWaitingForTransitionStart == waitingForTransitionStart) { - return; - } - - mWaitingForTransitionStart = waitingForTransitionStart; - if (!waitingForTransitionStart && mToggleFollowingTransitionStart) { - mHandler.post(() -> toggleRecents(DividerView.INVALID_RECENTS_GROW_TARGET)); - } - mToggleFollowingTransitionStart = false; - } - - /** - * Returns the preloaded load plan and invalidates it. - */ - public static RecentsTaskLoadPlan consumeInstanceLoadPlan() { - RecentsTaskLoadPlan plan = sInstanceLoadPlan; - sInstanceLoadPlan = null; - return plan; - } - - /** - * @return the time at which a task last entered picture-in-picture. - */ - public static long getLastPipTime() { - return sLastPipTime; - } - - /** - * Clears the time at which a task last entered picture-in-picture. - */ - public static void clearLastPipTime() { - sLastPipTime = -1; - } - - /** - * Reloads all the resources for the current configuration. - */ - private void reloadResources() { - Resources res = mContext.getResources(); - - mTaskBarHeight = TaskStackLayoutAlgorithm.getDimensionForDevice(mContext, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height_tablet_land, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height_tablet_land, - R.dimen.recents_grid_task_view_header_height); - - LayoutInflater inflater = LayoutInflater.from(mContext); - mHeaderBar = (TaskViewHeader) inflater.inflate(R.layout.recents_task_view_header, - null, false); - mHeaderBar.setLayoutDirection(res.getConfiguration().getLayoutDirection()); - } - - private void updateDummyStackViewLayout(TaskStackLayoutAlgorithm stackLayout, - TaskStack stack, Rect windowRect) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - Rect displayRect = ssp.getDisplayRect(); - Rect systemInsets = new Rect(); - ssp.getStableInsets(systemInsets); - - // When docked, the nav bar insets are consumed and the activity is measured without insets. - // However, the window bounds include the insets, so we need to subtract them here to make - // them identical. - if (ssp.hasDockedTask()) { - if (systemInsets.bottom < windowRect.height()) { - // Only apply inset if it isn't going to cause the rect height to go negative. - windowRect.bottom -= systemInsets.bottom; - } - systemInsets.bottom = 0; - } - calculateWindowStableInsets(systemInsets, windowRect, displayRect); - windowRect.offsetTo(0, 0); - - // Rebind the header bar and draw it for the transition - stackLayout.setSystemInsets(systemInsets); - if (stack != null) { - stackLayout.getTaskStackBounds(displayRect, windowRect, systemInsets.top, - systemInsets.left, systemInsets.right, mTmpBounds); - stackLayout.reset(); - stackLayout.initialize(displayRect, windowRect, mTmpBounds); - } - } - - private Rect getWindowRect(Rect windowRectOverride) { - return windowRectOverride != null - ? new Rect(windowRectOverride) - : LegacyRecentsImpl.getSystemServices().getWindowRect(); - } - - /** - * Prepares the header bar layout for the next transition, if the task view bounds has changed - * since the last call, it will attempt to re-measure and layout the header bar to the new size. - * - * @param stack the stack to initialize the stack layout with - * @param windowRectOverride the rectangle to use when calculating the stack state which can - * be different from the current window rect if recents is resizing - * while being launched - */ - private void updateHeaderBarLayout(TaskStack stack, Rect windowRectOverride) { - Rect windowRect = getWindowRect(windowRectOverride); - int taskViewWidth = 0; - boolean useGridLayout = mDummyStackView.useGridLayout(); - updateDummyStackViewLayout(mDummyStackView.getStackAlgorithm(), stack, windowRect); - if (stack != null) { - TaskStackLayoutAlgorithm stackLayout = mDummyStackView.getStackAlgorithm(); - mDummyStackView.getStack().removeAllTasks(false /* notifyStackChanges */); - mDummyStackView.setTasks(stack, false /* allowNotifyStackChanges */); - // Get the width of a task view so that we know how wide to draw the header bar. - if (useGridLayout) { - TaskGridLayoutAlgorithm gridLayout = mDummyStackView.getGridAlgorithm(); - gridLayout.initialize(windowRect); - taskViewWidth = (int) gridLayout.getTransform(0 /* taskIndex */, - stack.getTaskCount(), new TaskViewTransform(), - stackLayout).rect.width(); - } else { - Rect taskViewBounds = stackLayout.getUntransformedTaskViewBounds(); - if (!taskViewBounds.isEmpty()) { - taskViewWidth = taskViewBounds.width(); - } - } - } - - if (stack != null && taskViewWidth > 0) { - synchronized (mHeaderBarLock) { - if (mHeaderBar.getMeasuredWidth() != taskViewWidth || - mHeaderBar.getMeasuredHeight() != mTaskBarHeight) { - if (useGridLayout) { - mHeaderBar.setShouldDarkenBackgroundColor(true); - mHeaderBar.setNoUserInteractionState(); - } - mHeaderBar.forceLayout(); - mHeaderBar.measure( - MeasureSpec.makeMeasureSpec(taskViewWidth, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(mTaskBarHeight, MeasureSpec.EXACTLY)); - } - mHeaderBar.layout(0, 0, taskViewWidth, mTaskBarHeight); - } - } - } - - /** - * Given the stable insets and the rect for our window, calculates the insets that affect our - * window. - */ - private void calculateWindowStableInsets(Rect inOutInsets, Rect windowRect, Rect displayRect) { - - // Display rect without insets - available app space - Rect appRect = new Rect(displayRect); - appRect.inset(inOutInsets); - - // Our window intersected with available app space - Rect windowRectWithInsets = new Rect(windowRect); - windowRectWithInsets.intersect(appRect); - inOutInsets.left = windowRectWithInsets.left - windowRect.left; - inOutInsets.top = windowRectWithInsets.top - windowRect.top; - inOutInsets.right = windowRect.right - windowRectWithInsets.right; - inOutInsets.bottom = windowRect.bottom - windowRectWithInsets.bottom; - } - - /** - * Preloads the icon of a task. - */ - private void preloadIcon(int runningTaskId) { - // Ensure that we load the running task's icon - RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options(); - launchOpts.runningTaskId = runningTaskId; - launchOpts.loadThumbnails = false; - launchOpts.onlyLoadForCache = true; - LegacyRecentsImpl.getTaskLoader().loadTasks(sInstanceLoadPlan, launchOpts); - } - - /** - * Creates the activity options for a unknown state->recents transition. - */ - protected ActivityOptions getUnknownTransitionActivityOptions() { - return ActivityOptions.makeCustomAnimation(mContext, - R.anim.recents_from_unknown_enter, - R.anim.recents_from_unknown_exit, - mHandler, null); - } - - /** - * Creates the activity options for a home->recents transition. - */ - protected ActivityOptions getHomeTransitionActivityOptions() { - return ActivityOptions.makeCustomAnimation(mContext, - R.anim.recents_from_launcher_enter, - R.anim.recents_from_launcher_exit, - mHandler, null); - } - - /** - * Creates the activity options for an app->recents transition. - */ - private Pair<ActivityOptions, AppTransitionAnimationSpecsFuture> - getThumbnailTransitionActivityOptions(ActivityManager.RunningTaskInfo runningTask, - Rect windowOverrideRect) { - final boolean isLowRamDevice = LegacyRecentsImpl.getConfiguration().isLowRamDevice; - - // Update the destination rect - Task toTask = new Task(); - TaskViewTransform toTransform = getThumbnailTransitionTransform(mDummyStackView, toTask, - windowOverrideRect); - - RectF toTaskRect = toTransform.rect; - AppTransitionAnimationSpecsFuture future = new AppTransitionAnimationSpecsFuture(mHandler) { - @Override - public List<AppTransitionAnimationSpecCompat> composeSpecs() { - Rect rect = new Rect(); - toTaskRect.round(rect); - Bitmap thumbnail = drawThumbnailTransitionBitmap(toTask, toTransform); - return Lists.newArrayList(new AppTransitionAnimationSpecCompat(toTask.key.id, - thumbnail, rect)); - } - }; - - // For low end ram devices, wait for transition flag is reset when Recents entrance - // animation is complete instead of when the transition animation starts - return new Pair<>(RecentsTransition.createAspectScaleAnimation(mContext, mHandler, - false /* scaleUp */, future, isLowRamDevice ? null : mResetToggleFlagListener), - future); - } - - /** - * Returns the transition rect for the given task id. - */ - private TaskViewTransform getThumbnailTransitionTransform(TaskStackView stackView, - Task runningTaskOut, Rect windowOverrideRect) { - // Find the running task in the TaskStack - TaskStack stack = stackView.getStack(); - Task launchTask = stack.getLaunchTarget(); - if (launchTask != null) { - runningTaskOut.copyFrom(launchTask); - } else { - // If no task is specified or we can not find the task just use the front most one - launchTask = stack.getFrontMostTask(); - runningTaskOut.copyFrom(launchTask); - } - - // Get the transform for the running task - stackView.updateLayoutAlgorithm(true /* boundScroll */); - stackView.updateToInitialState(); - stackView.getStackAlgorithm().getStackTransformScreenCoordinates(launchTask, - stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect); - return mTmpTransform; - } - - /** - * Draws the header of a task used for the window animation into a bitmap. - */ - private Bitmap drawThumbnailTransitionBitmap(Task toTask, - TaskViewTransform toTransform) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - int width = (int) toTransform.rect.width(); - int height = (int) toTransform.rect.height(); - if (toTransform != null && toTask.key != null && width > 0 && height > 0) { - synchronized (mHeaderBarLock) { - boolean disabledInSafeMode = !toTask.isSystemApp && ssp.isInSafeMode(); - mHeaderBar.onTaskViewSizeChanged(width, height); - if (RecentsDebugFlags.Static.EnableTransitionThumbnailDebugMode) { - return RecentsTransition.drawViewIntoHardwareBitmap(width, mTaskBarHeight, - null, 1f, 0xFFff0000); - } else { - // Workaround for b/27815919, reset the callback so that we do not trigger an - // invalidate on the header bar as a result of updating the icon - Drawable icon = mHeaderBar.getIconView().getDrawable(); - if (icon != null) { - icon.setCallback(null); - } - mHeaderBar.bindToTask(toTask, false /* touchExplorationEnabled */, - disabledInSafeMode); - mHeaderBar.onTaskDataLoaded(); - mHeaderBar.setDimAlpha(toTransform.dimAlpha); - return RecentsTransition.drawViewIntoHardwareBitmap(width, mTaskBarHeight, - mHeaderBar, 1f, 0); - } - } - } - return null; - } - - /** - * Shows the recents activity after dismissing the keyguard if visible - */ - protected void startRecentsActivityAndDismissKeyguardIfNeeded( - final ActivityManager.RunningTaskInfo runningTask, final boolean isHomeStackVisible, - final boolean animate, final int growTarget) { - // Preload only if device for current user is unlocked - final StatusBar statusBar = getStatusBar(); - if (statusBar != null && statusBar.isKeyguardShowing()) { - statusBar.executeRunnableDismissingKeyguard(() -> { - // Flush trustmanager before checking device locked per user when preloading - mTrustManager.reportKeyguardShowingChanged(); - mHandler.post(() -> startRecentsActivity(runningTask, isHomeStackVisible, - animate, growTarget)); - }, null, true /* dismissShade */, false /* afterKeyguardGone */, - true /* deferred */); - } else { - startRecentsActivity(runningTask, isHomeStackVisible, animate, growTarget); - } - } - - private void startRecentsActivity(ActivityManager.RunningTaskInfo runningTask, - boolean isHomeStackVisible, boolean animate, int growTarget) { - RecentsTaskLoader loader = LegacyRecentsImpl.getTaskLoader(); - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - - int runningTaskId = !mLaunchedWhileDocking && (runningTask != null) - ? runningTask.id - : -1; - - // In the case where alt-tab is triggered, we never get a preloadRecents() call, so we - // should always preload the tasks now. If we are dragging in recents, reload them as - // the stacks might have changed. - if (mLaunchedWhileDocking || mTriggeredFromAltTab || sInstanceLoadPlan == null) { - // Create a new load plan if preloadRecents() was never triggered - sInstanceLoadPlan = new RecentsTaskLoadPlan(mContext); - } - if (mLaunchedWhileDocking || mTriggeredFromAltTab || !sInstanceLoadPlan.hasTasks()) { - loader.preloadTasks(sInstanceLoadPlan, runningTaskId); - } - - TaskStack stack = sInstanceLoadPlan.getTaskStack(); - boolean hasRecentTasks = stack.getTaskCount() > 0; - boolean useThumbnailTransition = (runningTask != null) && !isHomeStackVisible && - hasRecentTasks; - - // Update the launch state that we need in updateHeaderBarLayout() - launchState.launchedFromHome = !useThumbnailTransition && !mLaunchedWhileDocking; - launchState.launchedFromApp = useThumbnailTransition || mLaunchedWhileDocking; - launchState.launchedFromPipApp = false; - launchState.launchedWithNextPipApp = - stack.isNextLaunchTargetPip(RecentsImpl.getLastPipTime()); - launchState.launchedViaDockGesture = mLaunchedWhileDocking; - launchState.launchedViaDragGesture = mDraggingInRecents; - launchState.launchedToTaskId = runningTaskId; - launchState.launchedWithAltTab = mTriggeredFromAltTab; - - // Disable toggling of recents between starting the activity and it is visible and the app - // has started its transition into recents. - setWaitingForTransitionStart(useThumbnailTransition); - - // Preload the icon (this will be a null-op if we have preloaded the icon already in - // preloadRecents()) - preloadIcon(runningTaskId); - - // Update the header bar if necessary - Rect windowOverrideRect = getWindowRectOverride(growTarget); - updateHeaderBarLayout(stack, windowOverrideRect); - - // Prepare the dummy stack for the transition - TaskStackLayoutAlgorithm.VisibilityReport stackVr = - mDummyStackView.computeStackVisibilityReport(); - - // Update the remaining launch state - launchState.launchedNumVisibleTasks = stackVr.numVisibleTasks; - launchState.launchedNumVisibleThumbnails = stackVr.numVisibleThumbnails; - - if (!animate) { - startRecentsActivity(ActivityOptions.makeCustomAnimation(mContext, -1, -1), - null /* future */); - return; - } - - Pair<ActivityOptions, AppTransitionAnimationSpecsFuture> pair; - if (useThumbnailTransition) { - // Try starting with a thumbnail transition - pair = getThumbnailTransitionActivityOptions(runningTask, windowOverrideRect); - } else { - // If there is no thumbnail transition, but is launching from home into recents, then - // use a quick home transition - pair = new Pair<>(hasRecentTasks - ? getHomeTransitionActivityOptions() - : getUnknownTransitionActivityOptions(), null); - } - startRecentsActivity(pair.first, pair.second); - mLastToggleTime = SystemClock.elapsedRealtime(); - } - - private Rect getWindowRectOverride(int growTarget) { - if (growTarget == DividerView.INVALID_RECENTS_GROW_TARGET) { - return SystemServicesProxy.getInstance(mContext).getWindowRect(); - } - Rect result = new Rect(); - Rect displayRect = LegacyRecentsImpl.getSystemServices().getDisplayRect(); - DockedDividerUtils.calculateBoundsForPosition(growTarget, WindowManager.DOCKED_BOTTOM, - result, displayRect.width(), displayRect.height(), - LegacyRecentsImpl.getSystemServices().getDockedDividerSize(mContext)); - return result; - } - - private StatusBar getStatusBar() { - return SysUiServiceProvider.getComponent(mContext, StatusBar.class); - } - - /** - * Starts the recents activity. - */ - private void startRecentsActivity(ActivityOptions opts, - final AppTransitionAnimationSpecsFuture future) { - Intent intent = new Intent(); - intent.setClassName(RECENTS_PACKAGE, RECENTS_ACTIVITY); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS - | Intent.FLAG_ACTIVITY_TASK_ON_HOME); - HidePipMenuEvent hideMenuEvent = new HidePipMenuEvent(); - hideMenuEvent.addPostAnimationCallback(() -> { - LegacyRecentsImpl.getSystemServices().startActivityAsUserAsync(intent, opts); - EventBus.getDefault().send(new RecentsActivityStartingEvent()); - if (future != null) { - future.composeSpecsSynchronous(); - } - }); - EventBus.getDefault().send(hideMenuEvent); - - // Once we have launched the activity, reset the dummy stack view tasks so we don't hold - // onto references to the same tasks consumed by the activity - mDummyStackView.setTasks(mEmptyTaskStack, false /* notifyStackChanges */); - } - - /**** OnAnimationFinishedListener Implementation ****/ - - @Override - public void onAnimationFinished() { - EventBus.getDefault().post(new EnterRecentsWindowLastAnimationFrameEvent()); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsImplProxy.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsImplProxy.java deleted file mode 100644 index a1da785f2a80..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsImplProxy.java +++ /dev/null @@ -1,161 +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 - */ - -package com.android.systemui.recents; - -import android.graphics.Rect; -import android.os.Handler; -import android.os.Message; -import android.os.RemoteException; - -import com.android.internal.os.SomeArgs; - -/** - * A proxy class which directs all methods from {@link IRecentsNonSystemUserCallbacks} to - * {@link RecentsImpl} and makes sure they are called from the main thread. - */ -public class RecentsImplProxy extends IRecentsNonSystemUserCallbacks.Stub { - - private static final int MSG_PRELOAD_RECENTS = 1; - private static final int MSG_CANCEL_PRELOADING_RECENTS = 2; - private static final int MSG_SHOW_RECENTS = 3; - private static final int MSG_HIDE_RECENTS = 4; - private static final int MSG_TOGGLE_RECENTS = 5; - private static final int MSG_ON_CONFIGURATION_CHANGED = 6; - private static final int MSG_DOCK_TOP_TASK = 7; - private static final int MSG_ON_DRAGGING_IN_RECENTS = 8; - private static final int MSG_ON_DRAGGING_IN_RECENTS_ENDED = 9; - private static final int MSG_SHOW_USER_TOAST = 10; - - private RecentsImpl mImpl; - - public RecentsImplProxy(RecentsImpl recentsImpl) { - mImpl = recentsImpl; - } - - @Override - public void preloadRecents() throws RemoteException { - mHandler.sendEmptyMessage(MSG_PRELOAD_RECENTS); - } - - @Override - public void cancelPreloadingRecents() throws RemoteException { - mHandler.sendEmptyMessage(MSG_CANCEL_PRELOADING_RECENTS); - } - - @Override - public void showRecents(boolean triggeredFromAltTab, boolean draggingInRecents, boolean animate, - int growTarget) throws RemoteException { - SomeArgs args = SomeArgs.obtain(); - args.argi1 = triggeredFromAltTab ? 1 : 0; - args.argi2 = draggingInRecents ? 1 : 0; - args.argi3 = animate ? 1 : 0; - args.argi4 = growTarget; - mHandler.sendMessage(mHandler.obtainMessage(MSG_SHOW_RECENTS, args)); - } - - @Override - public void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) - throws RemoteException { - mHandler.sendMessage(mHandler.obtainMessage(MSG_HIDE_RECENTS, triggeredFromAltTab ? 1 :0, - triggeredFromHomeKey ? 1 : 0)); - } - - @Override - public void toggleRecents(int growTarget) throws RemoteException { - SomeArgs args = SomeArgs.obtain(); - args.argi1 = growTarget; - mHandler.sendMessage(mHandler.obtainMessage(MSG_TOGGLE_RECENTS, args)); - } - - @Override - public void onConfigurationChanged() throws RemoteException { - mHandler.sendEmptyMessage(MSG_ON_CONFIGURATION_CHANGED); - } - - @Override - public void splitPrimaryTask(int topTaskId, int stackCreateMode, Rect initialBounds) - throws RemoteException { - SomeArgs args = SomeArgs.obtain(); - args.argi1 = topTaskId; - args.argi2 = stackCreateMode; - args.arg1 = initialBounds; - mHandler.sendMessage(mHandler.obtainMessage(MSG_DOCK_TOP_TASK, args)); - } - - @Override - public void onDraggingInRecents(float distanceFromTop) throws RemoteException { - mHandler.sendMessage(mHandler.obtainMessage(MSG_ON_DRAGGING_IN_RECENTS, distanceFromTop)); - } - - @Override - public void onDraggingInRecentsEnded(float velocity) throws RemoteException { - mHandler.sendMessage(mHandler.obtainMessage(MSG_ON_DRAGGING_IN_RECENTS_ENDED, velocity)); - } - - @Override - public void showCurrentUserToast(int msgResId, int msgLength) { - mHandler.sendMessage(mHandler.obtainMessage(MSG_SHOW_USER_TOAST, msgResId, msgLength)); - } - - private final Handler mHandler = new Handler() { - - @Override - public void handleMessage(Message msg) { - SomeArgs args; - switch (msg.what) { - case MSG_PRELOAD_RECENTS: - mImpl.preloadRecents(); - break; - case MSG_CANCEL_PRELOADING_RECENTS: - mImpl.cancelPreloadingRecents(); - break; - case MSG_SHOW_RECENTS: - args = (SomeArgs) msg.obj; - mImpl.showRecents(args.argi1 != 0, args.argi2 != 0, args.argi3 != 0, - args.argi4); - break; - case MSG_HIDE_RECENTS: - mImpl.hideRecents(msg.arg1 != 0, msg.arg2 != 0); - break; - case MSG_TOGGLE_RECENTS: - args = (SomeArgs) msg.obj; - mImpl.toggleRecents(args.argi1); - break; - case MSG_ON_CONFIGURATION_CHANGED: - mImpl.onConfigurationChanged(); - break; - case MSG_DOCK_TOP_TASK: - args = (SomeArgs) msg.obj; - mImpl.splitPrimaryTask(args.argi1, args.argi2 = 0, - (Rect) args.arg1); - break; - case MSG_ON_DRAGGING_IN_RECENTS: - mImpl.onDraggingInRecents((Float) msg.obj); - break; - case MSG_ON_DRAGGING_IN_RECENTS_ENDED: - mImpl.onDraggingInRecentsEnded((Float) msg.obj); - break; - case MSG_SHOW_USER_TOAST: - mImpl.onShowCurrentUserToast(msg.arg1, msg.arg2); - break; - default: - super.handleMessage(msg); - } - super.handleMessage(msg); - } - }; -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsSystemUser.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsSystemUser.java deleted file mode 100644 index c5e9f046aa16..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsSystemUser.java +++ /dev/null @@ -1,121 +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. - */ - -package com.android.systemui.recents; - -import android.content.Context; -import android.graphics.Rect; -import android.os.IBinder; -import android.os.RemoteException; -import android.util.EventLog; -import android.util.Log; -import android.util.SparseArray; - -import com.android.systemui.EventLogConstants; -import com.android.systemui.EventLogTags; -import com.android.systemui.pip.phone.ForegroundThread; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.DockedFirstAnimationFrameEvent; -import com.android.systemui.recents.events.activity.DockedTopTaskEvent; -import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; -import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; -import com.android.systemui.recents.events.ui.RecentsDrawnEvent; - -/** - * An implementation of the system user's Recents interface to be called remotely by secondary - * users. - */ -public class RecentsSystemUser extends IRecentsSystemUserCallbacks.Stub { - - private static final String TAG = "RecentsSystemUser"; - - private Context mContext; - private RecentsImpl mImpl; - private final SparseArray<IRecentsNonSystemUserCallbacks> mNonSystemUserRecents = - new SparseArray<>(); - - public RecentsSystemUser(Context context, RecentsImpl impl) { - mContext = context; - mImpl = impl; - } - - @Override - public void registerNonSystemUserCallbacks(final IBinder nonSystemUserCallbacks, - final int userId) { - try { - final IRecentsNonSystemUserCallbacks callback = - IRecentsNonSystemUserCallbacks.Stub.asInterface(nonSystemUserCallbacks); - nonSystemUserCallbacks.linkToDeath(new IBinder.DeathRecipient() { - @Override - public void binderDied() { - mNonSystemUserRecents.removeAt(mNonSystemUserRecents.indexOfValue(callback)); - EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, - EventLogConstants.SYSUI_RECENTS_CONNECTION_SYSTEM_UNREGISTER_USER, - userId); - } - }, 0); - mNonSystemUserRecents.put(userId, callback); - EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, - EventLogConstants.SYSUI_RECENTS_CONNECTION_SYSTEM_REGISTER_USER, userId); - } catch (RemoteException e) { - Log.e(TAG, "Failed to register NonSystemUserCallbacks", e); - } - } - - public IRecentsNonSystemUserCallbacks getNonSystemUserRecentsForUser(int userId) { - return mNonSystemUserRecents.get(userId); - } - - @Override - public void updateRecentsVisibility(boolean visible) { - ForegroundThread.getHandler().post(() -> { - mImpl.onVisibilityChanged(mContext, visible); - }); - } - - @Override - public void startScreenPinning(int taskId) { - ForegroundThread.getHandler().post(() -> { - mImpl.onStartScreenPinning(mContext, taskId); - }); - } - - @Override - public void sendRecentsDrawnEvent() { - EventBus.getDefault().post(new RecentsDrawnEvent()); - } - - @Override - public void sendDockingTopTaskEvent(Rect initialRect) throws RemoteException { - EventBus.getDefault().post(new DockedTopTaskEvent(initialRect)); - } - - @Override - public void sendLaunchRecentsEvent() throws RemoteException { - EventBus.getDefault().post(new RecentsActivityStartingEvent()); - } - - @Override - public void sendDockedFirstAnimationFrameEvent() throws RemoteException { - EventBus.getDefault().post(new DockedFirstAnimationFrameEvent()); - } - - @Override - public void setWaitingForTransitionStartEvent(boolean waitingForTransitionStart) { - EventBus.getDefault().post(new SetWaitingForTransitionStartEvent( - waitingForTransitionStart)); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsSystemUserService.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsSystemUserService.java deleted file mode 100644 index b5a0181c7d56..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsSystemUserService.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2010 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.recents; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; -import android.util.Log; - -import com.android.systemui.SysUiServiceProvider; - -/** - * A strictly system-user service that is started by the secondary user's Recents (with a limited - * lifespan), to get the interface that the secondary user's Recents can call through to the system - * user's Recents. - */ -public class RecentsSystemUserService extends Service { - - private static final String TAG = "RecentsSystemUserService"; - private static final boolean DEBUG = false; - - @Override - public void onCreate() { - super.onCreate(); - } - - @Override - public IBinder onBind(Intent intent) { - LegacyRecentsImpl recents = SysUiServiceProvider.getComponent(this, LegacyRecentsImpl.class); - if (DEBUG) { - Log.d(TAG, "onBind: " + recents); - } - if (recents != null) { - return recents.getSystemUserCallbacks(); - } - return null; - } -} - diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/EventBus.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/EventBus.java deleted file mode 100644 index 177362cf60aa..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/EventBus.java +++ /dev/null @@ -1,763 +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.systemui.recents.events; - -import android.os.Handler; -import android.os.Looper; -import android.os.SystemClock; -import android.os.UserHandle; -import android.util.Log; - -import com.android.systemui.recents.misc.ReferenceCountedTrigger; - -import java.io.PrintWriter; -import java.lang.ref.WeakReference; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; - -/** - * Represents a subscriber, which implements various event bus handler methods. - */ -class Subscriber { - private WeakReference<Object> mSubscriber; - - long registrationTime; - - Subscriber(Object subscriber, long registrationTime) { - mSubscriber = new WeakReference<>(subscriber); - this.registrationTime = registrationTime; - } - - public String toString(int priority) { - Object sub = mSubscriber.get(); - String id = Integer.toHexString(System.identityHashCode(sub)); - return sub.getClass().getSimpleName() + " [0x" + id + ", P" + priority + "]"; - } - - public Object getReference() { - return mSubscriber.get(); - } -} - -/** - * Represents an event handler with a priority. - */ -class EventHandler { - int priority; - Subscriber subscriber; - EventHandlerMethod method; - - EventHandler(Subscriber subscriber, EventHandlerMethod method, int priority) { - this.subscriber = subscriber; - this.method = method; - this.priority = priority; - } - - @Override - public String toString() { - return subscriber.toString(priority) + " " + method.toString(); - } -} - -/** - * Represents the low level method handling a particular event. - */ -class EventHandlerMethod { - private Method mMethod; - Class<? extends EventBus.Event> eventType; - - EventHandlerMethod(Method method, Class<? extends EventBus.Event> eventType) { - mMethod = method; - mMethod.setAccessible(true); - this.eventType = eventType; - } - - public void invoke(Object target, EventBus.Event event) - throws InvocationTargetException, IllegalAccessException { - mMethod.invoke(target, event); - } - - @Override - public String toString() { - return mMethod.getName() + "(" + eventType.getSimpleName() + ")"; - } -} - -/** - * A simple in-process event bus. It is simple because we can make assumptions about the state of - * SystemUI and Recent's lifecycle. - * - * <p> - * Currently, there is a single EventBus that handles {@link EventBus.Event}s for each subscriber - * on the main application thread. Publishers can send() events to synchronously call subscribers - * of that event, or post() events to be processed in the next run of the {@link Looper}. - * - * <p> - * Subscribers must be registered with a particular EventBus before they will receive events, and - * handler methods must match a specific signature. - * - * <p> - * Event method signature:<ul> - * <li>Methods must be public final - * <li>Methods must return void - * <li>Methods must be called "onBusEvent" - * <li>Methods must take one parameter, of class type deriving from {@link EventBus.Event} - * </ul> - * - * </p> - * Each subscriber can be registered with a given priority (default 1), and events will be dispatch - * in decreasing order of priority. For subscribers with the same priority, events will be - * dispatched by latest registration time to earliest. - * - * <p> - * Caveats:<ul> - * <li>The EventBus keeps a {@link WeakReference} to the publisher to prevent memory leaks, so - * there must be another strong reference to the publisher for it to not get garbage-collected and - * continue receiving events. - * <li>Because the event handlers are called back using reflection, the EventBus is not intended - * for use in tight, performance criticial loops. For most user input/system callback events, this - * is generally of low enough frequency to use the EventBus. - * <li>Because the event handlers are called back using reflection, there will often be no - * references to them from actual code. The proguard configuration will be need to be updated to - * keep these extra methods: - * - * -keepclassmembers class ** { - * public void onBusEvent(**); - * public void onInterprocessBusEvent(**); - * } - * -keepclassmembers class ** extends **.EventBus$InterprocessEvent { - * public <init>(android.os.Bundle); - * } - * - * <li>Subscriber registration can be expensive depending on the subscriber's {@link Class}. This - * is only done once per class type, but if possible, it is best to pre-register an instance of - * that class beforehand or when idle. - * <li>Each event should be sent once. Events may hold internal information about the current - * dispatch, or may be queued to be dispatched on another thread (if posted from a non-main thread), - * so it may be unsafe to edit, change, or re-send the event again. - * <li>Events should follow a pattern of public-final POD (plain old data) objects, where they are - * initialized by the constructor and read by each subscriber of that event. Subscribers should - * never alter events as they are processed, and this enforces that pattern. - * </ul> - * - * <p> - * Future optimizations: - * <li>throw exception/log when a subscriber loses the reference - * <li>trace cost per registration & invocation - * <li>trace cross-process invocation - * <li>register(subscriber, Class<?>...) -- pass in exact class types you want registered - * <li>setSubscriberEventHandlerPriority(subscriber, Class<Event>, priority) - * <li>allow subscribers to implement interface, ie. EventBus.Subscriber, which lets then test a - * message before invocation (ie. check if task id == this task id) - * <li>add postOnce() which automatically debounces - * <li>add postDelayed() which delays / postDelayedOnce() which delays and bounces - * <li>consolidate register() and registerInterprocess() - * <li>sendForResult<ReturnType>(Event) to send and get a result, but who will send the - * result? - * </p> - */ -public class EventBus { - - private static final String TAG = "EventBus"; - private static final boolean DEBUG_TRACE_ALL = false; - - /** - * An event super class that allows us to track internal event state across subscriber - * invocations. - * - * Events should not be edited by subscribers. - */ - public static class Event implements Cloneable { - // Indicates that this event's dispatch should be traced and logged to logcat - boolean trace; - // Indicates that this event must be posted on the EventBus's looper thread before invocation - boolean requiresPost; - // Not currently exposed, allows a subscriber to cancel further dispatch of this event - boolean cancelled; - - // Only accessible from derived events - protected Event() {} - - /** - * Called by the EventBus prior to dispatching this event to any subscriber of this event. - */ - void onPreDispatch() { - // Do nothing - } - - /** - * Called by the EventBus after dispatching this event to every subscriber of this event. - */ - void onPostDispatch() { - // Do nothing - } - - @Override - protected Object clone() throws CloneNotSupportedException { - Event evt = (Event) super.clone(); - // When cloning an event, reset the cancelled-dispatch state - evt.cancelled = false; - return evt; - } - } - - /** - * An event that represents an animated state change, which allows subscribers to coordinate - * callbacks which happen after the animation has taken place. - * - * Internally, it is guaranteed that increment() and decrement() will be called before and the - * after the event is dispatched. - */ - public static class AnimatedEvent extends Event { - - private final ReferenceCountedTrigger mTrigger = new ReferenceCountedTrigger(); - - // Only accessible from derived events - protected AnimatedEvent() {} - - /** - * Returns the reference counted trigger that coordinates the animations for this event. - */ - public ReferenceCountedTrigger getAnimationTrigger() { - return mTrigger; - } - - /** - * Adds a callback that is guaranteed to be called after the state has changed regardless of - * whether an actual animation took place. - */ - public void addPostAnimationCallback(Runnable r) { - mTrigger.addLastDecrementRunnable(r); - } - - @Override - void onPreDispatch() { - mTrigger.increment(); - } - - @Override - void onPostDispatch() { - mTrigger.decrement(); - } - - @Override - protected Object clone() throws CloneNotSupportedException { - throw new CloneNotSupportedException(); - } - } - - /** - * An event that can be reusable, only used for situations where we want to reduce memory - * allocations when events are sent frequently (ie. on scroll). - */ - public static class ReusableEvent extends Event { - - private int mDispatchCount; - - protected ReusableEvent() {} - - @Override - void onPostDispatch() { - super.onPostDispatch(); - mDispatchCount++; - } - - @Override - protected Object clone() throws CloneNotSupportedException { - throw new CloneNotSupportedException(); - } - } - - /** - * Proguard must also know, and keep, all methods matching this signature. - * - * -keepclassmembers class ** { - * public void onBusEvent(**); - * public void onInterprocessBusEvent(**); - * } - */ - private static final String METHOD_PREFIX = "onBusEvent"; - - // The default priority of all subscribers - private static final int DEFAULT_SUBSCRIBER_PRIORITY = 1; - - // Orders the handlers by priority and registration time - private static final Comparator<EventHandler> EVENT_HANDLER_COMPARATOR = new Comparator<EventHandler>() { - @Override - public int compare(EventHandler h1, EventHandler h2) { - // Rank the handlers by priority descending, followed by registration time descending. - // aka. the later registered - if (h1.priority != h2.priority) { - return h2.priority - h1.priority; - } else { - return Long.compare(h2.subscriber.registrationTime, h1.subscriber.registrationTime); - } - } - }; - - // Used for initializing the default bus - private static final Object sLock = new Object(); - private static volatile EventBus sDefaultBus; - - // The handler to post all events - private Handler mHandler; - - /** - * Map from event class -> event handler list. Keeps track of the actual mapping from event - * to subscriber method. - */ - private HashMap<Class<? extends Event>, ArrayList<EventHandler>> mEventTypeMap = new HashMap<>(); - - /** - * Map from subscriber class -> event handler method lists. Used to determine upon registration - * of a new subscriber whether we need to read all the subscriber's methods again using - * reflection or whether we can just add the subscriber to the event type map. - */ - private HashMap<Class<? extends Object>, ArrayList<EventHandlerMethod>> mSubscriberTypeMap = new HashMap<>(); - - /** - * Set of all currently registered subscribers - */ - private ArrayList<Subscriber> mSubscribers = new ArrayList<>(); - - // For tracing - private int mCallCount; - private long mCallDurationMicros; - - /** - * Private constructor to create an event bus for a given looper. - */ - private EventBus(Looper looper) { - mHandler = new Handler(looper); - } - - /** - * @return the default event bus for the application's main thread. - */ - public static EventBus getDefault() { - if (sDefaultBus == null) - synchronized (sLock) { - if (sDefaultBus == null) { - if (DEBUG_TRACE_ALL) { - logWithPid("New EventBus"); - } - sDefaultBus = new EventBus(Looper.getMainLooper()); - } - } - return sDefaultBus; - } - - /** - * Registers a subscriber to receive events with the default priority. - * - * @param subscriber the subscriber to handle events. If this is the first instance of the - * subscriber's class type that has been registered, the class's methods will - * be scanned for appropriate event handler methods. - */ - public void register(Object subscriber) { - registerSubscriber(subscriber, DEFAULT_SUBSCRIBER_PRIORITY); - } - - /** - * Registers a subscriber to receive events with the given priority. - * - * @param subscriber the subscriber to handle events. If this is the first instance of the - * subscriber's class type that has been registered, the class's methods will - * be scanned for appropriate event handler methods. - * @param priority the priority that this subscriber will receive events relative to other - * subscribers - */ - public void register(Object subscriber, int priority) { - registerSubscriber(subscriber, priority); - } - - /** - * Remove all EventHandlers pointing to the specified subscriber. This does not remove the - * mapping of subscriber type to event handler method, in case new instances of this subscriber - * are registered. - */ - public void unregister(Object subscriber) { - if (DEBUG_TRACE_ALL) { - logWithPid("unregister()"); - } - - // Fail immediately if we are being called from the non-main thread - long callingThreadId = Thread.currentThread().getId(); - if (callingThreadId != mHandler.getLooper().getThread().getId()) { - throw new RuntimeException("Can not unregister() a subscriber from a non-main thread."); - } - - // Return early if this is not a registered subscriber - if (!findRegisteredSubscriber(subscriber, true /* removeFoundSubscriber */)) { - return; - } - - Class<?> subscriberType = subscriber.getClass(); - ArrayList<EventHandlerMethod> subscriberMethods = mSubscriberTypeMap.get(subscriberType); - if (subscriberMethods != null) { - // For each of the event handlers the subscriber handles, remove all references of that - // handler - for (EventHandlerMethod method : subscriberMethods) { - ArrayList<EventHandler> eventHandlers = mEventTypeMap.get(method.eventType); - for (int i = eventHandlers.size() - 1; i >= 0; i--) { - if (eventHandlers.get(i).subscriber.getReference() == subscriber) { - eventHandlers.remove(i); - } - } - } - } - } - - /** - * Sends an event to the subscribers of the given event type immediately. This can only be - * called from the same thread as the EventBus's looper thread (for the default EventBus, this - * is the main application thread). - */ - public void send(Event event) { - // Fail immediately if we are being called from the non-main thread - long callingThreadId = Thread.currentThread().getId(); - if (callingThreadId != mHandler.getLooper().getThread().getId()) { - throw new RuntimeException("Can not send() a message from a non-main thread."); - } - - if (DEBUG_TRACE_ALL) { - logWithPid("send(" + event.getClass().getSimpleName() + ")"); - } - - // Reset the event's cancelled state - event.requiresPost = false; - event.cancelled = false; - queueEvent(event); - } - - /** - * Post a message to the subscribers of the given event type. The messages will be posted on - * the EventBus's looper thread (for the default EventBus, this is the main application thread). - */ - public void post(Event event) { - if (DEBUG_TRACE_ALL) { - logWithPid("post(" + event.getClass().getSimpleName() + ")"); - } - - // Reset the event's cancelled state - event.requiresPost = true; - event.cancelled = false; - queueEvent(event); - } - - /** - * If this method is called from the main thread, it will be handled directly. If this method - * is not called from the main thread, it will be posted onto the main thread. - */ - public void sendOntoMainThread(Event event) { - long callingThreadId = Thread.currentThread().getId(); - if (callingThreadId != mHandler.getLooper().getThread().getId()) { - post(event); - } else { - send(event); - } - } - - /** - * @return a dump of the current state of the EventBus - */ - public void dump(String prefix, PrintWriter writer) { - writer.println(dumpInternal(prefix)); - } - - public String dumpInternal(String prefix) { - String innerPrefix = prefix + " "; - String innerInnerPrefix = innerPrefix + " "; - StringBuilder output = new StringBuilder(); - output.append(prefix); - output.append("Registered class types:"); - output.append("\n"); - ArrayList<Class<?>> subsciberTypes = new ArrayList<>(mSubscriberTypeMap.keySet()); - Collections.sort(subsciberTypes, new Comparator<Class<?>>() { - @Override - public int compare(Class<?> o1, Class<?> o2) { - return o1.getSimpleName().compareTo(o2.getSimpleName()); - } - }); - for (int i = 0; i < subsciberTypes.size(); i++) { - Class<?> clz = subsciberTypes.get(i); - output.append(innerPrefix); - output.append(clz.getSimpleName()); - output.append("\n"); - } - output.append(prefix); - output.append("Event map:"); - output.append("\n"); - ArrayList<Class<?>> classes = new ArrayList<>(mEventTypeMap.keySet()); - Collections.sort(classes, new Comparator<Class<?>>() { - @Override - public int compare(Class<?> o1, Class<?> o2) { - return o1.getSimpleName().compareTo(o2.getSimpleName()); - } - }); - for (int i = 0; i < classes.size(); i++) { - Class<?> clz = classes.get(i); - output.append(innerPrefix); - output.append(clz.getSimpleName()); - output.append(" -> "); - output.append("\n"); - ArrayList<EventHandler> handlers = mEventTypeMap.get(clz); - for (EventHandler handler : handlers) { - Object subscriber = handler.subscriber.getReference(); - if (subscriber != null) { - String id = Integer.toHexString(System.identityHashCode(subscriber)); - output.append(innerInnerPrefix); - output.append(subscriber.getClass().getSimpleName()); - output.append(" [0x" + id + ", #" + handler.priority + "]"); - output.append("\n"); - } - } - } - return output.toString(); - } - - /** - * Registers a new subscriber. - */ - private void registerSubscriber(Object subscriber, int priority) { - // Fail immediately if we are being called from the non-main thread - long callingThreadId = Thread.currentThread().getId(); - if (callingThreadId != mHandler.getLooper().getThread().getId()) { - throw new RuntimeException("Can not register() a subscriber from a non-main thread."); - } - - // Return immediately if this exact subscriber is already registered - if (findRegisteredSubscriber(subscriber, false /* removeFoundSubscriber */)) { - return; - } - - long t1 = 0; - if (DEBUG_TRACE_ALL) { - t1 = SystemClock.currentTimeMicro(); - logWithPid("registerSubscriber(" + subscriber.getClass().getSimpleName() + ")"); - } - Subscriber sub = new Subscriber(subscriber, SystemClock.uptimeMillis()); - Class<?> subscriberType = subscriber.getClass(); - ArrayList<EventHandlerMethod> subscriberMethods = mSubscriberTypeMap.get(subscriberType); - if (subscriberMethods != null) { - if (DEBUG_TRACE_ALL) { - logWithPid("Subscriber class type already registered"); - } - - // If we've parsed this subscriber type before, just add to the set for all the known - // events - for (EventHandlerMethod method : subscriberMethods) { - ArrayList<EventHandler> eventTypeHandlers = mEventTypeMap.get(method.eventType); - eventTypeHandlers.add(new EventHandler(sub, method, priority)); - sortEventHandlersByPriority(eventTypeHandlers); - } - mSubscribers.add(sub); - return; - } else { - if (DEBUG_TRACE_ALL) { - logWithPid("Subscriber class type requires registration"); - } - - // If we are parsing this type from scratch, ensure we add it to the subscriber type - // map, and pull out he handler methods below - subscriberMethods = new ArrayList<>(); - mSubscriberTypeMap.put(subscriberType, subscriberMethods); - mSubscribers.add(sub); - } - - // Find all the valid event bus handler methods of the subscriber - Method[] methods = subscriberType.getDeclaredMethods(); - for (Method m : methods) { - Class<?>[] parameterTypes = m.getParameterTypes(); - if (isValidEventBusHandlerMethod(m, parameterTypes)) { - Class<? extends Event> eventType = (Class<? extends Event>) parameterTypes[0]; - ArrayList<EventHandler> eventTypeHandlers = mEventTypeMap.get(eventType); - if (eventTypeHandlers == null) { - eventTypeHandlers = new ArrayList<>(); - mEventTypeMap.put(eventType, eventTypeHandlers); - } - EventHandlerMethod method = new EventHandlerMethod(m, eventType); - EventHandler handler = new EventHandler(sub, method, priority); - eventTypeHandlers.add(handler); - subscriberMethods.add(method); - sortEventHandlersByPriority(eventTypeHandlers); - - if (DEBUG_TRACE_ALL) { - logWithPid(" * Method: " + m.getName() + - " event: " + parameterTypes[0].getSimpleName()); - } - } - } - if (DEBUG_TRACE_ALL) { - logWithPid("Registered " + subscriber.getClass().getSimpleName() + " in " + - (SystemClock.currentTimeMicro() - t1) + " microseconds"); - } - } - - /** - * Adds a new message. - */ - private void queueEvent(final Event event) { - ArrayList<EventHandler> eventHandlers = mEventTypeMap.get(event.getClass()); - if (eventHandlers == null) { - // This is just an optimization to return early if there are no handlers. However, we - // should still ensure that we call pre/post dispatch callbacks so that AnimatedEvents - // are still cleaned up correctly if a listener has not been registered to handle them - event.onPreDispatch(); - event.onPostDispatch(); - return; - } - - // Prepare this event - boolean hasPostedEvent = false; - event.onPreDispatch(); - - // We need to clone the list in case a subscriber unregisters itself during traversal - // TODO: Investigate whether we can skip the object creation here - eventHandlers = (ArrayList<EventHandler>) eventHandlers.clone(); - int eventHandlerCount = eventHandlers.size(); - for (int i = 0; i < eventHandlerCount; i++) { - final EventHandler eventHandler = eventHandlers.get(i); - if (eventHandler.subscriber.getReference() != null) { - if (event.requiresPost) { - mHandler.post(() -> processEvent(eventHandler, event)); - hasPostedEvent = true; - } else { - processEvent(eventHandler, event); - } - } - } - - // Clean up after this event, deferring until all subscribers have been called - if (hasPostedEvent) { - mHandler.post(event::onPostDispatch); - } else { - event.onPostDispatch(); - } - } - - /** - * Processes and dispatches the given event to the given event handler, on the thread of whoever - * calls this method. - */ - private void processEvent(final EventHandler eventHandler, final Event event) { - // Skip if the event was already cancelled - if (event.cancelled) { - if (event.trace || DEBUG_TRACE_ALL) { - logWithPid("Event dispatch cancelled"); - } - return; - } - - try { - if (event.trace || DEBUG_TRACE_ALL) { - logWithPid(" -> " + eventHandler.toString()); - } - Object sub = eventHandler.subscriber.getReference(); - if (sub != null) { - long t1 = 0; - if (DEBUG_TRACE_ALL) { - t1 = SystemClock.currentTimeMicro(); - } - eventHandler.method.invoke(sub, event); - if (DEBUG_TRACE_ALL) { - long duration = (SystemClock.currentTimeMicro() - t1); - mCallDurationMicros += duration; - mCallCount++; - logWithPid(eventHandler.method.toString() + " duration: " + duration + - " microseconds, avg: " + (mCallDurationMicros / mCallCount)); - } - } else { - Log.e(TAG, "Failed to deliver event to null subscriber"); - } - } catch (IllegalAccessException e) { - Log.e(TAG, "Failed to invoke method", e.getCause()); - } catch (InvocationTargetException e) { - throw new RuntimeException(e.getCause()); - } - } - - /** - * Returns whether this subscriber is currently registered. If {@param removeFoundSubscriber} - * is true, then remove the subscriber before returning. - */ - private boolean findRegisteredSubscriber(Object subscriber, boolean removeFoundSubscriber) { - for (int i = mSubscribers.size() - 1; i >= 0; i--) { - Subscriber sub = mSubscribers.get(i); - if (sub.getReference() == subscriber) { - if (removeFoundSubscriber) { - mSubscribers.remove(i); - } - return true; - } - } - return false; - } - - /** - * @return whether {@param method} is a valid (normal or interprocess) event bus handler method - */ - private boolean isValidEventBusHandlerMethod(Method method, Class<?>[] parameterTypes) { - int modifiers = method.getModifiers(); - if (Modifier.isPublic(modifiers) && - Modifier.isFinal(modifiers) && - method.getReturnType().equals(Void.TYPE) && - parameterTypes.length == 1) { - if (EventBus.Event.class.isAssignableFrom(parameterTypes[0]) && - method.getName().startsWith(METHOD_PREFIX)) { - return true; - } else { - if (DEBUG_TRACE_ALL) { - if (!EventBus.Event.class.isAssignableFrom(parameterTypes[0])) { - logWithPid(" Expected method take an Event-based parameter: " + method.getName()); - } - } - } - } else { - if (DEBUG_TRACE_ALL) { - if (!Modifier.isPublic(modifiers)) { - logWithPid(" Expected method to be public: " + method.getName()); - } else if (!Modifier.isFinal(modifiers)) { - logWithPid(" Expected method to be final: " + method.getName()); - } else if (!method.getReturnType().equals(Void.TYPE)) { - logWithPid(" Expected method to return null: " + method.getName()); - } - } - } - return false; - } - - /** - * Sorts the event handlers by priority and registration time. - */ - private void sortEventHandlersByPriority(List<EventHandler> eventHandlers) { - Collections.sort(eventHandlers, EVENT_HANDLER_COMPARATOR); - } - - /** - * Helper method to log the given {@param text} with the current process and user id. - */ - private static void logWithPid(String text) { - Log.d(TAG, "[" + android.os.Process.myPid() + ", u" + UserHandle.myUserId() + "] " + text); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/AppTransitionFinishedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/AppTransitionFinishedEvent.java deleted file mode 100644 index 4738eed3d1a1..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/AppTransitionFinishedEvent.java +++ /dev/null @@ -1,25 +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 - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * Sent when an app transition has finished playing. - */ -public class AppTransitionFinishedEvent extends EventBus.Event { -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/CancelEnterRecentsWindowAnimationEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/CancelEnterRecentsWindowAnimationEvent.java deleted file mode 100644 index fec34e3cd23d..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/CancelEnterRecentsWindowAnimationEvent.java +++ /dev/null @@ -1,34 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; - -/** - * This is sent when we want to cancel the enter-recents window animation for the launch task. - */ -public class CancelEnterRecentsWindowAnimationEvent extends EventBus.Event { - - // This is set for the task that is launching, which allows us to ensure that we are not - // cancelling the same task animation (it will just be overwritten instead) - public final Task launchTask; - - public CancelEnterRecentsWindowAnimationEvent(Task launchTask) { - this.launchTask = launchTask; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ConfigurationChangedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ConfigurationChangedEvent.java deleted file mode 100644 index 294c1e7a190f..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ConfigurationChangedEvent.java +++ /dev/null @@ -1,38 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the Recents activity configuration has changed. - */ -public class ConfigurationChangedEvent extends EventBus.AnimatedEvent { - - public final boolean fromMultiWindow; - public final boolean fromDeviceOrientationChange; - public final boolean fromDisplayDensityChange; - public final boolean hasStackTasks; - - public ConfigurationChangedEvent(boolean fromMultiWindow, boolean fromDeviceOrientationChange, - boolean fromDisplayDensityChange, boolean hasStackTasks) { - this.fromMultiWindow = fromMultiWindow; - this.fromDeviceOrientationChange = fromDeviceOrientationChange; - this.fromDisplayDensityChange = fromDisplayDensityChange; - this.hasStackTasks = hasStackTasks; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DismissRecentsToHomeAnimationStarted.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DismissRecentsToHomeAnimationStarted.java deleted file mode 100644 index e7be85868da2..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DismissRecentsToHomeAnimationStarted.java +++ /dev/null @@ -1,31 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the task animation when dismissing Recents starts. - */ -public class DismissRecentsToHomeAnimationStarted extends EventBus.AnimatedEvent { - - public final boolean animated; - - public DismissRecentsToHomeAnimationStarted(boolean animated) { - this.animated = animated; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DockedFirstAnimationFrameEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DockedFirstAnimationFrameEvent.java deleted file mode 100644 index 32d9a70340de..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DockedFirstAnimationFrameEvent.java +++ /dev/null @@ -1,25 +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 - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus.Event; - -/** - * Sent when the window animation has started when docking a task - */ -public class DockedFirstAnimationFrameEvent extends Event { -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DockedTopTaskEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DockedTopTaskEvent.java deleted file mode 100644 index 9e3ced3f3757..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/DockedTopTaskEvent.java +++ /dev/null @@ -1,34 +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 - */ - -package com.android.systemui.recents.events.activity; - -import android.graphics.Rect; - -import com.android.systemui.recents.events.EventBus; - -/** - * Fires when the user invoked the gesture to dock the top/left task after we called into window - * manager and before we start recents. - */ -public class DockedTopTaskEvent extends EventBus.Event { - - public Rect initialRect; - - public DockedTopTaskEvent(Rect initialRect) { - this.initialRect = initialRect; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/EnterRecentsWindowAnimationCompletedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/EnterRecentsWindowAnimationCompletedEvent.java deleted file mode 100644 index b31f32090ac7..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/EnterRecentsWindowAnimationCompletedEvent.java +++ /dev/null @@ -1,28 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the window animation into Recents completes. We use this signal to know when - * we can start in-app animations so that they don't conflict with the window transition into - * Recents. - */ -public class EnterRecentsWindowAnimationCompletedEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/EnterRecentsWindowLastAnimationFrameEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/EnterRecentsWindowLastAnimationFrameEvent.java deleted file mode 100644 index fd023d8054e5..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/EnterRecentsWindowLastAnimationFrameEvent.java +++ /dev/null @@ -1,22 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -public class EnterRecentsWindowLastAnimationFrameEvent extends EventBus.Event { -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ExitRecentsWindowFirstAnimationFrameEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ExitRecentsWindowFirstAnimationFrameEvent.java deleted file mode 100644 index fa806eb24ad1..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ExitRecentsWindowFirstAnimationFrameEvent.java +++ /dev/null @@ -1,28 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * Event sent when the exit animation is started. - * - * This is sent so parts of UI can synchronize on this event and adjust their appearance. An example - * of that is hiding the tasks when the launched application window becomes visible. - */ -public class ExitRecentsWindowFirstAnimationFrameEvent extends EventBus.Event { -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/HideRecentsEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/HideRecentsEvent.java deleted file mode 100644 index bf9b421ef1fb..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/HideRecentsEvent.java +++ /dev/null @@ -1,34 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the user taps on the Home button or finishes alt-tabbing to hide the Recents - * activity. - */ -public class HideRecentsEvent extends EventBus.Event { - - public final boolean triggeredFromAltTab; - public final boolean triggeredFromHomeKey; - - public HideRecentsEvent(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { - this.triggeredFromAltTab = triggeredFromAltTab; - this.triggeredFromHomeKey = triggeredFromHomeKey; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/HideStackActionButtonEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/HideStackActionButtonEvent.java deleted file mode 100644 index e4a4f592657c..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/HideStackActionButtonEvent.java +++ /dev/null @@ -1,36 +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.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the stack action button should be hidden. - */ -public class HideStackActionButtonEvent extends EventBus.Event { - - // Whether or not to translate the stack action button when hiding it - public final boolean translate; - - public HideStackActionButtonEvent() { - this(true); - } - - public HideStackActionButtonEvent(boolean translate) { - this.translate = translate; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchMostRecentTaskRequestEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchMostRecentTaskRequestEvent.java deleted file mode 100644 index 24913a4c2ca6..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchMostRecentTaskRequestEvent.java +++ /dev/null @@ -1,26 +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.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This event is sent to request that the most recent task is launched. - */ -public class LaunchMostRecentTaskRequestEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchNextTaskRequestEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchNextTaskRequestEvent.java deleted file mode 100644 index 11604b51b4a5..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchNextTaskRequestEvent.java +++ /dev/null @@ -1,27 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This event is sent to request that the next task is launched after a double-tap on the Recents - * button. - */ -public class LaunchNextTaskRequestEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskEvent.java deleted file mode 100644 index 2409f39d3760..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskEvent.java +++ /dev/null @@ -1,56 +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. - */ - -package com.android.systemui.recents.events.activity; - -import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; - -import android.graphics.Rect; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent to request that a particular task is launched. - */ -public class LaunchTaskEvent extends EventBus.Event { - - public final TaskView taskView; - public final Task task; - public final Rect targetTaskBounds; - public final int targetWindowingMode; - public final int targetActivityType; - public final boolean screenPinningRequested; - - public LaunchTaskEvent(TaskView taskView, Task task, Rect targetTaskBounds, - boolean screenPinningRequested) { - this(taskView, task, targetTaskBounds, screenPinningRequested, - WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_UNDEFINED); - } - - public LaunchTaskEvent(TaskView taskView, Task task, Rect targetTaskBounds, - boolean screenPinningRequested, int windowingMode, int activityType) { - this.taskView = taskView; - this.task = task; - this.targetTaskBounds = targetTaskBounds; - this.targetWindowingMode = windowingMode; - this.targetActivityType = activityType; - this.screenPinningRequested = screenPinningRequested; - } - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskFailedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskFailedEvent.java deleted file mode 100644 index 3a2d58c80d88..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskFailedEvent.java +++ /dev/null @@ -1,26 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when we fail to launch a task. - */ -public class LaunchTaskFailedEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskStartedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskStartedEvent.java deleted file mode 100644 index 3925ab1186dc..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskStartedEvent.java +++ /dev/null @@ -1,36 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent following {@link LaunchTaskEvent} after the call to the system is made to - * start the task. - */ -public class LaunchTaskStartedEvent extends EventBus.AnimatedEvent { - - public final TaskView taskView; - public final boolean screenPinningRequested; - - public LaunchTaskStartedEvent(TaskView taskView, boolean screenPinningRequested) { - this.taskView = taskView; - this.screenPinningRequested = screenPinningRequested; - } - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskSucceededEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskSucceededEvent.java deleted file mode 100644 index ec5089feabad..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/LaunchTaskSucceededEvent.java +++ /dev/null @@ -1,31 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when we successfully launch a task. - */ -public class LaunchTaskSucceededEvent extends EventBus.Event { - - public final int taskIndexFromStackFront; - - public LaunchTaskSucceededEvent(int taskIndexFromStackFront) { - this.taskIndexFromStackFront = taskIndexFromStackFront; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/MultiWindowStateChangedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/MultiWindowStateChangedEvent.java deleted file mode 100644 index 64eeafa1ae17..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/MultiWindowStateChangedEvent.java +++ /dev/null @@ -1,38 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.model.TaskStack; - -/** - * This is sent by the activity whenever the multi-window state has changed. - */ -public class MultiWindowStateChangedEvent extends EventBus.AnimatedEvent { - - public final boolean inMultiWindow; - // This flag is only used when undocking a task - public final boolean showDeferredAnimation; - public final TaskStack stack; - - public MultiWindowStateChangedEvent(boolean inMultiWindow, boolean showDeferredAnimation, - TaskStack stack) { - this.inMultiWindow = inMultiWindow; - this.showDeferredAnimation = showDeferredAnimation; - this.stack = stack; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/PackagesChangedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/PackagesChangedEvent.java deleted file mode 100644 index 47670e03c6a1..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/PackagesChangedEvent.java +++ /dev/null @@ -1,37 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.views.TaskStackView; -import com.android.systemui.recents.RecentsActivity; - -/** - * This event is sent by {@link RecentsActivity} when a package on the the system changes. - * {@link TaskStackView}s listen for this event, and remove the tasks associated with the removed - * packages. - */ -public class PackagesChangedEvent extends EventBus.Event { - - public final String packageName; - public final int userId; - - public PackagesChangedEvent(String packageName, int userId) { - this.packageName = packageName; - this.userId = userId; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/RecentsActivityStartingEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/RecentsActivityStartingEvent.java deleted file mode 100644 index a2ecfe207cf9..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/RecentsActivityStartingEvent.java +++ /dev/null @@ -1,26 +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 - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * Called after recents activity is being started, i.e. startActivity has just been called. - */ -public class RecentsActivityStartingEvent extends EventBus.Event{ - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ShowEmptyViewEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ShowEmptyViewEvent.java deleted file mode 100644 index 75bfd7bde66c..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ShowEmptyViewEvent.java +++ /dev/null @@ -1,25 +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.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * Sent when the stack should be hidden and the empty view shown. - */ -public class ShowEmptyViewEvent extends EventBus.Event { -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ShowStackActionButtonEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ShowStackActionButtonEvent.java deleted file mode 100644 index d81f89c172b9..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ShowStackActionButtonEvent.java +++ /dev/null @@ -1,32 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the stack action view button should be shown. - */ -public class ShowStackActionButtonEvent extends EventBus.Event { - - // Whether or not to translate the stack action button when showing it - public final boolean translate; - - public ShowStackActionButtonEvent(boolean translate) { - this.translate = translate; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/TaskStackUpdatedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/TaskStackUpdatedEvent.java deleted file mode 100644 index 0d614e8c675c..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/TaskStackUpdatedEvent.java +++ /dev/null @@ -1,37 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.model.TaskStack; - -/** - * This is sent by the activity whenever the task stach has changed. - */ -public class TaskStackUpdatedEvent extends EventBus.AnimatedEvent { - - /** - * A new TaskStack instance representing the latest stack state. - */ - public final TaskStack stack; - public final boolean inMultiWindow; - - public TaskStackUpdatedEvent(TaskStack stack, boolean inMultiWindow) { - this.stack = stack; - this.inMultiWindow = inMultiWindow; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ToggleRecentsEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ToggleRecentsEvent.java deleted file mode 100644 index 49655b491aca..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/ToggleRecentsEvent.java +++ /dev/null @@ -1,26 +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. - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the user taps on the Overview button to toggle the Recents activity. - */ -public class ToggleRecentsEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/UndockingTaskEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/UndockingTaskEvent.java deleted file mode 100644 index d5083a8b017f..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/activity/UndockingTaskEvent.java +++ /dev/null @@ -1,28 +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 - */ - -package com.android.systemui.recents.events.activity; - -import com.android.systemui.recents.events.EventBus; - -/** - * Fires when the user invoked the gesture to undock the task in the docked stack. - */ -public class UndockingTaskEvent extends EventBus.Event { - - public UndockingTaskEvent() { - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ActivityPinnedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ActivityPinnedEvent.java deleted file mode 100644 index f4d2fcff9672..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ActivityPinnedEvent.java +++ /dev/null @@ -1,31 +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.recents.events.component; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when an activity is pinned. - */ -public class ActivityPinnedEvent extends EventBus.Event { - - public final int taskId; - - public ActivityPinnedEvent(int taskId) { - this.taskId = taskId; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ActivityUnpinnedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ActivityUnpinnedEvent.java deleted file mode 100644 index 48c5f0b60f51..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ActivityUnpinnedEvent.java +++ /dev/null @@ -1,25 +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.recents.events.component; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when an activity is unpinned. - */ -public class ActivityUnpinnedEvent extends EventBus.Event { -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ExpandPipEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ExpandPipEvent.java deleted file mode 100644 index 37266f6ff39f..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ExpandPipEvent.java +++ /dev/null @@ -1,25 +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.recents.events.component; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the PiP should be expanded due to being relaunched. - */ -public class ExpandPipEvent extends EventBus.Event { -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/HidePipMenuEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/HidePipMenuEvent.java deleted file mode 100644 index ce4f207aa1d7..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/HidePipMenuEvent.java +++ /dev/null @@ -1,26 +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.recents.events.component; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the PiP menu should be hidden. - */ -public class HidePipMenuEvent extends EventBus.AnimatedEvent { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/RecentsVisibilityChangedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/RecentsVisibilityChangedEvent.java deleted file mode 100644 index 8843eb41210f..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/RecentsVisibilityChangedEvent.java +++ /dev/null @@ -1,36 +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. - */ - -package com.android.systemui.recents.events.component; - -import android.content.Context; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when the visibility of the RecentsActivity for the current user changes. Handlers - * of this event should not alter the UI, as the activity may still be visible. - */ -public class RecentsVisibilityChangedEvent extends EventBus.Event { - - public final Context applicationContext; - public final boolean visible; - - public RecentsVisibilityChangedEvent(Context context, boolean visible) { - this.applicationContext = context.getApplicationContext(); - this.visible = visible; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java deleted file mode 100644 index d460917b6ab4..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java +++ /dev/null @@ -1,35 +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. - */ - -package com.android.systemui.recents.events.component; - -import android.content.Context; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when we want to start screen pinning. - */ -public class ScreenPinningRequestEvent extends EventBus.Event { - - public final Context applicationContext; - public final int taskId; - - public ScreenPinningRequestEvent(Context context, int taskId) { - this.applicationContext = context.getApplicationContext(); - this.taskId = taskId; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/SetWaitingForTransitionStartEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/SetWaitingForTransitionStartEvent.java deleted file mode 100644 index d9cf5fbf645d..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/SetWaitingForTransitionStartEvent.java +++ /dev/null @@ -1,31 +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.recents.events.component; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when we are setting/resetting the flag to wait for the transition to start. - */ -public class SetWaitingForTransitionStartEvent extends EventBus.Event { - - public final boolean waitingForTransitionStart; - - public SetWaitingForTransitionStartEvent(boolean waitingForTransitionStart) { - this.waitingForTransitionStart = waitingForTransitionStart; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ShowUserToastEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ShowUserToastEvent.java deleted file mode 100644 index e2b39c39b586..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/component/ShowUserToastEvent.java +++ /dev/null @@ -1,33 +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. - */ - -package com.android.systemui.recents.events.component; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when we want to show a toast for the current user. - */ -public class ShowUserToastEvent extends EventBus.Event { - - public final int msgResId; - public final int msgLength; - - public ShowUserToastEvent(int msgResId, int msgLength) { - this.msgResId = msgResId; - this.msgLength = msgLength; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java deleted file mode 100644 index 0352161be570..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java +++ /dev/null @@ -1,31 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent whenever all the task views in a stack have been dismissed. - */ -public class AllTaskViewsDismissedEvent extends EventBus.Event { - - public final int msgResId; - - public AllTaskViewsDismissedEvent(int msgResId) { - this.msgResId = msgResId; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DeleteTaskDataEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DeleteTaskDataEvent.java deleted file mode 100644 index b52e83b81649..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DeleteTaskDataEvent.java +++ /dev/null @@ -1,33 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; - -/** - * This is sent when the data associated with a given {@link Task} should be deleted from the - * system. - */ -public class DeleteTaskDataEvent extends EventBus.Event { - - public final Task task; - - public DeleteTaskDataEvent(Task task) { - this.task = task; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DismissAllTaskViewsEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DismissAllTaskViewsEvent.java deleted file mode 100644 index f8b59c7c62f7..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DismissAllTaskViewsEvent.java +++ /dev/null @@ -1,27 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent to request that all the {@link TaskView}s are dismissed. - */ -public class DismissAllTaskViewsEvent extends EventBus.AnimatedEvent { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DismissTaskViewEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DismissTaskViewEvent.java deleted file mode 100644 index 1f8c6443502f..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DismissTaskViewEvent.java +++ /dev/null @@ -1,32 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent to request that the given {@link TaskView} is dismissed. - */ -public class DismissTaskViewEvent extends EventBus.AnimatedEvent { - - public final TaskView taskView; - - public DismissTaskViewEvent(TaskView taskView) { - this.taskView = taskView; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DraggingInRecentsEndedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DraggingInRecentsEndedEvent.java deleted file mode 100644 index 9be8eb1cde4e..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DraggingInRecentsEndedEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus.Event; - -/** - * This event is sent when the user finished dragging in recents. - */ -public class DraggingInRecentsEndedEvent extends Event { - - public final float velocity; - - public DraggingInRecentsEndedEvent(float velocity) { - this.velocity = velocity; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DraggingInRecentsEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DraggingInRecentsEvent.java deleted file mode 100644 index 5e8bfd410e31..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/DraggingInRecentsEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus.Event; - -/** - * This event is sent when the user changed how far they are dragging in recents. - */ -public class DraggingInRecentsEvent extends Event { - - public final float distanceFromTop; - - public DraggingInRecentsEvent(float distanceFromTop) { - this.distanceFromTop = distanceFromTop; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/HideIncompatibleAppOverlayEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/HideIncompatibleAppOverlayEvent.java deleted file mode 100644 index d6ef636b23a6..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/HideIncompatibleAppOverlayEvent.java +++ /dev/null @@ -1,26 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when a user stops draggin an incompatible app task. - */ -public class HideIncompatibleAppOverlayEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/RecentsDrawnEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/RecentsDrawnEvent.java deleted file mode 100644 index 548316607133..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/RecentsDrawnEvent.java +++ /dev/null @@ -1,26 +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 - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; - -/** - * Fired when recents was launched and has drawn its first frame. - */ -public class RecentsDrawnEvent extends EventBus.Event { - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/RecentsGrowingEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/RecentsGrowingEvent.java deleted file mode 100644 index d9b00271b31e..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/RecentsGrowingEvent.java +++ /dev/null @@ -1,26 +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 - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; - -/** - * Sent when recents is about to grow in multi-window mode when entering recents. - */ -public class RecentsGrowingEvent extends EventBus.Event { - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/ShowApplicationInfoEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/ShowApplicationInfoEvent.java deleted file mode 100644 index da19384ae93a..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/ShowApplicationInfoEvent.java +++ /dev/null @@ -1,32 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; - -/** - * This is sent when a user wants to show the application info for a {@link Task}. - */ -public class ShowApplicationInfoEvent extends EventBus.Event { - - public final Task task; - - public ShowApplicationInfoEvent(Task task) { - this.task = task; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/ShowIncompatibleAppOverlayEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/ShowIncompatibleAppOverlayEvent.java deleted file mode 100644 index 3a4350e3a0ca..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/ShowIncompatibleAppOverlayEvent.java +++ /dev/null @@ -1,26 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent when a user starts dragging an incompatible app task. - */ -public class ShowIncompatibleAppOverlayEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java deleted file mode 100644 index c4b47c08fd8c..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java +++ /dev/null @@ -1,37 +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. - */ - -package com.android.systemui.recents.events.ui; - -import android.util.MutableInt; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent whenever a new scroll gesture happens on a stack view. - */ -public class StackViewScrolledEvent extends EventBus.ReusableEvent { - - public final MutableInt yMovement; - - public StackViewScrolledEvent() { - yMovement = new MutableInt(0); - } - - public void updateY(int y) { - yMovement.value = y; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/TaskSnapshotChangedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/TaskSnapshotChangedEvent.java deleted file mode 100644 index f08292801b62..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/TaskSnapshotChangedEvent.java +++ /dev/null @@ -1,34 +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.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.ThumbnailData; - -/** - * Sent when a task snapshot has changed. - */ -public class TaskSnapshotChangedEvent extends EventBus.Event { - - public final int taskId; - public final ThumbnailData thumbnailData; - - public TaskSnapshotChangedEvent(int taskId, ThumbnailData thumbnailData) { - this.taskId = taskId; - this.thumbnailData = thumbnailData; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/TaskViewDismissedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/TaskViewDismissedEvent.java deleted file mode 100644 index 973812454afd..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/TaskViewDismissedEvent.java +++ /dev/null @@ -1,38 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.utilities.AnimationProps; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent when a {@link TaskView} has been dismissed and is no longer visible. - */ -public class TaskViewDismissedEvent extends EventBus.Event { - - public final Task task; - public final TaskView taskView; - public final AnimationProps animation; - - public TaskViewDismissedEvent(Task task, TaskView taskView, AnimationProps animation) { - this.task = task; - this.taskView = taskView; - this.animation = animation; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/UserInteractionEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/UserInteractionEvent.java deleted file mode 100644 index 39e4c1d7095c..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/UserInteractionEvent.java +++ /dev/null @@ -1,26 +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. - */ - -package com.android.systemui.recents.events.ui; - -import com.android.systemui.recents.events.EventBus; - -/** - * This is sent whenever the user interacts with the activity. - */ -public class UserInteractionEvent extends EventBus.ReusableEvent { - // Simple Event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragDropTargetChangedEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragDropTargetChangedEvent.java deleted file mode 100644 index cf61b1ef7637..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragDropTargetChangedEvent.java +++ /dev/null @@ -1,36 +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. - */ - -package com.android.systemui.recents.events.ui.dragndrop; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.views.DropTarget; - -/** - * This event is sent when a user drags in/out of a drop target. - */ -public class DragDropTargetChangedEvent extends EventBus.AnimatedEvent { - - // The task that is currently being dragged - public final Task task; - public final DropTarget dropTarget; - - public DragDropTargetChangedEvent(Task task, DropTarget dropTarget) { - this.task = task; - this.dropTarget = dropTarget; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragEndCancelledEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragEndCancelledEvent.java deleted file mode 100644 index c11936eee284..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragEndCancelledEvent.java +++ /dev/null @@ -1,38 +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. - */ - -package com.android.systemui.recents.events.ui.dragndrop; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent whenever a drag end is cancelled because of an error. - */ -public class DragEndCancelledEvent extends EventBus.AnimatedEvent { - - public final TaskStack stack; - public final Task task; - public final TaskView taskView; - - public DragEndCancelledEvent(TaskStack stack, Task task, TaskView taskView) { - this.stack = stack; - this.task = task; - this.taskView = taskView; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragEndEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragEndEvent.java deleted file mode 100644 index 73cbde998319..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragEndEvent.java +++ /dev/null @@ -1,38 +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. - */ - -package com.android.systemui.recents.events.ui.dragndrop; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.views.DropTarget; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent whenever a drag ends. - */ -public class DragEndEvent extends EventBus.AnimatedEvent { - - public final Task task; - public final TaskView taskView; - public final DropTarget dropTarget; - - public DragEndEvent(Task task, TaskView taskView, DropTarget dropTarget) { - this.task = task; - this.taskView = taskView; - this.dropTarget = dropTarget; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java deleted file mode 100644 index 021be77bcc8b..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java +++ /dev/null @@ -1,46 +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. - */ - -package com.android.systemui.recents.events.ui.dragndrop; - -import android.graphics.Point; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent whenever a drag starts. - */ -public class DragStartEvent extends EventBus.Event { - - public final Task task; - public final TaskView taskView; - public final Point tlOffset; - public final boolean isUserTouchInitiated; - - public DragStartEvent(Task task, TaskView taskView, Point tlOffset) { - this(task, taskView, tlOffset, true); - } - - public DragStartEvent(Task task, TaskView taskView, Point tlOffset, - boolean isUserTouchInitiated) { - this.task = task; - this.taskView = taskView; - this.tlOffset = tlOffset; - this.isUserTouchInitiated = isUserTouchInitiated; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragStartInitializeDropTargetsEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragStartInitializeDropTargetsEvent.java deleted file mode 100644 index 64ba5748bb89..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/dragndrop/DragStartInitializeDropTargetsEvent.java +++ /dev/null @@ -1,40 +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. - */ - -package com.android.systemui.recents.events.ui.dragndrop; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.views.RecentsViewTouchHandler; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent by the drag manager when it requires drop targets to register themselves for - * the current drag gesture. - */ -public class DragStartInitializeDropTargetsEvent extends EventBus.Event { - - public final Task task; - public final TaskView taskView; - public final RecentsViewTouchHandler handler; - - public DragStartInitializeDropTargetsEvent(Task task, TaskView taskView, - RecentsViewTouchHandler handler) { - this.task = task; - this.taskView = taskView; - this.handler = handler; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/DismissFocusedTaskViewEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/DismissFocusedTaskViewEvent.java deleted file mode 100644 index df740185f1e8..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/DismissFocusedTaskViewEvent.java +++ /dev/null @@ -1,27 +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. - */ - -package com.android.systemui.recents.events.ui.focus; - -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.views.TaskView; - -/** - * This event is sent to request that the currently focused {@link TaskView} is dismissed. - */ -public class DismissFocusedTaskViewEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/FocusNextTaskViewEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/FocusNextTaskViewEvent.java deleted file mode 100644 index 171ab5e8bcca..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/FocusNextTaskViewEvent.java +++ /dev/null @@ -1,26 +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. - */ - -package com.android.systemui.recents.events.ui.focus; - -import com.android.systemui.recents.events.EventBus; - -/** - * Focuses the next task view in the stack. - */ -public class FocusNextTaskViewEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/FocusPreviousTaskViewEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/FocusPreviousTaskViewEvent.java deleted file mode 100644 index 22469e758e70..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/FocusPreviousTaskViewEvent.java +++ /dev/null @@ -1,26 +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. - */ - -package com.android.systemui.recents.events.ui.focus; - -import com.android.systemui.recents.events.EventBus; - -/** - * Focuses the previous task view in the stack. - */ -public class FocusPreviousTaskViewEvent extends EventBus.Event { - // Simple event -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/NavigateTaskViewEvent.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/NavigateTaskViewEvent.java deleted file mode 100644 index 5508d269f03f..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/events/ui/focus/NavigateTaskViewEvent.java +++ /dev/null @@ -1,49 +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.recents.events.ui.focus; - -import android.view.KeyEvent; -import com.android.systemui.recents.events.EventBus; - -/** - * Navigates the task view by arrow keys. - */ -public class NavigateTaskViewEvent extends EventBus.Event { - public enum Direction { - UNDEFINED, UP, DOWN, LEFT, RIGHT; - } - - public Direction direction; - public NavigateTaskViewEvent(Direction direction) { - this.direction = direction; - } - - public static Direction getDirectionFromKeyCode(int keyCode) { - switch (keyCode) { - case KeyEvent.KEYCODE_DPAD_UP: - return Direction.UP; - case KeyEvent.KEYCODE_DPAD_DOWN: - return Direction.DOWN; - case KeyEvent.KEYCODE_DPAD_LEFT: - return Direction.LEFT; - case KeyEvent.KEYCODE_DPAD_RIGHT: - return Direction.RIGHT; - default: - return Direction.UNDEFINED; - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/DozeTrigger.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/DozeTrigger.java deleted file mode 100644 index 574ea03ac9bb..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/DozeTrigger.java +++ /dev/null @@ -1,106 +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.systemui.recents.misc; - -import android.os.Handler; -import android.view.ViewDebug; - -/** - * A dozer is a class that fires a trigger after it falls asleep. - * You can occasionally poke the trigger to wake it up, but it will fall asleep if left untouched. - */ -public class DozeTrigger { - - Handler mHandler; - - @ViewDebug.ExportedProperty(category="recents") - boolean mIsDozing; - @ViewDebug.ExportedProperty(category="recents") - boolean mIsAsleep; - @ViewDebug.ExportedProperty(category="recents") - int mDozeDurationMilliseconds; - Runnable mOnSleepRunnable; - - // Sleep-runnable - Runnable mDozeRunnable = new Runnable() { - @Override - public void run() { - mIsDozing = false; - mIsAsleep = true; - mOnSleepRunnable.run(); - } - }; - - public DozeTrigger(int dozeDurationMilliseconds, Runnable onSleepRunnable) { - mHandler = new Handler(); - mDozeDurationMilliseconds = dozeDurationMilliseconds; - mOnSleepRunnable = onSleepRunnable; - } - - /** - * Starts dozing and queues the onSleepRunnable to be called. This also resets the trigger flag. - */ - public void startDozing() { - forcePoke(); - mIsAsleep = false; - } - - /** - * Stops dozing and prevents the onSleepRunnable from being called. - */ - public void stopDozing() { - mHandler.removeCallbacks(mDozeRunnable); - mIsDozing = false; - mIsAsleep = false; - } - - /** - * Updates the duration that we have to wait until dozing triggers. - */ - public void setDozeDuration(int duration) { - mDozeDurationMilliseconds = duration; - } - - /** - * Poke this dozer to wake it up if it is dozing, delaying the onSleepRunnable from being - * called for a for the doze duration. - */ - public void poke() { - if (mIsDozing) { - forcePoke(); - } - } - - /** - * Poke this dozer to wake it up even if it is not currently dozing. - */ - void forcePoke() { - mHandler.removeCallbacks(mDozeRunnable); - mHandler.postDelayed(mDozeRunnable, mDozeDurationMilliseconds); - mIsDozing = true; - } - - /** Returns whether we are dozing or not. */ - public boolean isDozing() { - return mIsDozing; - } - - /** Returns whether the trigger has fired at least once. */ - public boolean isAsleep() { - return mIsAsleep; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/FreePathInterpolator.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/FreePathInterpolator.java deleted file mode 100644 index 720c9520c074..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/FreePathInterpolator.java +++ /dev/null @@ -1,177 +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. - */ - -package com.android.systemui.recents.misc; - -import android.graphics.Path; -import android.view.animation.BaseInterpolator; -import android.view.animation.Interpolator; - -/** - * An interpolator that can traverse a Path. The x coordinate along the <code>Path</code> - * is the input value and the output is the y coordinate of the line at that point. - * This means that the Path must conform to a function <code>y = f(x)</code>. - * - * <p>The <code>Path</code> must not have gaps in the x direction and must not - * loop back on itself such that there can be two points sharing the same x coordinate. - * It is alright to have a disjoint line in the vertical direction:</p> - * <p><blockquote><pre> - * Path path = new Path(); - * path.lineTo(0.25f, 0.25f); - * path.moveTo(0.25f, 0.5f); - * path.lineTo(1f, 1f); - * </pre></blockquote></p> - */ -public class FreePathInterpolator extends BaseInterpolator { - - // This governs how accurate the approximation of the Path is. - private static final float PRECISION = 0.002f; - - private float[] mX; - private float[] mY; - private float mArcLength; - - /** - * Create an interpolator for an arbitrary <code>Path</code>. - * - * @param path The <code>Path</code> to use to make the line representing the interpolator. - */ - public FreePathInterpolator(Path path) { - initPath(path); - } - - private void initPath(Path path) { - float[] pointComponents = path.approximate(PRECISION); - - int numPoints = pointComponents.length / 3; - - mX = new float[numPoints]; - mY = new float[numPoints]; - mArcLength = 0; - float prevX = 0; - float prevY = 0; - float prevFraction = 0; - int componentIndex = 0; - for (int i = 0; i < numPoints; i++) { - float fraction = pointComponents[componentIndex++]; - float x = pointComponents[componentIndex++]; - float y = pointComponents[componentIndex++]; - if (fraction == prevFraction && x != prevX) { - throw new IllegalArgumentException( - "The Path cannot have discontinuity in the X axis."); - } - if (x < prevX) { - throw new IllegalArgumentException("The Path cannot loop back on itself."); - } - mX[i] = x; - mY[i] = y; - mArcLength += Math.hypot(x - prevX, y - prevY); - prevX = x; - prevY = y; - prevFraction = fraction; - } - } - - /** - * Using the line in the Path in this interpolator that can be described as - * <code>y = f(x)</code>, finds the y coordinate of the line given <code>t</code> - * as the x coordinate. - * - * @param t Treated as the x coordinate along the line. - * @return The y coordinate of the Path along the line where x = <code>t</code>. - * @see Interpolator#getInterpolation(float) - */ - @Override - public float getInterpolation(float t) { - int startIndex = 0; - int endIndex = mX.length - 1; - - // Return early if out of bounds - if (t <= 0) { - return mY[startIndex]; - } else if (t >= 1) { - return mY[endIndex]; - } - - // Do a binary search for the correct x to interpolate between. - while (endIndex - startIndex > 1) { - int midIndex = (startIndex + endIndex) / 2; - if (t < mX[midIndex]) { - endIndex = midIndex; - } else { - startIndex = midIndex; - } - } - - float xRange = mX[endIndex] - mX[startIndex]; - if (xRange == 0) { - return mY[startIndex]; - } - - float tInRange = t - mX[startIndex]; - float fraction = tInRange / xRange; - - float startY = mY[startIndex]; - float endY = mY[endIndex]; - return startY + (fraction * (endY - startY)); - } - - /** - * Finds the x that provides the given <code>y = f(x)</code>. - * - * @param y a value from (0,1) that is in this path. - */ - public float getX(float y) { - int startIndex = 0; - int endIndex = mY.length - 1; - - // Return early if out of bounds - if (y <= 0) { - return mX[endIndex]; - } else if (y >= 1) { - return mX[startIndex]; - } - - // Do a binary search for index that bounds the y - while (endIndex - startIndex > 1) { - int midIndex = (startIndex + endIndex) / 2; - if (y < mY[midIndex]) { - startIndex = midIndex; - } else { - endIndex = midIndex; - } - } - - float yRange = mY[endIndex] - mY[startIndex]; - if (yRange == 0) { - return mX[startIndex]; - } - - float tInRange = y - mY[startIndex]; - float fraction = tInRange / yRange; - - float startX = mX[startIndex]; - float endX = mX[endIndex]; - return startX + (fraction * (endX - startX)); - } - - /** - * Returns the arclength of the path we are interpolating. - */ - public float getArcLength() { - return mArcLength; - } -}
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/ReferenceCountedTrigger.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/ReferenceCountedTrigger.java deleted file mode 100644 index 2637d8812357..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/ReferenceCountedTrigger.java +++ /dev/null @@ -1,130 +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.systemui.recents.misc; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; - -import java.util.ArrayList; - -/** - * A ref counted trigger that does some logic when the count is first incremented, or last - * decremented. Not thread safe as it's not currently needed. - */ -public class ReferenceCountedTrigger { - - int mCount; - ArrayList<Runnable> mFirstIncRunnables = new ArrayList<>(); - ArrayList<Runnable> mLastDecRunnables = new ArrayList<>(); - Runnable mErrorRunnable; - - // Convenience runnables - Runnable mIncrementRunnable = new Runnable() { - @Override - public void run() { - increment(); - } - }; - Runnable mDecrementRunnable = new Runnable() { - @Override - public void run() { - decrement(); - } - }; - - public ReferenceCountedTrigger() { - this(null, null, null); - } - - public ReferenceCountedTrigger(Runnable firstIncRunnable, Runnable lastDecRunnable, - Runnable errorRunanable) { - if (firstIncRunnable != null) mFirstIncRunnables.add(firstIncRunnable); - if (lastDecRunnable != null) mLastDecRunnables.add(lastDecRunnable); - mErrorRunnable = errorRunanable; - } - - /** Increments the ref count */ - public void increment() { - if (mCount == 0 && !mFirstIncRunnables.isEmpty()) { - int numRunnables = mFirstIncRunnables.size(); - for (int i = 0; i < numRunnables; i++) { - mFirstIncRunnables.get(i).run(); - } - } - mCount++; - } - - /** Convenience method to increment this trigger as a runnable */ - public Runnable incrementAsRunnable() { - return mIncrementRunnable; - } - - /** Adds a runnable to the last-decrement runnables list. */ - public void addLastDecrementRunnable(Runnable r) { - mLastDecRunnables.add(r); - } - - /** Decrements the ref count */ - public void decrement() { - mCount--; - if (mCount == 0) { - flushLastDecrementRunnables(); - } else if (mCount < 0) { - if (mErrorRunnable != null) { - mErrorRunnable.run(); - } else { - throw new RuntimeException("Invalid ref count"); - } - } - } - - /** - * Runs and clears all the last-decrement runnables now. - */ - public void flushLastDecrementRunnables() { - if (!mLastDecRunnables.isEmpty()) { - int numRunnables = mLastDecRunnables.size(); - for (int i = 0; i < numRunnables; i++) { - mLastDecRunnables.get(i).run(); - } - } - mLastDecRunnables.clear(); - } - - /** - * Convenience method to decrement this trigger as a animator listener. This listener is - * guarded to prevent being called back multiple times, and will trigger a decrement once and - * only once. - */ - public Animator.AnimatorListener decrementOnAnimationEnd() { - return new AnimatorListenerAdapter() { - private boolean hasEnded; - - @Override - public void onAnimationEnd(Animator animation) { - if (hasEnded) return; - decrement(); - hasEnded = true; - } - }; - } - - /** Returns the current ref count */ - public int getCount() { - return mCount; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/SysUiTaskStackChangeListener.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/SysUiTaskStackChangeListener.java deleted file mode 100644 index 5d7f1ba5eaf4..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/SysUiTaskStackChangeListener.java +++ /dev/null @@ -1,35 +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.recents.misc; - -import android.content.Context; - -import com.android.systemui.shared.system.TaskStackChangeListener; - -/** - * An implementation of {@link TaskStackChangeListener}. - */ -public abstract class SysUiTaskStackChangeListener extends TaskStackChangeListener { - - /** - * Checks that the current user matches the user's SystemUI process. - */ - protected final boolean checkCurrentUserId(Context context, boolean debug) { - int currentUserId = SystemServicesProxy.getInstance(context).getCurrentUser(); - return checkCurrentUserId(currentUserId, debug); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/SystemServicesProxy.java deleted file mode 100644 index 44354bc1d358..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ /dev/null @@ -1,535 +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.systemui.recents.misc; - -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.WINDOWING_MODE_FULLSCREEN; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; - -import android.app.ActivityManager; -import android.app.ActivityManager.StackInfo; -import android.app.ActivityOptions; -import android.app.ActivityTaskManager; -import android.app.AppGlobals; -import android.app.IActivityManager; -import android.app.IActivityTaskManager; -import android.app.WindowConfiguration; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.pm.IPackageManager; -import android.content.pm.PackageManager; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Point; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffXfermode; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.os.UserHandle; -import android.os.UserManager; -import android.service.dreams.DreamService; -import android.service.dreams.IDreamManager; -import android.util.Log; -import android.util.MutableBoolean; -import android.view.Display; -import android.view.IDockedStackListener; -import android.view.IWindowManager; -import android.view.WindowManager; -import android.view.WindowManager.KeyboardShortcutsReceiver; -import android.view.WindowManagerGlobal; -import android.view.accessibility.AccessibilityManager; - -import com.android.internal.app.AssistUtils; -import com.android.internal.os.BackgroundThread; -import com.android.systemui.Dependency; -import com.android.systemui.UiOffloadThread; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsImpl; -import com.android.systemui.statusbar.policy.UserInfoController; - -import java.util.List; - -/** - * Acts as a shim around the real system services that we need to access data from, and provides - * a point of injection when testing UI. - */ -public class SystemServicesProxy { - final static String TAG = "SystemServicesProxy"; - - final static BitmapFactory.Options sBitmapOptions; - static { - sBitmapOptions = new BitmapFactory.Options(); - sBitmapOptions.inMutable = true; - sBitmapOptions.inPreferredConfig = Bitmap.Config.RGB_565; - } - - private static SystemServicesProxy sSystemServicesProxy; - - AccessibilityManager mAccm; - ActivityManager mAm; - IActivityManager mIam; - IActivityTaskManager mIatm; - PackageManager mPm; - IPackageManager mIpm; - private final IDreamManager mDreamManager; - private final Context mContext; - AssistUtils mAssistUtils; - WindowManager mWm; - IWindowManager mIwm; - UserManager mUm; - Display mDisplay; - String mRecentsPackage; - private int mCurrentUserId; - - boolean mIsSafeMode; - - int mDummyThumbnailWidth; - int mDummyThumbnailHeight; - Paint mBgProtectionPaint; - Canvas mBgProtectionCanvas; - - private final Runnable mGcRunnable = new Runnable() { - @Override - public void run() { - System.gc(); - System.runFinalization(); - } - }; - - private final UiOffloadThread mUiOffloadThread = Dependency.get(UiOffloadThread.class); - - private final UserInfoController.OnUserInfoChangedListener mOnUserInfoChangedListener = - (String name, Drawable picture, String userAccount) -> - mCurrentUserId = mAm.getCurrentUser(); - - /** Private constructor */ - private SystemServicesProxy(Context context) { - mContext = context.getApplicationContext(); - mAccm = AccessibilityManager.getInstance(context); - mAm = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - mIam = ActivityManager.getService(); - mIatm = ActivityTaskManager.getService(); - mPm = context.getPackageManager(); - mIpm = AppGlobals.getPackageManager(); - mAssistUtils = new AssistUtils(context); - mWm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); - mIwm = WindowManagerGlobal.getWindowManagerService(); - mUm = UserManager.get(context); - mDreamManager = IDreamManager.Stub.asInterface( - ServiceManager.checkService(DreamService.DREAM_SERVICE)); - mDisplay = mWm.getDefaultDisplay(); - mRecentsPackage = context.getPackageName(); - mIsSafeMode = mPm.isSafeMode(); - mCurrentUserId = mAm.getCurrentUser(); - - // Get the dummy thumbnail width/heights - Resources res = context.getResources(); - int wId = com.android.internal.R.dimen.thumbnail_width; - int hId = com.android.internal.R.dimen.thumbnail_height; - mDummyThumbnailWidth = res.getDimensionPixelSize(wId); - mDummyThumbnailHeight = res.getDimensionPixelSize(hId); - - // Create the protection paints - mBgProtectionPaint = new Paint(); - mBgProtectionPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_ATOP)); - mBgProtectionPaint.setColor(0xFFffffff); - mBgProtectionCanvas = new Canvas(); - - // Since SystemServicesProxy can be accessed from a per-SysUI process component, create a - // per-process listener to keep track of the current user id to reduce the number of binder - // calls to fetch it. - UserInfoController userInfoController = Dependency.get(UserInfoController.class); - userInfoController.addCallback(mOnUserInfoChangedListener); - } - - /** - * Returns the single instance of the {@link SystemServicesProxy}. - * This should only be called on the main thread. - */ - public static synchronized SystemServicesProxy getInstance(Context context) { - if (sSystemServicesProxy == null) { - sSystemServicesProxy = new SystemServicesProxy(context); - } - return sSystemServicesProxy; - } - - /** - * Requests a gc() from the background thread. - */ - public void gc() { - BackgroundThread.getHandler().post(mGcRunnable); - } - - /** - * Returns whether the recents activity is currently visible. - */ - public boolean isRecentsActivityVisible() { - return isRecentsActivityVisible(null); - } - - /** - * Returns whether the recents activity is currently visible. - * - * @param isHomeStackVisible if provided, will return whether the home stack is visible - * regardless of the recents visibility - * - * TODO(winsonc): Refactor this check to just use the recents activity lifecycle - */ - public boolean isRecentsActivityVisible(MutableBoolean isHomeStackVisible) { - if (mIam == null) return false; - - try { - List<StackInfo> stackInfos = mIatm.getAllStackInfos(); - ActivityManager.StackInfo homeStackInfo = null; - ActivityManager.StackInfo fullscreenStackInfo = null; - ActivityManager.StackInfo recentsStackInfo = null; - for (int i = 0; i < stackInfos.size(); i++) { - final StackInfo stackInfo = stackInfos.get(i); - final WindowConfiguration winConfig = stackInfo.configuration.windowConfiguration; - final int activityType = winConfig.getActivityType(); - final int windowingMode = winConfig.getWindowingMode(); - if (homeStackInfo == null && activityType == ACTIVITY_TYPE_HOME) { - homeStackInfo = stackInfo; - } else if (fullscreenStackInfo == null && activityType == ACTIVITY_TYPE_STANDARD - && (windowingMode == WINDOWING_MODE_FULLSCREEN - || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY)) { - fullscreenStackInfo = stackInfo; - } else if (recentsStackInfo == null && activityType == ACTIVITY_TYPE_RECENTS) { - recentsStackInfo = stackInfo; - } - } - boolean homeStackVisibleNotOccluded = isStackNotOccluded(homeStackInfo, - fullscreenStackInfo); - boolean recentsStackVisibleNotOccluded = isStackNotOccluded(recentsStackInfo, - fullscreenStackInfo); - if (isHomeStackVisible != null) { - isHomeStackVisible.value = homeStackVisibleNotOccluded; - } - ComponentName topActivity = recentsStackInfo != null ? - recentsStackInfo.topActivity : null; - return (recentsStackVisibleNotOccluded && topActivity != null - && topActivity.getPackageName().equals(RecentsImpl.RECENTS_PACKAGE) - && LegacyRecentsImpl.RECENTS_ACTIVITIES.contains(topActivity.getClassName())); - } catch (RemoteException e) { - e.printStackTrace(); - } - return false; - } - - private boolean isStackNotOccluded(ActivityManager.StackInfo stackInfo, - ActivityManager.StackInfo fullscreenStackInfo) { - boolean stackVisibleNotOccluded = stackInfo == null || stackInfo.visible; - if (fullscreenStackInfo != null && stackInfo != null) { - boolean isFullscreenStackOccludingg = fullscreenStackInfo.visible && - fullscreenStackInfo.position > stackInfo.position; - stackVisibleNotOccluded &= !isFullscreenStackOccludingg; - } - return stackVisibleNotOccluded; - } - - /** - * Returns whether this device is in the safe mode. - */ - public boolean isInSafeMode() { - return mIsSafeMode; - } - - /** Moves an already resumed task to the side of the screen to initiate split screen. */ - public boolean setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, - Rect initialBounds) { - if (mIatm == null) { - return false; - } - - try { - return mIatm.setTaskWindowingModeSplitScreenPrimary(taskId, createMode, - true /* onTop */, false /* animate */, initialBounds, true /* showRecents */); - } catch (RemoteException e) { - e.printStackTrace(); - } - return false; - } - - public ActivityManager.StackInfo getSplitScreenPrimaryStack() { - try { - return mIatm.getStackInfo(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_UNDEFINED); - } catch (RemoteException e) { - return null; - } - } - - /** - * @return whether there are any docked tasks for the current user. - */ - public boolean hasDockedTask() { - if (mIam == null) return false; - - ActivityManager.StackInfo stackInfo = getSplitScreenPrimaryStack(); - if (stackInfo != null) { - int userId = getCurrentUser(); - boolean hasUserTask = false; - for (int i = stackInfo.taskUserIds.length - 1; i >= 0 && !hasUserTask; i--) { - hasUserTask = (stackInfo.taskUserIds[i] == userId); - } - return hasUserTask; - } - return false; - } - - /** - * Returns whether there is a soft nav bar on specified display. - * - * @param displayId the id of display to check if there is a software navigation bar. - */ - public boolean hasSoftNavigationBar(int displayId) { - try { - return mIwm.hasNavigationBar(displayId); - } catch (RemoteException e) { - e.printStackTrace(); - } - return false; - } - - /** - * Returns whether the device has a transposed nav bar (on the right of the screen) in the - * current display orientation. - */ - public boolean hasTransposedNavigationBar() { - Rect insets = new Rect(); - getStableInsets(insets); - return insets.right > 0; - } - - /** Set the task's windowing mode. */ - public void setTaskWindowingMode(int taskId, int windowingMode) { - if (mIatm == null) return; - - try { - mIatm.setTaskWindowingMode(taskId, windowingMode, false /* onTop */); - } catch (RemoteException | IllegalArgumentException e) { - e.printStackTrace(); - } - } - - /** - * Returns whether the provided {@param userId} represents the system user. - */ - public boolean isSystemUser(int userId) { - return userId == UserHandle.USER_SYSTEM; - } - - /** - * Returns the current user id. Used instead of KeyguardUpdateMonitor in SystemUI components - * that run in the non-primary SystemUI process. - */ - public int getCurrentUser() { - return mCurrentUserId; - } - - /** - * Returns the processes user id. - */ - public int getProcessUser() { - if (mUm == null) return 0; - return mUm.getUserHandle(); - } - - /** - * Returns whether touch exploration is currently enabled. - */ - public boolean isTouchExplorationEnabled() { - if (mAccm == null) return false; - - return mAccm.isEnabled() && mAccm.isTouchExplorationEnabled(); - } - - /** - * Returns whether the current task is in screen-pinning mode. - */ - public boolean isScreenPinningActive() { - if (mIam == null) return false; - - try { - return mIatm.getLockTaskModeState() == ActivityManager.LOCK_TASK_MODE_PINNED; - } catch (RemoteException e) { - return false; - } - } - - /** - * Returns the smallest width/height. - */ - public int getDeviceSmallestWidth() { - if (mDisplay == null) return 0; - - Point smallestSizeRange = new Point(); - Point largestSizeRange = new Point(); - mDisplay.getCurrentSizeRange(smallestSizeRange, largestSizeRange); - return smallestSizeRange.x; - } - - /** - * Returns the current display rect in the current display orientation. - */ - public Rect getDisplayRect() { - Rect displayRect = new Rect(); - if (mDisplay == null) return displayRect; - - Point p = new Point(); - mDisplay.getRealSize(p); - displayRect.set(0, 0, p.x, p.y); - return displayRect; - } - - /** - * Returns the window rect for the RecentsActivity, based on the dimensions of the recents stack - */ - public Rect getWindowRect() { - Rect windowRect = new Rect(); - if (mIam == null) return windowRect; - - try { - // Use the recents stack bounds, fallback to fullscreen stack if it is null - ActivityManager.StackInfo stackInfo = - mIatm.getStackInfo(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_RECENTS); - if (stackInfo == null) { - stackInfo = mIatm.getStackInfo(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); - } - if (stackInfo != null) { - windowRect.set(stackInfo.bounds); - } - } catch (RemoteException e) { - e.printStackTrace(); - } finally { - return windowRect; - } - } - - public void startActivityAsUserAsync(Intent intent, ActivityOptions opts) { - mUiOffloadThread.submit(() -> mContext.startActivityAsUser(intent, - opts != null ? opts.toBundle() : null, UserHandle.CURRENT)); - } - - /** Starts an in-place animation on the front most application windows. */ - public void startInPlaceAnimationOnFrontMostApplication(ActivityOptions opts) { - if (mIam == null) return; - - try { - mIatm.startInPlaceAnimationOnFrontMostApplication( - opts == null ? null : opts.toBundle()); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void registerDockedStackListener(IDockedStackListener listener) { - if (mWm == null) return; - - try { - mIwm.registerDockedStackListener(listener); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Calculates the size of the dock divider in the current orientation. - */ - public int getDockedDividerSize(Context context) { - Resources res = context.getResources(); - int dividerWindowWidth = res.getDimensionPixelSize( - com.android.internal.R.dimen.docked_stack_divider_thickness); - int dividerInsets = res.getDimensionPixelSize( - com.android.internal.R.dimen.docked_stack_divider_insets); - return dividerWindowWidth - 2 * dividerInsets; - } - - public void requestKeyboardShortcuts( - Context context, KeyboardShortcutsReceiver receiver, int deviceId) { - mWm.requestAppKeyboardShortcuts(receiver, deviceId); - } - - public void getStableInsets(Rect outStableInsets) { - if (mWm == null) return; - - try { - mIwm.getStableInsets(Display.DEFAULT_DISPLAY, outStableInsets); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Updates the visibility of recents. - */ - public void setRecentsVisibility(final boolean visible) { - mUiOffloadThread.submit(() -> { - try { - mIwm.setRecentsVisibility(visible); - } catch (RemoteException e) { - Log.e(TAG, "Unable to reach window manager", e); - } - }); - } - - /** - * Updates the visibility of the picture-in-picture. - */ - public void setPipVisibility(final boolean visible) { - mUiOffloadThread.submit(() -> { - try { - mIwm.setPipVisibility(visible); - } catch (RemoteException e) { - Log.e(TAG, "Unable to reach window manager", e); - } - }); - } - - public boolean isDreaming() { - try { - return mDreamManager.isDreaming(); - } catch (RemoteException e) { - Log.e(TAG, "Failed to query dream manager.", e); - } - return false; - } - - public void awakenDreamsAsync() { - mUiOffloadThread.submit(() -> { - try { - mDreamManager.awaken(); - } catch (RemoteException e) { - e.printStackTrace(); - } - }); - } - - public interface StartActivityFromRecentsResultListener { - void onStartActivityResult(boolean succeeded); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/BackgroundTaskLoader.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/BackgroundTaskLoader.java deleted file mode 100644 index e85a7fb27505..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/BackgroundTaskLoader.java +++ /dev/null @@ -1,169 +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.recents.model; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Handler; -import android.os.HandlerThread; -import android.util.Log; - -import com.android.systemui.shared.recents.model.IconLoader; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; - -/** - * Background task resource loader - */ -class BackgroundTaskLoader implements Runnable { - static String TAG = "BackgroundTaskLoader"; - static boolean DEBUG = false; - - private Context mContext; - private final HandlerThread mLoadThread; - private final Handler mLoadThreadHandler; - private final Handler mMainThreadHandler; - - private final TaskResourceLoadQueue mLoadQueue; - private final IconLoader mIconLoader; - - private boolean mStarted; - private boolean mCancelled; - private boolean mWaitingOnLoadQueue; - - private final OnIdleChangedListener mOnIdleChangedListener; - - /** Constructor, creates a new loading thread that loads task resources in the background */ - public BackgroundTaskLoader(TaskResourceLoadQueue loadQueue, - IconLoader iconLoader, OnIdleChangedListener onIdleChangedListener) { - mLoadQueue = loadQueue; - mIconLoader = iconLoader; - mMainThreadHandler = new Handler(); - mOnIdleChangedListener = onIdleChangedListener; - mLoadThread = new HandlerThread("Recents-TaskResourceLoader", - android.os.Process.THREAD_PRIORITY_BACKGROUND); - mLoadThread.start(); - mLoadThreadHandler = new Handler(mLoadThread.getLooper()); - } - - /** Restarts the loader thread */ - void start(Context context) { - mContext = context; - mCancelled = false; - if (!mStarted) { - // Start loading on the load thread - mStarted = true; - mLoadThreadHandler.post(this); - } else { - // Notify the load thread to start loading again - synchronized (mLoadThread) { - mLoadThread.notifyAll(); - } - } - } - - /** Requests the loader thread to stop after the current iteration */ - void stop() { - // Mark as cancelled for the thread to pick up - mCancelled = true; - // If we are waiting for the load queue for more tasks, then we can just reset the - // Context now, since nothing is using it - if (mWaitingOnLoadQueue) { - mContext = null; - } - } - - @Override - public void run() { - while (true) { - if (mCancelled) { - // We have to unset the context here, since the background thread may be using it - // when we call stop() - mContext = null; - // If we are cancelled, then wait until we are started again - synchronized(mLoadThread) { - try { - mLoadThread.wait(); - } catch (InterruptedException ie) { - ie.printStackTrace(); - } - } - } else { - // If we've stopped the loader, then fall through to the above logic to wait on - // the load thread - processLoadQueueItem(); - - // If there are no other items in the list, then just wait until something is added - if (!mCancelled && mLoadQueue.isEmpty()) { - synchronized(mLoadQueue) { - try { - mWaitingOnLoadQueue = true; - mMainThreadHandler.post(new Runnable() { - @Override - public void run() { - mOnIdleChangedListener.onIdleChanged(true); - } - }); - mLoadQueue.wait(); - mMainThreadHandler.post(new Runnable() { - @Override - public void run() { - mOnIdleChangedListener.onIdleChanged(false); - } - }); - mWaitingOnLoadQueue = false; - } catch (InterruptedException ie) { - ie.printStackTrace(); - } - } - } - } - } - } - - /** - * This needs to be in a separate method to work around an surprising interpreter behavior: - * The register will keep the local reference to cachedThumbnailData even if it falls out of - * scope. Putting it into a method fixes this issue. - */ - private void processLoadQueueItem() { - // Load the next item from the queue - final Task t = mLoadQueue.nextTask(); - if (t != null) { - final Drawable icon = mIconLoader.getIcon(t); - if (DEBUG) Log.d(TAG, "Loading thumbnail: " + t.key); - final ThumbnailData thumbnailData = - ActivityManagerWrapper.getInstance().getTaskThumbnail(t.key.id, - true /* reducedResolution */); - - if (!mCancelled) { - // Notify that the task data has changed - mMainThreadHandler.post(new Runnable() { - @Override - public void run() { - t.notifyTaskDataLoaded(thumbnailData, icon); - } - }); - } - } - } - - interface OnIdleChangedListener { - void onIdleChanged(boolean idle); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/FilteredTaskList.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/FilteredTaskList.java deleted file mode 100644 index 005be75b1b97..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/FilteredTaskList.java +++ /dev/null @@ -1,125 +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.recents.model; - -import android.util.ArrayMap; -import android.util.SparseArray; - -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; - -import java.util.ArrayList; -import java.util.List; - -/** - * A list of filtered tasks. - */ -class FilteredTaskList { - - private final ArrayList<Task> mTasks = new ArrayList<>(); - private final ArrayList<Task> mFilteredTasks = new ArrayList<>(); - private final ArrayMap<TaskKey, Integer> mFilteredTaskIndices = new ArrayMap<>(); - private TaskFilter mFilter; - - /** Sets the task filter, and returns whether the set of filtered tasks have changed. */ - boolean setFilter(TaskFilter filter) { - ArrayList<Task> prevFilteredTasks = new ArrayList<>(mFilteredTasks); - mFilter = filter; - updateFilteredTasks(); - return !prevFilteredTasks.equals(mFilteredTasks); - } - - /** Adds a new task to the task list */ - void add(Task t) { - mTasks.add(t); - updateFilteredTasks(); - } - - /** Sets the list of tasks */ - void set(List<Task> tasks) { - mTasks.clear(); - mTasks.addAll(tasks); - updateFilteredTasks(); - } - - /** Removes a task from the base list only if it is in the filtered list */ - boolean remove(Task t) { - if (mFilteredTasks.contains(t)) { - boolean removed = mTasks.remove(t); - updateFilteredTasks(); - return removed; - } - return false; - } - - /** Returns the index of this task in the list of filtered tasks */ - int indexOf(Task t) { - if (t != null && mFilteredTaskIndices.containsKey(t.key)) { - return mFilteredTaskIndices.get(t.key); - } - return -1; - } - - /** Returns the size of the list of filtered tasks */ - int size() { - return mFilteredTasks.size(); - } - - /** Returns whether the filtered list contains this task */ - boolean contains(Task t) { - return mFilteredTaskIndices.containsKey(t.key); - } - - /** Updates the list of filtered tasks whenever the base task list changes */ - private void updateFilteredTasks() { - mFilteredTasks.clear(); - if (mFilter != null) { - // Create a sparse array from task id to Task - SparseArray<Task> taskIdMap = new SparseArray<>(); - int taskCount = mTasks.size(); - for (int i = 0; i < taskCount; i++) { - Task t = mTasks.get(i); - taskIdMap.put(t.key.id, t); - } - - for (int i = 0; i < taskCount; i++) { - Task t = mTasks.get(i); - if (mFilter.acceptTask(taskIdMap, t, i)) { - mFilteredTasks.add(t); - } - } - } else { - mFilteredTasks.addAll(mTasks); - } - updateFilteredTaskIndices(); - } - - /** Updates the mapping of tasks to indices. */ - private void updateFilteredTaskIndices() { - int taskCount = mFilteredTasks.size(); - mFilteredTaskIndices.clear(); - for (int i = 0; i < taskCount; i++) { - Task t = mFilteredTasks.get(i); - mFilteredTaskIndices.put(t.key, i); - } - } - - /** Returns the list of filtered tasks */ - ArrayList<Task> getTasks() { - return mFilteredTasks; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/HighResThumbnailLoader.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/HighResThumbnailLoader.java deleted file mode 100644 index 34bc334204ee..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/HighResThumbnailLoader.java +++ /dev/null @@ -1,247 +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.recents.model; - -import static android.os.Process.setThreadPriority; - -import android.os.Handler; -import android.os.Looper; -import android.os.SystemClock; -import android.util.ArraySet; - -import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskCallbacks; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; - -import java.util.ArrayDeque; -import java.util.ArrayList; - -/** - * Loader class that loads full-resolution thumbnails when appropriate. - */ -public class HighResThumbnailLoader implements - TaskCallbacks, BackgroundTaskLoader.OnIdleChangedListener { - - private final ActivityManagerWrapper mActivityManager; - - @GuardedBy("mLoadQueue") - private final ArrayDeque<Task> mLoadQueue = new ArrayDeque<>(); - @GuardedBy("mLoadQueue") - private final ArraySet<Task> mLoadingTasks = new ArraySet<>(); - @GuardedBy("mLoadQueue") - private boolean mLoaderIdling; - - private final ArrayList<Task> mVisibleTasks = new ArrayList<>(); - - private final Thread mLoadThread; - private final Handler mMainThreadHandler; - private final boolean mIsLowRamDevice; - private boolean mLoading; - private boolean mVisible; - private boolean mFlingingFast; - private boolean mTaskLoadQueueIdle; - - public HighResThumbnailLoader(ActivityManagerWrapper activityManager, Looper looper, - boolean isLowRamDevice) { - mActivityManager = activityManager; - mMainThreadHandler = new Handler(looper); - mLoadThread = new Thread(mLoader, "Recents-HighResThumbnailLoader"); - mLoadThread.start(); - mIsLowRamDevice = isLowRamDevice; - } - - public void setVisible(boolean visible) { - if (mIsLowRamDevice) { - return; - } - mVisible = visible; - updateLoading(); - } - - public void setFlingingFast(boolean flingingFast) { - if (mFlingingFast == flingingFast || mIsLowRamDevice) { - return; - } - mFlingingFast = flingingFast; - updateLoading(); - } - - @Override - public void onIdleChanged(boolean idle) { - setTaskLoadQueueIdle(idle); - } - - /** - * Sets whether the other task load queue is idling. Avoid double-loading bitmaps by not - * starting this queue until the other queue is idling. - */ - public void setTaskLoadQueueIdle(boolean idle) { - if (mIsLowRamDevice) { - return; - } - mTaskLoadQueueIdle = idle; - updateLoading(); - } - - @VisibleForTesting - boolean isLoading() { - return mLoading; - } - - private void updateLoading() { - setLoading(mVisible && !mFlingingFast && mTaskLoadQueueIdle); - } - - private void setLoading(boolean loading) { - if (loading == mLoading) { - return; - } - synchronized (mLoadQueue) { - mLoading = loading; - if (!loading) { - stopLoading(); - } else { - startLoading(); - } - } - } - - @GuardedBy("mLoadQueue") - private void startLoading() { - for (int i = mVisibleTasks.size() - 1; i >= 0; i--) { - Task t = mVisibleTasks.get(i); - if ((t.thumbnail == null || t.thumbnail.reducedResolution) - && !mLoadQueue.contains(t) && !mLoadingTasks.contains(t)) { - mLoadQueue.add(t); - } - } - mLoadQueue.notifyAll(); - } - - @GuardedBy("mLoadQueue") - private void stopLoading() { - mLoadQueue.clear(); - mLoadQueue.notifyAll(); - } - - /** - * Needs to be called when a task becomes visible. Note that this is different from - * {@link TaskCallbacks#onTaskDataLoaded} as this method should only be called once when it - * becomes visible, whereas onTaskDataLoaded can be called multiple times whenever some data - * has been updated. - */ - public void onTaskVisible(Task t) { - t.addCallback(this); - mVisibleTasks.add(t); - if ((t.thumbnail == null || t.thumbnail.reducedResolution) && mLoading) { - synchronized (mLoadQueue) { - mLoadQueue.add(t); - mLoadQueue.notifyAll(); - } - } - } - - /** - * Needs to be called when a task becomes visible. See {@link #onTaskVisible} why this is - * different from {@link TaskCallbacks#onTaskDataUnloaded()} - */ - public void onTaskInvisible(Task t) { - t.removeCallback(this); - mVisibleTasks.remove(t); - synchronized (mLoadQueue) { - mLoadQueue.remove(t); - } - } - - @VisibleForTesting - void waitForLoaderIdle() { - while (true) { - synchronized (mLoadQueue) { - if (mLoadQueue.isEmpty() && mLoaderIdling) { - return; - } - } - SystemClock.sleep(100); - } - } - - @Override - public void onTaskDataLoaded(Task task, ThumbnailData thumbnailData) { - if (thumbnailData != null && !thumbnailData.reducedResolution) { - synchronized (mLoadQueue) { - mLoadQueue.remove(task); - } - } - } - - @Override - public void onTaskDataUnloaded() { - } - - @Override - public void onTaskWindowingModeChanged() { - } - - private final Runnable mLoader = new Runnable() { - - @Override - public void run() { - setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND + 1); - while (true) { - Task next = null; - synchronized (mLoadQueue) { - if (!mLoading || mLoadQueue.isEmpty()) { - try { - mLoaderIdling = true; - mLoadQueue.wait(); - mLoaderIdling = false; - } catch (InterruptedException e) { - // Don't care. - } - } else { - next = mLoadQueue.poll(); - if (next != null) { - mLoadingTasks.add(next); - } - } - } - if (next != null) { - loadTask(next); - } - } - } - - private void loadTask(final Task t) { - final ThumbnailData thumbnail = mActivityManager.getTaskThumbnail(t.key.id, - false /* reducedResolution */); - mMainThreadHandler.post(new Runnable() { - @Override - public void run() { - synchronized (mLoadQueue) { - mLoadingTasks.remove(t); - } - if (mVisibleTasks.contains(t)) { - t.notifyTaskDataLoaded(thumbnail, t.icon); - } - } - }); - } - }; -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java deleted file mode 100644 index 2df79d87b1fe..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java +++ /dev/null @@ -1,216 +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.systemui.recents.model; - -import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; - -import android.app.ActivityManager; -import android.app.ActivityTaskManager; -import android.app.KeyguardManager; -import android.content.ComponentName; -import android.content.Context; -import android.content.pm.ActivityInfo; -import android.content.pm.ApplicationInfo; -import android.content.res.Resources; -import android.graphics.drawable.Drawable; -import android.util.SparseBooleanArray; - -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - - -/** - * This class stores the loading state as it goes through multiple stages of loading: - * 1) preloadRawTasks() will load the raw set of recents tasks from the system - * 2) preloadPlan() will construct a new task stack with all metadata and only icons and - * thumbnails that are currently in the cache - * 3) executePlan() will actually load and fill in the icons and thumbnails according to the load - * options specified, such that we can transition into the Recents activity seamlessly - */ -public class RecentsTaskLoadPlan { - - /** The set of conditions to preload tasks. */ - public static class PreloadOptions { - public boolean loadTitles = true; - } - - /** The set of conditions to load tasks. */ - public static class Options { - public int runningTaskId = -1; - public boolean loadIcons = true; - public boolean loadThumbnails = false; - public boolean onlyLoadForCache = false; - public boolean onlyLoadPausedActivities = false; - public int numVisibleTasks = 0; - public int numVisibleTaskThumbnails = 0; - } - - private final Context mContext; - private final KeyguardManager mKeyguardManager; - - private List<ActivityManager.RecentTaskInfo> mRawTasks; - private TaskStack mStack; - - private final SparseBooleanArray mTmpLockedUsers = new SparseBooleanArray(); - - public RecentsTaskLoadPlan(Context context) { - mContext = context; - mKeyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); - } - - /** - * Preloads the list of recent tasks from the system. After this call, the TaskStack will - * have a list of all the recent tasks with their metadata, not including icons or - * thumbnails which were not cached and have to be loaded. - * - * The tasks will be ordered by: - * - least-recent to most-recent stack tasks - * - * Note: Do not lock, since this can be calling back to the loader, which separately also drives - * this call (callers should synchronize on the loader before making this call). - */ - public void preloadPlan(PreloadOptions opts, RecentsTaskLoader loader, int runningTaskId, - int currentUserId) { - Resources res = mContext.getResources(); - ArrayList<Task> allTasks = new ArrayList<>(); - if (mRawTasks == null) { - mRawTasks = ActivityManagerWrapper.getInstance().getRecentTasks( - ActivityTaskManager.getMaxRecentTasksStatic(), currentUserId); - - // Since the raw tasks are given in most-recent to least-recent order, we need to reverse it - Collections.reverse(mRawTasks); - } - - int taskCount = mRawTasks.size(); - for (int i = 0; i < taskCount; i++) { - ActivityManager.RecentTaskInfo t = mRawTasks.get(i); - - // Compose the task key - final ComponentName sourceComponent = t.origActivity != null - // Activity alias if there is one - ? t.origActivity - // The real activity if there is no alias (or the target if there is one) - : t.realActivity; - final int windowingMode = t.configuration.windowConfiguration.getWindowingMode(); - TaskKey taskKey = new TaskKey(t.persistentId, windowingMode, t.baseIntent, - sourceComponent, t.userId, t.lastActiveTime, t.displayId); - - boolean isFreeformTask = windowingMode == WINDOWING_MODE_FREEFORM; - boolean isStackTask = !isFreeformTask; - boolean isLaunchTarget = taskKey.id == runningTaskId; - - ActivityInfo info = loader.getAndUpdateActivityInfo(taskKey); - if (info == null) { - continue; - } - - // Load the title, icon, and color - String title = opts.loadTitles - ? loader.getAndUpdateActivityTitle(taskKey, t.taskDescription) - : ""; - String titleDescription = opts.loadTitles - ? loader.getAndUpdateContentDescription(taskKey, t.taskDescription) - : ""; - Drawable icon = isStackTask - ? loader.getAndUpdateActivityIcon(taskKey, t.taskDescription, false) - : null; - ThumbnailData thumbnail = loader.getAndUpdateThumbnail(taskKey, - false /* loadIfNotCached */, false /* storeInCache */); - int activityColor = loader.getActivityPrimaryColor(t.taskDescription); - int backgroundColor = loader.getActivityBackgroundColor(t.taskDescription); - boolean isSystemApp = (info != null) && - ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0); - - // TODO: Refactor to not do this every preload - if (mTmpLockedUsers.indexOfKey(t.userId) < 0) { - mTmpLockedUsers.put(t.userId, mKeyguardManager.isDeviceLocked(t.userId)); - } - boolean isLocked = mTmpLockedUsers.get(t.userId); - - // Add the task to the stack - Task task = new Task(taskKey, icon, - thumbnail, title, titleDescription, activityColor, backgroundColor, - isLaunchTarget, isStackTask, isSystemApp, t.supportsSplitScreenMultiWindow, - t.taskDescription, t.resizeMode, t.topActivity, isLocked); - - allTasks.add(task); - } - - // Initialize the stacks - mStack = new TaskStack(); - mStack.setTasks(allTasks, false /* notifyStackChanges */); - } - - /** - * Called to apply the actual loading based on the specified conditions. - * - * Note: Do not lock, since this can be calling back to the loader, which separately also drives - * this call (callers should synchronize on the loader before making this call). - */ - public void executePlan(Options opts, RecentsTaskLoader loader) { - Resources res = mContext.getResources(); - - // Iterate through each of the tasks and load them according to the load conditions. - ArrayList<Task> tasks = mStack.getTasks(); - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - Task task = tasks.get(i); - TaskKey taskKey = task.key; - - boolean isRunningTask = (task.key.id == opts.runningTaskId); - boolean isVisibleTask = i >= (taskCount - opts.numVisibleTasks); - boolean isVisibleThumbnail = i >= (taskCount - opts.numVisibleTaskThumbnails); - - // If requested, skip the running task - if (opts.onlyLoadPausedActivities && isRunningTask) { - continue; - } - - if (opts.loadIcons && (isRunningTask || isVisibleTask)) { - if (task.icon == null) { - task.icon = loader.getAndUpdateActivityIcon(taskKey, task.taskDescription, - true); - } - } - if (opts.loadThumbnails && isVisibleThumbnail) { - task.thumbnail = loader.getAndUpdateThumbnail(taskKey, - true /* loadIfNotCached */, true /* storeInCache */); - } - } - } - - /** - * Returns the TaskStack from the preloaded list of recent tasks. - */ - public TaskStack getTaskStack() { - return mStack; - } - - /** Returns whether there are any tasks in any stacks. */ - public boolean hasTasks() { - if (mStack != null) { - return mStack.getTaskCount() > 0; - } - return false; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/RecentsTaskLoader.java deleted file mode 100644 index 012913a60b66..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/RecentsTaskLoader.java +++ /dev/null @@ -1,421 +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.systemui.recents.model; - -import android.app.ActivityManager; -import android.app.ActivityTaskManager; -import android.content.ComponentCallbacks2; -import android.content.ComponentName; -import android.content.Context; -import android.content.pm.ActivityInfo; -import android.graphics.drawable.Drawable; -import android.os.Looper; -import android.os.Trace; -import android.util.Log; -import android.util.LruCache; - -import com.android.internal.annotations.GuardedBy; -import com.android.systemui.recents.model.RecentsTaskLoadPlan.Options; -import com.android.systemui.recents.model.RecentsTaskLoadPlan.PreloadOptions; -import com.android.systemui.shared.recents.model.IconLoader; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; -import com.android.systemui.shared.recents.model.TaskKeyLruCache; -import com.android.systemui.shared.recents.model.TaskKeyLruCache.EvictionCallback; -import com.android.systemui.shared.recents.model.ThumbnailData; -import com.android.systemui.shared.system.ActivityManagerWrapper; - -import java.io.PrintWriter; -import java.util.Map; - - -/** - * Recents task loader - */ -public class RecentsTaskLoader { - private static final String TAG = "RecentsTaskLoader"; - private static final boolean DEBUG = false; - - /** Levels of svelte in increasing severity/austerity. */ - // No svelting. - public static final int SVELTE_NONE = 0; - // Limit thumbnail cache to number of visible thumbnails when Recents was loaded, disable - // caching thumbnails as you scroll. - public static final int SVELTE_LIMIT_CACHE = 1; - // Disable the thumbnail cache, load thumbnails asynchronously when the activity loads and - // evict all thumbnails when hidden. - public static final int SVELTE_DISABLE_CACHE = 2; - // Disable all thumbnail loading. - public static final int SVELTE_DISABLE_LOADING = 3; - - // This activity info LruCache is useful because it can be expensive to retrieve ActivityInfos - // for many tasks, which we use to get the activity labels and icons. Unlike the other caches - // below, this is per-package so we can't invalidate the items in the cache based on the last - // active time. Instead, we rely on the PackageMonitor to keep us informed whenever a - // package in the cache has been updated, so that we may remove it. - private final LruCache<ComponentName, ActivityInfo> mActivityInfoCache; - private final TaskKeyLruCache<Drawable> mIconCache; - private final TaskKeyLruCache<String> mActivityLabelCache; - private final TaskKeyLruCache<String> mContentDescriptionCache; - private final TaskResourceLoadQueue mLoadQueue; - private final IconLoader mIconLoader; - private final BackgroundTaskLoader mLoader; - private final HighResThumbnailLoader mHighResThumbnailLoader; - @GuardedBy("this") - private final TaskKeyStrongCache<ThumbnailData> mThumbnailCache = new TaskKeyStrongCache<>(); - @GuardedBy("this") - private final TaskKeyStrongCache<ThumbnailData> mTempCache = new TaskKeyStrongCache<>(); - private final int mMaxThumbnailCacheSize; - private final int mMaxIconCacheSize; - private int mNumVisibleTasksLoaded; - private int mSvelteLevel; - - private int mDefaultTaskBarBackgroundColor; - private int mDefaultTaskViewBackgroundColor; - - private EvictionCallback mClearActivityInfoOnEviction = new EvictionCallback() { - @Override - public void onEntryEvicted(TaskKey key) { - if (key != null) { - mActivityInfoCache.remove(key.getComponent()); - } - } - }; - - public RecentsTaskLoader(Context context, int maxThumbnailCacheSize, int maxIconCacheSize, - int svelteLevel) { - mMaxThumbnailCacheSize = maxThumbnailCacheSize; - mMaxIconCacheSize = maxIconCacheSize; - mSvelteLevel = svelteLevel; - - // Initialize the proxy, cache and loaders - int numRecentTasks = ActivityTaskManager.getMaxRecentTasksStatic(); - mHighResThumbnailLoader = new HighResThumbnailLoader(ActivityManagerWrapper.getInstance(), - Looper.getMainLooper(), ActivityManager.isLowRamDeviceStatic()); - mLoadQueue = new TaskResourceLoadQueue(); - mIconCache = new TaskKeyLruCache<>(mMaxIconCacheSize, mClearActivityInfoOnEviction); - mActivityLabelCache = new TaskKeyLruCache<>(numRecentTasks, mClearActivityInfoOnEviction); - mContentDescriptionCache = new TaskKeyLruCache<>(numRecentTasks, - mClearActivityInfoOnEviction); - mActivityInfoCache = new LruCache<>(numRecentTasks); - - mIconLoader = createNewIconLoader(context, mIconCache, mActivityInfoCache); - mLoader = new BackgroundTaskLoader(mLoadQueue, mIconLoader, mHighResThumbnailLoader); - } - - protected IconLoader createNewIconLoader(Context context,TaskKeyLruCache<Drawable> iconCache, - LruCache<ComponentName, ActivityInfo> activityInfoCache) { - return new IconLoader.DefaultIconLoader(context, iconCache, activityInfoCache); - } - - /** - * Sets the default task bar/view colors if none are provided by the app. - */ - public void setDefaultColors(int defaultTaskBarBackgroundColor, - int defaultTaskViewBackgroundColor) { - mDefaultTaskBarBackgroundColor = defaultTaskBarBackgroundColor; - mDefaultTaskViewBackgroundColor = defaultTaskViewBackgroundColor; - } - - /** Returns the size of the app icon cache. */ - public int getIconCacheSize() { - return mMaxIconCacheSize; - } - - /** Returns the size of the thumbnail cache. */ - public int getThumbnailCacheSize() { - return mMaxThumbnailCacheSize; - } - - public HighResThumbnailLoader getHighResThumbnailLoader() { - return mHighResThumbnailLoader; - } - - /** Preloads recents tasks using the specified plan to store the output. */ - public synchronized void preloadTasks(RecentsTaskLoadPlan plan, int runningTaskId) { - preloadTasks(plan, runningTaskId, ActivityManagerWrapper.getInstance().getCurrentUserId()); - } - - /** Preloads recents tasks using the specified plan to store the output. */ - public synchronized void preloadTasks(RecentsTaskLoadPlan plan, int runningTaskId, - int currentUserId) { - try { - Trace.beginSection("preloadPlan"); - plan.preloadPlan(new PreloadOptions(), this, runningTaskId, currentUserId); - } finally { - Trace.endSection(); - } - } - - /** Begins loading the heavy task data according to the specified options. */ - public synchronized void loadTasks(RecentsTaskLoadPlan plan, Options opts) { - if (opts == null) { - throw new RuntimeException("Requires load options"); - } - if (opts.onlyLoadForCache && opts.loadThumbnails) { - // If we are loading for the cache, we'd like to have the real cache only include the - // visible thumbnails. However, we also don't want to reload already cached thumbnails. - // Thus, we copy over the current entries into a second cache, and clear the real cache, - // such that the real cache only contains visible thumbnails. - mTempCache.copyEntries(mThumbnailCache); - mThumbnailCache.evictAll(); - } - plan.executePlan(opts, this); - mTempCache.evictAll(); - if (!opts.onlyLoadForCache) { - mNumVisibleTasksLoaded = opts.numVisibleTasks; - } - } - - /** - * Acquires the task resource data directly from the cache, loading if necessary. - */ - public void loadTaskData(Task t) { - Drawable icon = mIconCache.getAndInvalidateIfModified(t.key); - icon = icon != null ? icon : mIconLoader.getDefaultIcon(t.key.userId); - mLoadQueue.addTask(t); - t.notifyTaskDataLoaded(t.thumbnail, icon); - } - - /** Releases the task resource data back into the pool. */ - public void unloadTaskData(Task t) { - mLoadQueue.removeTask(t); - t.notifyTaskDataUnloaded(mIconLoader.getDefaultIcon(t.key.userId)); - } - - /** Completely removes the resource data from the pool. */ - public void deleteTaskData(Task t, boolean notifyTaskDataUnloaded) { - mLoadQueue.removeTask(t); - mIconCache.remove(t.key); - mActivityLabelCache.remove(t.key); - mContentDescriptionCache.remove(t.key); - if (notifyTaskDataUnloaded) { - t.notifyTaskDataUnloaded(mIconLoader.getDefaultIcon(t.key.userId)); - } - } - - /** - * Handles signals from the system, trimming memory when requested to prevent us from running - * out of memory. - */ - public synchronized void onTrimMemory(int level) { - switch (level) { - case ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN: - // Stop the loader immediately when the UI is no longer visible - stopLoader(); - mIconCache.trimToSize(Math.max(mNumVisibleTasksLoaded, - mMaxIconCacheSize / 2)); - break; - case ComponentCallbacks2.TRIM_MEMORY_RUNNING_MODERATE: - case ComponentCallbacks2.TRIM_MEMORY_BACKGROUND: - // We are leaving recents, so trim the data a bit - mIconCache.trimToSize(Math.max(1, mMaxIconCacheSize / 2)); - mActivityInfoCache.trimToSize(Math.max(1, - ActivityTaskManager.getMaxRecentTasksStatic() / 2)); - break; - case ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW: - case ComponentCallbacks2.TRIM_MEMORY_MODERATE: - // We are going to be low on memory - mIconCache.trimToSize(Math.max(1, mMaxIconCacheSize / 4)); - mActivityInfoCache.trimToSize(Math.max(1, - ActivityTaskManager.getMaxRecentTasksStatic() / 4)); - break; - case ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL: - case ComponentCallbacks2.TRIM_MEMORY_COMPLETE: - // We are low on memory, so release everything - mIconCache.evictAll(); - mActivityInfoCache.evictAll(); - // The cache is small, only clear the label cache when we are critical - mActivityLabelCache.evictAll(); - mContentDescriptionCache.evictAll(); - mThumbnailCache.evictAll(); - break; - default: - break; - } - } - - public void onPackageChanged(String packageName) { - // Remove all the cached activity infos for this package. The other caches do not need to - // be pruned at this time, as the TaskKey expiration checks will flush them next time their - // cached contents are requested - Map<ComponentName, ActivityInfo> activityInfoCache = mActivityInfoCache.snapshot(); - for (ComponentName cn : activityInfoCache.keySet()) { - if (cn.getPackageName().equals(packageName)) { - if (DEBUG) { - Log.d(TAG, "Removing activity info from cache: " + cn); - } - mActivityInfoCache.remove(cn); - } - } - } - - /** - * Returns the cached task label if the task key is not expired, updating the cache if it is. - */ - String getAndUpdateActivityTitle(TaskKey taskKey, ActivityManager.TaskDescription td) { - // Return the task description label if it exists - if (td != null && td.getLabel() != null) { - return td.getLabel(); - } - // Return the cached activity label if it exists - String label = mActivityLabelCache.getAndInvalidateIfModified(taskKey); - if (label != null) { - return label; - } - // All short paths failed, load the label from the activity info and cache it - ActivityInfo activityInfo = getAndUpdateActivityInfo(taskKey); - if (activityInfo != null) { - label = ActivityManagerWrapper.getInstance().getBadgedActivityLabel(activityInfo, - taskKey.userId); - mActivityLabelCache.put(taskKey, label); - return label; - } - // If the activity info does not exist or fails to load, return an empty label for now, - // but do not cache it - return ""; - } - - /** - * Returns the cached task content description if the task key is not expired, updating the - * cache if it is. - */ - String getAndUpdateContentDescription(TaskKey taskKey, ActivityManager.TaskDescription td) { - // Return the cached content description if it exists - String label = mContentDescriptionCache.getAndInvalidateIfModified(taskKey); - if (label != null) { - return label; - } - - // All short paths failed, load the label from the activity info and cache it - ActivityInfo activityInfo = getAndUpdateActivityInfo(taskKey); - if (activityInfo != null) { - label = ActivityManagerWrapper.getInstance().getBadgedContentDescription( - activityInfo, taskKey.userId, td); - if (td == null) { - // Only add to the cache if the task description is null, otherwise, it is possible - // for the task description to change between calls without the last active time - // changing (ie. between preloading and Overview starting) which would lead to stale - // content descriptions - // TODO: Investigate improving this - mContentDescriptionCache.put(taskKey, label); - } - return label; - } - // If the content description does not exist, return an empty label for now, but do not - // cache it - return ""; - } - - /** - * Returns the cached task icon if the task key is not expired, updating the cache if it is. - */ - Drawable getAndUpdateActivityIcon(TaskKey taskKey, ActivityManager.TaskDescription td, - boolean loadIfNotCached) { - return mIconLoader.getAndInvalidateIfModified(taskKey, td, loadIfNotCached); - } - - /** - * Returns the cached thumbnail if the task key is not expired, updating the cache if it is. - */ - synchronized ThumbnailData getAndUpdateThumbnail(TaskKey taskKey, boolean loadIfNotCached, - boolean storeInCache) { - ThumbnailData cached = mThumbnailCache.getAndInvalidateIfModified(taskKey); - if (cached != null) { - return cached; - } - - cached = mTempCache.getAndInvalidateIfModified(taskKey); - if (cached != null) { - mThumbnailCache.put(taskKey, cached); - return cached; - } - - if (loadIfNotCached) { - if (mSvelteLevel < SVELTE_DISABLE_LOADING) { - // Load the thumbnail from the system - ThumbnailData thumbnailData = ActivityManagerWrapper.getInstance().getTaskThumbnail( - taskKey.id, true /* reducedResolution */); - if (thumbnailData.thumbnail != null) { - if (storeInCache) { - mThumbnailCache.put(taskKey, thumbnailData); - } - return thumbnailData; - } - } - } - - // We couldn't load any thumbnail - return null; - } - - /** - * Returns the task's primary color if possible, defaulting to the default color if there is - * no specified primary color. - */ - int getActivityPrimaryColor(ActivityManager.TaskDescription td) { - if (td != null && td.getPrimaryColor() != 0) { - return td.getPrimaryColor(); - } - return mDefaultTaskBarBackgroundColor; - } - - /** - * Returns the task's background color if possible. - */ - int getActivityBackgroundColor(ActivityManager.TaskDescription td) { - if (td != null && td.getBackgroundColor() != 0) { - return td.getBackgroundColor(); - } - return mDefaultTaskViewBackgroundColor; - } - - /** - * Returns the activity info for the given task key, retrieving one from the system if the - * task key is expired. - */ - ActivityInfo getAndUpdateActivityInfo(TaskKey taskKey) { - return mIconLoader.getAndUpdateActivityInfo(taskKey); - } - - /** - * Starts loading tasks. - */ - public void startLoader(Context ctx) { - mLoader.start(ctx); - } - - /** - * Stops the task loader and clears all queued, pending task loads. - */ - private void stopLoader() { - mLoader.stop(); - mLoadQueue.clearTasks(); - } - - public synchronized void dump(String prefix, PrintWriter writer) { - String innerPrefix = prefix + " "; - - writer.print(prefix); writer.println(TAG); - writer.print(prefix); writer.println("Icon Cache"); - mIconCache.dump(innerPrefix, writer); - writer.print(prefix); writer.println("Thumbnail Cache"); - mThumbnailCache.dump(innerPrefix, writer); - writer.print(prefix); writer.println("Temp Thumbnail Cache"); - mTempCache.dump(innerPrefix, writer); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskFilter.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskFilter.java deleted file mode 100644 index 9b734ec719ea..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskFilter.java +++ /dev/null @@ -1,28 +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.recents.model; - -import android.util.SparseArray; -import com.android.systemui.shared.recents.model.Task; - -/** - * An interface for a task filter to query whether a particular task should show in a stack. - */ -public interface TaskFilter { - /** Returns whether the filter accepts the specified task */ - boolean acceptTask(SparseArray<Task> taskIdMap, Task t, int index); -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskKeyStrongCache.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskKeyStrongCache.java deleted file mode 100644 index 27f2098868a1..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskKeyStrongCache.java +++ /dev/null @@ -1,73 +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.recents.model; - -import android.util.ArrayMap; - -import com.android.systemui.shared.recents.model.Task.TaskKey; - -import com.android.systemui.shared.recents.model.TaskKeyCache; -import com.android.systemui.shared.recents.model.TaskKeyLruCache; -import java.io.PrintWriter; - -/** - * Like {@link TaskKeyLruCache}, but without LRU functionality. - */ -public class TaskKeyStrongCache<V> extends TaskKeyCache<V> { - - private static final String TAG = "TaskKeyCache"; - - private final ArrayMap<Integer, V> mCache = new ArrayMap<>(); - - public final void copyEntries(TaskKeyStrongCache<V> other) { - for (int i = other.mKeys.size() - 1; i >= 0; i--) { - TaskKey key = other.mKeys.valueAt(i); - put(key, other.mCache.get(key.id)); - } - } - - public void dump(String prefix, PrintWriter writer) { - String innerPrefix = prefix + " "; - writer.print(prefix); writer.print(TAG); - writer.print(" numEntries="); writer.print(mKeys.size()); - writer.println(); - int keyCount = mKeys.size(); - for (int i = 0; i < keyCount; i++) { - writer.print(innerPrefix); writer.println(mKeys.get(mKeys.keyAt(i))); - } - } - - @Override - protected V getCacheEntry(int id) { - return mCache.get(id); - } - - @Override - protected void putCacheEntry(int id, V value) { - mCache.put(id, value); - } - - @Override - protected void removeCacheEntry(int id) { - mCache.remove(id); - } - - @Override - protected void evictAllCache() { - mCache.clear(); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskResourceLoadQueue.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskResourceLoadQueue.java deleted file mode 100644 index fe89ad5a324d..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskResourceLoadQueue.java +++ /dev/null @@ -1,61 +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.recents.model; - -import com.android.systemui.shared.recents.model.Task; -import java.util.concurrent.ConcurrentLinkedQueue; - -/** - * A Task load queue - */ -class TaskResourceLoadQueue { - - private final ConcurrentLinkedQueue<Task> mQueue = new ConcurrentLinkedQueue<>(); - - /** Adds a new task to the load queue */ - void addTask(Task t) { - if (!mQueue.contains(t)) { - mQueue.add(t); - } - synchronized(this) { - notifyAll(); - } - } - - /** - * Retrieves the next task from the load queue, as well as whether we want that task to be - * force reloaded. - */ - Task nextTask() { - return mQueue.poll(); - } - - /** Removes a task from the load queue */ - void removeTask(Task t) { - mQueue.remove(t); - } - - /** Clears all the tasks from the load queue */ - void clearTasks() { - mQueue.clear(); - } - - /** Returns whether the load queue is empty */ - boolean isEmpty() { - return mQueue.isEmpty(); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskStack.java deleted file mode 100644 index 01e6ba3f35ec..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/model/TaskStack.java +++ /dev/null @@ -1,402 +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.systemui.recents.model; - -import android.content.ComponentName; -import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.SparseArray; - -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.Task.TaskKey; -import com.android.systemui.recents.utilities.AnimationProps; -import com.android.systemui.shared.system.PackageManagerWrapper; - -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; - - -/** - * The task stack contains a list of multiple tasks. - */ -public class TaskStack { - - private static final String TAG = "TaskStack"; - - /** Task stack callbacks */ - public interface TaskStackCallbacks { - /** - * Notifies when a new task has been added to the stack. - */ - void onStackTaskAdded(TaskStack stack, Task newTask); - - /** - * Notifies when a task has been removed from the stack. - */ - void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask, - AnimationProps animation, boolean fromDockGesture, - boolean dismissRecentsIfAllRemoved); - - /** - * Notifies when all tasks have been removed from the stack. - */ - void onStackTasksRemoved(TaskStack stack); - - /** - * Notifies when tasks in the stack have been updated. - */ - void onStackTasksUpdated(TaskStack stack); - } - - private final ArrayList<Task> mRawTaskList = new ArrayList<>(); - private final FilteredTaskList mStackTaskList = new FilteredTaskList(); - private TaskStackCallbacks mCb; - - public TaskStack() { - // Ensure that we only show stack tasks - mStackTaskList.setFilter(new TaskFilter() { - @Override - public boolean acceptTask(SparseArray<Task> taskIdMap, Task t, int index) { - return t.isStackTask; - } - }); - } - - /** Sets the callbacks for this task stack. */ - public void setCallbacks(TaskStackCallbacks cb) { - mCb = cb; - } - - /** - * Removes a task from the stack, with an additional {@param animation} hint to the callbacks on - * how they should update themselves. - */ - public void removeTask(Task t, AnimationProps animation, boolean fromDockGesture) { - removeTask(t, animation, fromDockGesture, true /* dismissRecentsIfAllRemoved */); - } - - /** - * Removes a task from the stack, with an additional {@param animation} hint to the callbacks on - * how they should update themselves. - */ - public void removeTask(Task t, AnimationProps animation, boolean fromDockGesture, - boolean dismissRecentsIfAllRemoved) { - if (mStackTaskList.contains(t)) { - mStackTaskList.remove(t); - Task newFrontMostTask = getFrontMostTask(); - if (mCb != null) { - // Notify that a task has been removed - mCb.onStackTaskRemoved(this, t, newFrontMostTask, animation, - fromDockGesture, dismissRecentsIfAllRemoved); - } - } - mRawTaskList.remove(t); - } - - /** - * Removes all tasks from the stack. - */ - public void removeAllTasks(boolean notifyStackChanges) { - ArrayList<Task> tasks = mStackTaskList.getTasks(); - for (int i = tasks.size() - 1; i >= 0; i--) { - Task t = tasks.get(i); - mStackTaskList.remove(t); - mRawTaskList.remove(t); - } - if (mCb != null && notifyStackChanges) { - // Notify that all tasks have been removed - mCb.onStackTasksRemoved(this); - } - } - - - /** - * @see #setTasks(List, boolean) - */ - public void setTasks(TaskStack stack, boolean notifyStackChanges) { - setTasks(stack.mRawTaskList, notifyStackChanges); - } - - /** - * Sets a few tasks in one go, without calling any callbacks. - * - * @param tasks the new set of tasks to replace the current set. - * @param notifyStackChanges whether or not to callback on specific changes to the list of tasks. - */ - public void setTasks(List<Task> tasks, boolean notifyStackChanges) { - // Compute a has set for each of the tasks - ArrayMap<TaskKey, Task> currentTasksMap = createTaskKeyMapFromList(mRawTaskList); - ArrayMap<TaskKey, Task> newTasksMap = createTaskKeyMapFromList(tasks); - ArrayList<Task> addedTasks = new ArrayList<>(); - ArrayList<Task> removedTasks = new ArrayList<>(); - ArrayList<Task> allTasks = new ArrayList<>(); - - // Disable notifications if there are no callbacks - if (mCb == null) { - notifyStackChanges = false; - } - - // Remove any tasks that no longer exist - int taskCount = mRawTaskList.size(); - for (int i = taskCount - 1; i >= 0; i--) { - Task task = mRawTaskList.get(i); - if (!newTasksMap.containsKey(task.key)) { - if (notifyStackChanges) { - removedTasks.add(task); - } - } - } - - // Add any new tasks - taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - Task newTask = tasks.get(i); - Task currentTask = currentTasksMap.get(newTask.key); - if (currentTask == null && notifyStackChanges) { - addedTasks.add(newTask); - } else if (currentTask != null) { - // The current task has bound callbacks, so just copy the data from the new task - // state and add it back into the list - currentTask.copyFrom(newTask); - newTask = currentTask; - } - allTasks.add(newTask); - } - - // Sort all the tasks to ensure they are ordered correctly - for (int i = allTasks.size() - 1; i >= 0; i--) { - allTasks.get(i).temporarySortIndexInStack = i; - } - - mStackTaskList.set(allTasks); - mRawTaskList.clear(); - mRawTaskList.addAll(allTasks); - - // Only callback for the removed tasks after the stack has updated - int removedTaskCount = removedTasks.size(); - Task newFrontMostTask = getFrontMostTask(); - for (int i = 0; i < removedTaskCount; i++) { - mCb.onStackTaskRemoved(this, removedTasks.get(i), newFrontMostTask, - AnimationProps.IMMEDIATE, false /* fromDockGesture */, - true /* dismissRecentsIfAllRemoved */); - } - - // Only callback for the newly added tasks after this stack has been updated - int addedTaskCount = addedTasks.size(); - for (int i = 0; i < addedTaskCount; i++) { - mCb.onStackTaskAdded(this, addedTasks.get(i)); - } - - // Notify that the task stack has been updated - if (notifyStackChanges) { - mCb.onStackTasksUpdated(this); - } - } - - /** - * Gets the front-most task in the stack. - */ - public Task getFrontMostTask() { - ArrayList<Task> stackTasks = mStackTaskList.getTasks(); - if (stackTasks.isEmpty()) { - return null; - } - return stackTasks.get(stackTasks.size() - 1); - } - - /** Gets the task keys */ - public ArrayList<TaskKey> getTaskKeys() { - ArrayList<TaskKey> taskKeys = new ArrayList<>(); - ArrayList<Task> tasks = computeAllTasksList(); - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - Task task = tasks.get(i); - taskKeys.add(task.key); - } - return taskKeys; - } - - /** - * Returns the set of "active" (non-historical) tasks in the stack that have been used recently. - */ - public ArrayList<Task> getTasks() { - return mStackTaskList.getTasks(); - } - - /** - * Computes a set of all the active and historical tasks. - */ - public ArrayList<Task> computeAllTasksList() { - ArrayList<Task> tasks = new ArrayList<>(); - tasks.addAll(mStackTaskList.getTasks()); - return tasks; - } - - /** - * Returns the number of stack tasks. - */ - public int getTaskCount() { - return mStackTaskList.size(); - } - - /** - * Returns the task in stack tasks which is the launch target. - */ - public Task getLaunchTarget() { - ArrayList<Task> tasks = mStackTaskList.getTasks(); - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - Task task = tasks.get(i); - if (task.isLaunchTarget) { - return task; - } - } - return null; - } - - /** - * Returns whether the next launch target should actually be the PiP task. - */ - public boolean isNextLaunchTargetPip(long lastPipTime) { - Task launchTarget = getLaunchTarget(); - Task nextLaunchTarget = getNextLaunchTargetRaw(); - if (nextLaunchTarget != null && lastPipTime > 0) { - // If the PiP time is more recent than the next launch target, then launch the PiP task - return lastPipTime > nextLaunchTarget.key.lastActiveTime; - } else if (launchTarget != null && lastPipTime > 0 && getTaskCount() == 1) { - // Otherwise, if there is no next launch target, but there is a PiP, then launch - // the PiP task - return true; - } - return false; - } - - /** - * Returns the task in stack tasks which should be launched next if Recents are toggled - * again, or null if there is no task to be launched. Callers should check - * {@link #isNextLaunchTargetPip(long)} before fetching the next raw launch target from the - * stack. - */ - public Task getNextLaunchTarget() { - Task nextLaunchTarget = getNextLaunchTargetRaw(); - if (nextLaunchTarget != null) { - return nextLaunchTarget; - } - return getTasks().get(getTaskCount() - 1); - } - - private Task getNextLaunchTargetRaw() { - int taskCount = getTaskCount(); - if (taskCount == 0) { - return null; - } - int launchTaskIndex = indexOfTask(getLaunchTarget()); - if (launchTaskIndex != -1 && launchTaskIndex > 0) { - return getTasks().get(launchTaskIndex - 1); - } - return null; - } - - /** Returns the index of this task in this current task stack */ - public int indexOfTask(Task t) { - return mStackTaskList.indexOf(t); - } - - /** Finds the task with the specified task id. */ - public Task findTaskWithId(int taskId) { - ArrayList<Task> tasks = computeAllTasksList(); - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - Task task = tasks.get(i); - if (task.key.id == taskId) { - return task; - } - } - return null; - } - - /** - * Computes the components of tasks in this stack that have been removed as a result of a change - * in the specified package. - */ - public ArraySet<ComponentName> computeComponentsRemoved(String packageName, int userId) { - // Identify all the tasks that should be removed as a result of the package being removed. - // Using a set to ensure that we callback once per unique component. - ArraySet<ComponentName> existingComponents = new ArraySet<>(); - ArraySet<ComponentName> removedComponents = new ArraySet<>(); - ArrayList<TaskKey> taskKeys = getTaskKeys(); - int taskKeyCount = taskKeys.size(); - for (int i = 0; i < taskKeyCount; i++) { - TaskKey t = taskKeys.get(i); - - // Skip if this doesn't apply to the current user - if (t.userId != userId) continue; - - ComponentName cn = t.getComponent(); - if (cn.getPackageName().equals(packageName)) { - if (existingComponents.contains(cn)) { - // If we know that the component still exists in the package, then skip - continue; - } - if (PackageManagerWrapper.getInstance().getActivityInfo(cn, userId) != null) { - existingComponents.add(cn); - } else { - removedComponents.add(cn); - } - } - } - return removedComponents; - } - - @Override - public String toString() { - String str = "Stack Tasks (" + mStackTaskList.size() + "):\n"; - ArrayList<Task> tasks = mStackTaskList.getTasks(); - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - str += " " + tasks.get(i).toString() + "\n"; - } - return str; - } - - /** - * Given a list of tasks, returns a map of each task's key to the task. - */ - private ArrayMap<TaskKey, Task> createTaskKeyMapFromList(List<Task> tasks) { - ArrayMap<TaskKey, Task> map = new ArrayMap<>(tasks.size()); - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - Task task = tasks.get(i); - map.put(task.key, task); - } - return map; - } - - public void dump(String prefix, PrintWriter writer) { - String innerPrefix = prefix + " "; - - writer.print(prefix); writer.print(TAG); - writer.print(" numStackTasks="); writer.print(mStackTaskList.size()); - writer.println(); - ArrayList<Task> tasks = mStackTaskList.getTasks(); - int taskCount = tasks.size(); - for (int i = 0; i < taskCount; i++) { - tasks.get(i).dump(innerPrefix, writer); - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/utilities/AnimationProps.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/utilities/AnimationProps.java deleted file mode 100644 index 54639985bebd..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/utilities/AnimationProps.java +++ /dev/null @@ -1,229 +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. - */ - -package com.android.systemui.recents.utilities; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ValueAnimator; -import android.annotation.IntDef; -import android.util.SparseArray; -import android.util.SparseLongArray; -import android.view.View; -import android.view.animation.Interpolator; -import android.view.animation.LinearInterpolator; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.List; - -/** - * The generic set of animation properties to animate a {@link View}. The animation can have - * different interpolators, start delays and durations for each of the different properties. - */ -public class AnimationProps { - - private static final Interpolator LINEAR_INTERPOLATOR = new LinearInterpolator(); - public static final AnimationProps IMMEDIATE = new AnimationProps(0, LINEAR_INTERPOLATOR); - - @Retention(RetentionPolicy.SOURCE) - @IntDef({ALL, TRANSLATION_X, TRANSLATION_Y, TRANSLATION_Z, ALPHA, SCALE, BOUNDS}) - public @interface PropType {} - - public static final int ALL = 0; - public static final int TRANSLATION_X = 1; - public static final int TRANSLATION_Y = 2; - public static final int TRANSLATION_Z = 3; - public static final int ALPHA = 4; - public static final int SCALE = 5; - public static final int BOUNDS = 6; - public static final int DIM_ALPHA = 7; - - private SparseLongArray mPropStartDelay; - private SparseLongArray mPropDuration; - private SparseArray<Interpolator> mPropInterpolators; - private Animator.AnimatorListener mListener; - - /** - * The builder constructor. - */ - public AnimationProps() {} - - /** - * Creates an animation with a default {@param duration} and {@param interpolator} for all - * properties in this animation. - */ - public AnimationProps(int duration, Interpolator interpolator) { - this(0, duration, interpolator, null); - } - - /** - * Creates an animation with a default {@param duration} and {@param interpolator} for all - * properties in this animation. - */ - public AnimationProps(int duration, Interpolator interpolator, - Animator.AnimatorListener listener) { - this(0, duration, interpolator, listener); - } - - /** - * Creates an animation with a default {@param startDelay}, {@param duration} and - * {@param interpolator} for all properties in this animation. - */ - public AnimationProps(int startDelay, int duration, Interpolator interpolator) { - this(startDelay, duration, interpolator, null); - } - - /** - * Creates an animation with a default {@param startDelay}, {@param duration} and - * {@param interpolator} for all properties in this animation. - */ - public AnimationProps(int startDelay, int duration, Interpolator interpolator, - Animator.AnimatorListener listener) { - setStartDelay(ALL, startDelay); - setDuration(ALL, duration); - setInterpolator(ALL, interpolator); - setListener(listener); - } - - /** - * Creates a new {@link AnimatorSet} that will animate the given animators. Callers need to - * manually apply the individual animation properties for each of the animators respectively. - */ - public AnimatorSet createAnimator(List<Animator> animators) { - AnimatorSet anim = new AnimatorSet(); - if (mListener != null) { - anim.addListener(mListener); - } - anim.playTogether(animators); - return anim; - } - - /** - * Applies the specific start delay, duration and interpolator to the given {@param animator} - * for the specified {@param propertyType}. - */ - public <T extends ValueAnimator> T apply(@PropType int propertyType, T animator) { - animator.setStartDelay(getStartDelay(propertyType)); - animator.setDuration(getDuration(propertyType)); - animator.setInterpolator(getInterpolator(propertyType)); - return animator; - } - - /** - * Sets a start delay for a specific property. - */ - public AnimationProps setStartDelay(@PropType int propertyType, int startDelay) { - if (mPropStartDelay == null) { - mPropStartDelay = new SparseLongArray(); - } - mPropStartDelay.append(propertyType, startDelay); - return this; - } - - /** - * Returns the start delay for a specific property. - */ - public long getStartDelay(@PropType int propertyType) { - if (mPropStartDelay != null) { - long startDelay = mPropStartDelay.get(propertyType, -1); - if (startDelay != -1) { - return startDelay; - } - return mPropStartDelay.get(ALL, 0); - } - return 0; - } - - /** - * Sets a duration for a specific property. - */ - public AnimationProps setDuration(@PropType int propertyType, int duration) { - if (mPropDuration == null) { - mPropDuration = new SparseLongArray(); - } - mPropDuration.append(propertyType, duration); - return this; - } - - /** - * Returns the duration for a specific property. - */ - public long getDuration(@PropType int propertyType) { - if (mPropDuration != null) { - long duration = mPropDuration.get(propertyType, -1); - if (duration != -1) { - return duration; - } - return mPropDuration.get(ALL, 0); - } - return 0; - } - - /** - * Sets an interpolator for a specific property. - */ - public AnimationProps setInterpolator(@PropType int propertyType, Interpolator interpolator) { - if (mPropInterpolators == null) { - mPropInterpolators = new SparseArray<>(); - } - mPropInterpolators.append(propertyType, interpolator); - return this; - } - - /** - * Returns the interpolator for a specific property, falling back to the general interpolator - * if there is no specific property interpolator. - */ - public Interpolator getInterpolator(@PropType int propertyType) { - if (mPropInterpolators != null) { - Interpolator interp = mPropInterpolators.get(propertyType); - if (interp != null) { - return interp; - } - return mPropInterpolators.get(ALL, LINEAR_INTERPOLATOR); - } - return LINEAR_INTERPOLATOR; - } - - /** - * Sets an animator listener for this animation. - */ - public AnimationProps setListener(Animator.AnimatorListener listener) { - mListener = listener; - return this; - } - - /** - * Returns the animator listener for this animation. - */ - public Animator.AnimatorListener getListener() { - return mListener; - } - - /** - * Returns whether this animation has any duration. - */ - public boolean isImmediate() { - int count = mPropDuration.size(); - for (int i = 0; i < count; i++) { - if (mPropDuration.valueAt(i) > 0) { - return false; - } - } - return true; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/utilities/Utilities.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/utilities/Utilities.java deleted file mode 100644 index ff58eba71e8d..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/utilities/Utilities.java +++ /dev/null @@ -1,339 +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.systemui.recents.utilities; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.RectEvaluator; -import android.annotation.FloatRange; -import android.annotation.Nullable; -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Color; -import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.drawable.Drawable; -import android.os.Handler; -import android.os.Message; -import android.os.Trace; -import android.util.ArraySet; -import android.util.IntProperty; -import android.util.Property; -import android.util.TypedValue; -import android.view.Surface; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewParent; -import android.view.ViewRootImpl; -import android.view.ViewStub; - -import com.android.systemui.shared.recents.utilities.RectFEvaluator; -import java.util.ArrayList; -import java.util.Collections; - -/* Common code */ -public class Utilities { - - public static final Property<Drawable, Integer> DRAWABLE_ALPHA = - new IntProperty<Drawable>("drawableAlpha") { - @Override - public void setValue(Drawable object, int alpha) { - object.setAlpha(alpha); - } - - @Override - public Integer get(Drawable object) { - return object.getAlpha(); - } - }; - - public static final Property<Drawable, Rect> DRAWABLE_RECT = - new Property<Drawable, Rect>(Rect.class, "drawableBounds") { - @Override - public void set(Drawable object, Rect bounds) { - object.setBounds(bounds); - } - - @Override - public Rect get(Drawable object) { - return object.getBounds(); - } - }; - - public static final RectFEvaluator RECTF_EVALUATOR = new RectFEvaluator(); - public static final RectEvaluator RECT_EVALUATOR = new RectEvaluator(new Rect()); - - /** - * @return the first parent walking up the view hierarchy that has the given class type. - * - * @param parentClass must be a class derived from {@link View} - */ - public static <T extends View> T findParent(View v, Class<T> parentClass) { - ViewParent parent = v.getParent(); - while (parent != null) { - if (parentClass.isAssignableFrom(parent.getClass())) { - return (T) parent; - } - parent = parent.getParent(); - } - return null; - } - - /** - * Initializes the {@param setOut} with the given object. - */ - public static <T> ArraySet<T> objectToSet(T obj, ArraySet<T> setOut) { - setOut.clear(); - if (obj != null) { - setOut.add(obj); - } - return setOut; - } - - /** - * Replaces the contents of {@param setOut} with the contents of the {@param array}. - */ - public static <T> ArraySet<T> arrayToSet(T[] array, ArraySet<T> setOut) { - setOut.clear(); - if (array != null) { - Collections.addAll(setOut, array); - } - return setOut; - } - - /** - * @return the clamped {@param value} between the provided {@param min} and {@param max}. - */ - public static int clamp(int value, int min, int max) { - return Math.max(min, Math.min(max, value)); - } - - /** - * @return the clamped {@param value} between 0 and 1. - */ - public static float clamp01(float value) { - return Math.max(0f, Math.min(1f, value)); - } - - /** - * Scales the {@param value} to be proportionally between the {@param min} and - * {@param max} values. - * - * @param value must be between 0 and 1 - */ - public static float mapRange(@FloatRange(from=0.0,to=1.0) float value, float min, float max) { - return min + (value * (max - min)); - } - - /** - * Scales the {@param value} proportionally from {@param min} and {@param max} to 0 and 1. - * - * @param value must be between {@param min} and {@param max} - */ - public static float unmapRange(float value, float min, float max) { - return (value - min) / (max - min); - } - - /** Scales a rect about its centroid */ - public static void scaleRectAboutCenter(RectF r, float scale) { - if (scale != 1.0f) { - float cx = r.centerX(); - float cy = r.centerY(); - r.offset(-cx, -cy); - r.left *= scale; - r.top *= scale; - r.right *= scale; - r.bottom *= scale; - r.offset(cx, cy); - } - } - - /** Returns the base color overlaid with another overlay color with a specified alpha. */ - public static int getColorWithOverlay(int baseColor, int overlayColor, float overlayAlpha) { - return Color.rgb( - (int) (overlayAlpha * Color.red(baseColor) + - (1f - overlayAlpha) * Color.red(overlayColor)), - (int) (overlayAlpha * Color.green(baseColor) + - (1f - overlayAlpha) * Color.green(overlayColor)), - (int) (overlayAlpha * Color.blue(baseColor) + - (1f - overlayAlpha) * Color.blue(overlayColor))); - } - - /** - * Cancels an animation ensuring that if it has listeners, onCancel and onEnd - * are not called. - */ - public static void cancelAnimationWithoutCallbacks(Animator animator) { - if (animator != null && animator.isStarted()) { - removeAnimationListenersRecursive(animator); - animator.cancel(); - } - } - - /** - * Recursively removes all the listeners of all children of this animator - */ - public static void removeAnimationListenersRecursive(Animator animator) { - if (animator instanceof AnimatorSet) { - ArrayList<Animator> animators = ((AnimatorSet) animator).getChildAnimations(); - for (int i = animators.size() - 1; i >= 0; i--) { - removeAnimationListenersRecursive(animators.get(i)); - } - } - animator.removeAllListeners(); - } - - /** - * Sets the given {@link View}'s frame from its current translation. - */ - public static void setViewFrameFromTranslation(View v) { - RectF taskViewRect = new RectF(v.getLeft(), v.getTop(), v.getRight(), v.getBottom()); - taskViewRect.offset(v.getTranslationX(), v.getTranslationY()); - v.setTranslationX(0); - v.setTranslationY(0); - v.setLeftTopRightBottom((int) taskViewRect.left, (int) taskViewRect.top, - (int) taskViewRect.right, (int) taskViewRect.bottom); - } - - /** - * Returns a view stub for the given view id. - */ - public static ViewStub findViewStubById(View v, int stubId) { - return (ViewStub) v.findViewById(stubId); - } - - /** - * Returns a view stub for the given view id. - */ - public static ViewStub findViewStubById(Activity a, int stubId) { - return (ViewStub) a.findViewById(stubId); - } - - /** - * Used for debugging, converts DP to PX. - */ - public static float dpToPx(Resources res, float dp) { - return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, res.getDisplayMetrics()); - } - - /** - * Adds a trace event for debugging. - */ - public static void addTraceEvent(String event) { - Trace.traceBegin(Trace.TRACE_TAG_VIEW, event); - Trace.traceEnd(Trace.TRACE_TAG_VIEW); - } - - /** - * Returns whether this view, or one of its descendants have accessibility focus. - */ - public static boolean isDescendentAccessibilityFocused(View v) { - if (v.isAccessibilityFocused()) { - return true; - } - - if (v instanceof ViewGroup) { - ViewGroup vg = (ViewGroup) v; - int childCount = vg.getChildCount(); - for (int i = 0; i < childCount; i++) { - if (isDescendentAccessibilityFocused(vg.getChildAt(i))) { - return true; - } - } - } - return false; - } - - /** - * Returns the application configuration, which is independent of the activity's current - * configuration in multiwindow. - */ - public static Configuration getAppConfiguration(Context context) { - return context.getApplicationContext().getResources().getConfiguration(); - } - - /** - * @return The next frame name for the specified surface or -1 if the surface is no longer - * valid. - */ - public static long getNextFrameNumber(Surface s) { - return s != null && s.isValid() - ? s.getNextFrameNumber() - : -1; - - } - - /** - * @return The surface for the specified view. - */ - public static @Nullable Surface getSurface(View v) { - ViewRootImpl viewRoot = v.getViewRootImpl(); - if (viewRoot == null) { - return null; - } - return viewRoot.mSurface; - } - - /** - * Returns a lightweight dump of a rect. - */ - public static String dumpRect(Rect r) { - if (r == null) { - return "N:0,0-0,0"; - } - return r.left + "," + r.top + "-" + r.right + "," + r.bottom; - } - - /** - * Posts a runnable on a handler at the front of the queue ignoring any sync barriers. - */ - public static void postAtFrontOfQueueAsynchronously(Handler h, Runnable r) { - Message msg = h.obtainMessage().setCallback(r); - h.sendMessageAtFrontOfQueue(msg); - } - - /** Calculates the constrast between two colors, using the algorithm provided by the WCAG v2. */ - public static float computeContrastBetweenColors(int bg, int fg) { - float bgR = Color.red(bg) / 255f; - float bgG = Color.green(bg) / 255f; - float bgB = Color.blue(bg) / 255f; - bgR = (bgR < 0.03928f) ? bgR / 12.92f : (float) Math.pow((bgR + 0.055f) / 1.055f, 2.4f); - bgG = (bgG < 0.03928f) ? bgG / 12.92f : (float) Math.pow((bgG + 0.055f) / 1.055f, 2.4f); - bgB = (bgB < 0.03928f) ? bgB / 12.92f : (float) Math.pow((bgB + 0.055f) / 1.055f, 2.4f); - float bgL = 0.2126f * bgR + 0.7152f * bgG + 0.0722f * bgB; - - float fgR = Color.red(fg) / 255f; - float fgG = Color.green(fg) / 255f; - float fgB = Color.blue(fg) / 255f; - fgR = (fgR < 0.03928f) ? fgR / 12.92f : (float) Math.pow((fgR + 0.055f) / 1.055f, 2.4f); - fgG = (fgG < 0.03928f) ? fgG / 12.92f : (float) Math.pow((fgG + 0.055f) / 1.055f, 2.4f); - fgB = (fgB < 0.03928f) ? fgB / 12.92f : (float) Math.pow((fgB + 0.055f) / 1.055f, 2.4f); - float fgL = 0.2126f * fgR + 0.7152f * fgG + 0.0722f * fgB; - - return Math.abs((fgL + 0.05f) / (bgL + 0.05f)); - } - - /** - * @return the clamped {@param value} between the provided {@param min} and {@param max}. - */ - public static float clamp(float value, float min, float max) { - return Math.max(min, Math.min(max, value)); - } - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/AnimateableViewBounds.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/AnimateableViewBounds.java deleted file mode 100644 index e18850639336..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/AnimateableViewBounds.java +++ /dev/null @@ -1,135 +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.systemui.recents.views; - -import android.graphics.Outline; -import android.graphics.Rect; -import android.view.View; -import android.view.ViewOutlineProvider; - -import com.android.systemui.recents.utilities.Utilities; - -/** - * An outline provider that has a clip and outline that can be animated. - */ -public class AnimateableViewBounds extends ViewOutlineProvider { - - private static final float MIN_ALPHA = 0.1f; - private static final float MAX_ALPHA = 0.8f; - - protected View mSourceView; - protected Rect mClipRect = new Rect(); - protected Rect mClipBounds = new Rect(); - protected Rect mLastClipBounds = new Rect(); - protected int mCornerRadius; - protected float mAlpha = 1f; - - public AnimateableViewBounds(View source, int cornerRadius) { - mSourceView = source; - mCornerRadius = cornerRadius; - } - - /** - * Resets the right and bottom clip for this view. - */ - public void reset() { - mClipRect.set(0, 0, 0, 0); - updateClipBounds(); - } - - @Override - public void getOutline(View view, Outline outline) { - outline.setAlpha(Utilities.mapRange(mAlpha, MIN_ALPHA, MAX_ALPHA)); - if (mCornerRadius > 0) { - outline.setRoundRect(mClipRect.left, mClipRect.top, - mSourceView.getWidth() - mClipRect.right, - mSourceView.getHeight() - mClipRect.bottom, - mCornerRadius); - } else { - outline.setRect(mClipRect.left, mClipRect.top, - mSourceView.getWidth() - mClipRect.right, - mSourceView.getHeight() - mClipRect.bottom); - } - } - - /** - * Sets the view outline alpha. - */ - public void setAlpha(float alpha) { - if (Float.compare(alpha, mAlpha) != 0) { - mAlpha = alpha; - // TODO, If both clip and alpha change in the same frame, only invalidate once - mSourceView.invalidateOutline(); - } - } - - /** - * @return the outline alpha. - */ - public float getAlpha() { - return mAlpha; - } - - /** - * Sets the top clip. - */ - public void setClipTop(int top) { - mClipRect.top = top; - updateClipBounds(); - } - - /** - * @return the top clip. - */ - public int getClipTop() { - return mClipRect.top; - } - - /** - * Sets the bottom clip. - */ - public void setClipBottom(int bottom) { - mClipRect.bottom = bottom; - updateClipBounds(); - } - - /** - * @return the bottom clip. - */ - public int getClipBottom() { - return mClipRect.bottom; - } - - /** - * @return the clip bounds. - */ - public Rect getClipBounds() { - return mClipBounds; - } - - protected void updateClipBounds() { - mClipBounds.set(Math.max(0, mClipRect.left), Math.max(0, mClipRect.top), - mSourceView.getWidth() - Math.max(0, mClipRect.right), - mSourceView.getHeight() - Math.max(0, mClipRect.bottom)); - if (!mLastClipBounds.equals(mClipBounds)) { - mSourceView.setClipBounds(mClipBounds); - // TODO, If both clip and alpha change in the same frame, only invalidate once - mSourceView.invalidateOutline(); - mLastClipBounds.set(mClipBounds); - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/DockState.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/DockState.java deleted file mode 100644 index d9c921cf3f7d..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/DockState.java +++ /dev/null @@ -1,351 +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.recents.views; - -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.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 android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.animation.PropertyValuesHolder; -import android.annotation.IntDef; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Point; -import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.drawable.ColorDrawable; -import android.util.IntProperty; -import android.view.animation.Interpolator; - -import com.android.internal.policy.DockedDividerUtils; -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.utilities.Utilities; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.ArrayList; - -/** - * The various possible dock states when dragging and dropping a task. - */ -public class DockState implements DropTarget { - - public static final int DOCK_AREA_BG_COLOR = 0xFFffffff; - public static final int DOCK_AREA_GRID_BG_COLOR = 0xFF000000; - - // The rotation to apply to the hint text - @Retention(RetentionPolicy.SOURCE) - @IntDef({HORIZONTAL, VERTICAL}) - public @interface TextOrientation {} - private static final int HORIZONTAL = 0; - private static final int VERTICAL = 1; - - private static final int DOCK_AREA_ALPHA = 80; - public static final DockState NONE = new DockState(DOCKED_INVALID, -1, 80, 255, HORIZONTAL, - null, null, null); - public static final DockState LEFT = new DockState(DOCKED_LEFT, - SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT, DOCK_AREA_ALPHA, 0, VERTICAL, - new RectF(0, 0, 0.125f, 1), new RectF(0, 0, 0.125f, 1), - new RectF(0, 0, 0.5f, 1)); - public static final DockState TOP = new DockState(DOCKED_TOP, - SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT, DOCK_AREA_ALPHA, 0, HORIZONTAL, - new RectF(0, 0, 1, 0.125f), new RectF(0, 0, 1, 0.125f), - new RectF(0, 0, 1, 0.5f)); - public static final DockState RIGHT = new DockState(DOCKED_RIGHT, - SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT, DOCK_AREA_ALPHA, 0, VERTICAL, - new RectF(0.875f, 0, 1, 1), new RectF(0.875f, 0, 1, 1), - new RectF(0.5f, 0, 1, 1)); - public static final DockState BOTTOM = new DockState(DOCKED_BOTTOM, - SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT, DOCK_AREA_ALPHA, 0, HORIZONTAL, - new RectF(0, 0.875f, 1, 1), new RectF(0, 0.875f, 1, 1), - new RectF(0, 0.5f, 1, 1)); - - @Override - public boolean acceptsDrop(int x, int y, int width, int height, Rect insets, - boolean isCurrentTarget) { - if (isCurrentTarget) { - getMappedRect(expandedTouchDockArea, width, height, mTmpRect); - return mTmpRect.contains(x, y); - } else { - getMappedRect(touchArea, width, height, mTmpRect); - updateBoundsWithSystemInsets(mTmpRect, insets); - return mTmpRect.contains(x, y); - } - } - - // Represents the view state of this dock state - public static class ViewState { - private static final IntProperty<ViewState> HINT_ALPHA = - new IntProperty<ViewState>("drawableAlpha") { - @Override - public void setValue(ViewState object, int alpha) { - object.mHintTextAlpha = alpha; - object.dockAreaOverlay.invalidateSelf(); - } - - @Override - public Integer get(ViewState object) { - return object.mHintTextAlpha; - } - }; - - public final int dockAreaAlpha; - public final ColorDrawable dockAreaOverlay; - public final int hintTextAlpha; - public final int hintTextOrientation; - - private final int mHintTextResId; - private String mHintText; - private Paint mHintTextPaint; - private Point mHintTextBounds = new Point(); - private int mHintTextAlpha = 255; - private AnimatorSet mDockAreaOverlayAnimator; - private Rect mTmpRect = new Rect(); - - private ViewState(int areaAlpha, int hintAlpha, @TextOrientation int hintOrientation, - int hintTextResId) { - dockAreaAlpha = areaAlpha; - dockAreaOverlay = new ColorDrawable(LegacyRecentsImpl.getConfiguration().isGridEnabled - ? DOCK_AREA_GRID_BG_COLOR : DOCK_AREA_BG_COLOR); - dockAreaOverlay.setAlpha(0); - hintTextAlpha = hintAlpha; - hintTextOrientation = hintOrientation; - mHintTextResId = hintTextResId; - mHintTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - mHintTextPaint.setColor(Color.WHITE); - } - - /** - * Updates the view state with the given context. - */ - public void update(Context context) { - Resources res = context.getResources(); - mHintText = context.getString(mHintTextResId); - mHintTextPaint.setTextSize(res.getDimensionPixelSize( - R.dimen.recents_drag_hint_text_size)); - mHintTextPaint.getTextBounds(mHintText, 0, mHintText.length(), mTmpRect); - mHintTextBounds.set((int) mHintTextPaint.measureText(mHintText), mTmpRect.height()); - } - - /** - * Draws the current view state. - */ - public void draw(Canvas canvas) { - // Draw the overlay background - if (dockAreaOverlay.getAlpha() > 0) { - dockAreaOverlay.draw(canvas); - } - - // Draw the hint text - if (mHintTextAlpha > 0) { - Rect bounds = dockAreaOverlay.getBounds(); - int x = bounds.left + (bounds.width() - mHintTextBounds.x) / 2; - int y = bounds.top + (bounds.height() + mHintTextBounds.y) / 2; - mHintTextPaint.setAlpha(mHintTextAlpha); - if (hintTextOrientation == VERTICAL) { - canvas.save(); - canvas.rotate(-90f, bounds.centerX(), bounds.centerY()); - } - canvas.drawText(mHintText, x, y, mHintTextPaint); - if (hintTextOrientation == VERTICAL) { - canvas.restore(); - } - } - } - - /** - * Creates a new bounds and alpha animation. - */ - public void startAnimation(Rect bounds, int areaAlpha, int hintAlpha, int duration, - Interpolator interpolator, boolean animateAlpha, boolean animateBounds) { - if (mDockAreaOverlayAnimator != null) { - mDockAreaOverlayAnimator.cancel(); - } - - ObjectAnimator anim; - ArrayList<Animator> animators = new ArrayList<>(); - if (dockAreaOverlay.getAlpha() != areaAlpha) { - if (animateAlpha) { - anim = ObjectAnimator.ofInt(dockAreaOverlay, - Utilities.DRAWABLE_ALPHA, dockAreaOverlay.getAlpha(), areaAlpha); - anim.setDuration(duration); - anim.setInterpolator(interpolator); - animators.add(anim); - } else { - dockAreaOverlay.setAlpha(areaAlpha); - } - } - if (mHintTextAlpha != hintAlpha) { - if (animateAlpha) { - anim = ObjectAnimator.ofInt(this, HINT_ALPHA, mHintTextAlpha, - hintAlpha); - anim.setDuration(150); - anim.setInterpolator(hintAlpha > mHintTextAlpha - ? Interpolators.ALPHA_IN - : Interpolators.ALPHA_OUT); - animators.add(anim); - } else { - mHintTextAlpha = hintAlpha; - dockAreaOverlay.invalidateSelf(); - } - } - if (bounds != null && !dockAreaOverlay.getBounds().equals(bounds)) { - if (animateBounds) { - PropertyValuesHolder prop = PropertyValuesHolder.ofObject( - Utilities.DRAWABLE_RECT, Utilities.RECT_EVALUATOR, - new Rect(dockAreaOverlay.getBounds()), bounds); - anim = ObjectAnimator.ofPropertyValuesHolder(dockAreaOverlay, prop); - anim.setDuration(duration); - anim.setInterpolator(interpolator); - animators.add(anim); - } else { - dockAreaOverlay.setBounds(bounds); - } - } - if (!animators.isEmpty()) { - mDockAreaOverlayAnimator = new AnimatorSet(); - mDockAreaOverlayAnimator.playTogether(animators); - mDockAreaOverlayAnimator.start(); - } - } - } - - public final int dockSide; - public final int createMode; - public final ViewState viewState; - private final RectF touchArea; - private final RectF dockArea; - private final RectF expandedTouchDockArea; - private static final Rect mTmpRect = new Rect(); - - /** - * @param createMode used to pass to ActivityManager to dock the task - * @param touchArea the area in which touch will initiate this dock state - * @param dockArea the visible dock area - * @param expandedTouchDockArea the area in which touch will continue to dock after entering - * the initial touch area. This is also the new dock area to - * draw. - */ - DockState(int dockSide, int createMode, int dockAreaAlpha, int hintTextAlpha, - @TextOrientation int hintTextOrientation, RectF touchArea, RectF dockArea, - RectF expandedTouchDockArea) { - this.dockSide = dockSide; - this.createMode = createMode; - this.viewState = new ViewState(dockAreaAlpha, hintTextAlpha, hintTextOrientation, - R.string.recents_drag_hint_message); - this.dockArea = dockArea; - this.touchArea = touchArea; - this.expandedTouchDockArea = expandedTouchDockArea; - } - - /** - * Updates the dock state with the given context. - */ - public void update(Context context) { - viewState.update(context); - } - - /** - * Returns the docked task bounds with the given {@param width} and {@param height}. - */ - public Rect getPreDockedBounds(int width, int height, Rect insets) { - getMappedRect(dockArea, width, height, mTmpRect); - return updateBoundsWithSystemInsets(mTmpRect, insets); - } - - /** - * Returns the expanded docked task bounds with the given {@param width} and - * {@param height}. - */ - public Rect getDockedBounds(int width, int height, int dividerSize, Rect insets, - Resources res) { - // Calculate the docked task bounds - boolean isHorizontalDivision = - res.getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT; - int position = DockedDividerUtils.calculateMiddlePosition(isHorizontalDivision, - insets, width, height, dividerSize); - Rect newWindowBounds = new Rect(); - DockedDividerUtils.calculateBoundsForPosition(position, dockSide, newWindowBounds, - width, height, dividerSize); - return newWindowBounds; - } - - /** - * Returns the task stack bounds with the given {@param width} and - * {@param height}. - */ - public Rect getDockedTaskStackBounds(Rect displayRect, int width, int height, - int dividerSize, Rect insets, TaskStackLayoutAlgorithm layoutAlgorithm, - Resources res, Rect windowRectOut) { - // Calculate the inverse docked task bounds - boolean isHorizontalDivision = - res.getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT; - int position = DockedDividerUtils.calculateMiddlePosition(isHorizontalDivision, - insets, width, height, dividerSize); - DockedDividerUtils.calculateBoundsForPosition(position, - DockedDividerUtils.invertDockSide(dockSide), windowRectOut, width, height, - dividerSize); - - // Calculate the task stack bounds from the new window bounds - Rect taskStackBounds = new Rect(); - // If the task stack bounds is specifically under the dock area, then ignore the top - // inset - int top = dockArea.bottom < 1f - ? 0 - : insets.top; - // For now, ignore the left insets since we always dock on the left and show Recents - // on the right - layoutAlgorithm.getTaskStackBounds(displayRect, windowRectOut, top, 0, insets.right, - taskStackBounds); - return taskStackBounds; - } - - /** - * Returns the expanded bounds in certain dock sides such that the bounds account for the - * system insets (namely the vertical nav bar). This call modifies and returns the given - * {@param bounds}. - */ - private Rect updateBoundsWithSystemInsets(Rect bounds, Rect insets) { - if (dockSide == DOCKED_LEFT) { - bounds.right += insets.left; - } else if (dockSide == DOCKED_RIGHT) { - bounds.left -= insets.right; - } - return bounds; - } - - /** - * Returns the mapped rect to the given dimensions. - */ - private void getMappedRect(RectF bounds, int width, int height, Rect out) { - out.set((int) (bounds.left * width), (int) (bounds.top * height), - (int) (bounds.right * width), (int) (bounds.bottom * height)); - } -}
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/DropTarget.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/DropTarget.java deleted file mode 100644 index f2a631078d3c..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/DropTarget.java +++ /dev/null @@ -1,31 +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.systemui.recents.views; - -import android.graphics.Rect; - -/** - * Represents a drop target for a drag gesture. - */ -public interface DropTarget { - - /** - * Returns whether this target can accept this drop. The x,y are relative to the top level - * RecentsView, and the width/height are of the RecentsView. - */ - boolean acceptsDrop(int x, int y, int width, int height, Rect insets, boolean isCurrentTarget); -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FakeShadowDrawable.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FakeShadowDrawable.java deleted file mode 100644 index 86b4297663cb..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FakeShadowDrawable.java +++ /dev/null @@ -1,290 +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.systemui.recents.views; - -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.ColorFilter; -import android.graphics.LinearGradient; -import android.graphics.Paint; -import android.graphics.Path; -import android.graphics.PixelFormat; -import android.graphics.RadialGradient; -import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.Shader; -import android.graphics.drawable.Drawable; -import android.util.Log; - -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsConfiguration; - -/** - * A rounded rectangle drawable which also includes a shadow around. This is mostly copied from - * frameworks/support/v7/cardview/eclair-mr1/android/support/v7/widget/ - * RoundRectDrawableWithShadow.java revision c42ba8c000d1e6ce85e152dfc17089a0a69e739f with a few - * modifications to suit our needs in SystemUI. - */ -class FakeShadowDrawable extends Drawable { - // used to calculate content padding - final static double COS_45 = Math.cos(Math.toRadians(45)); - - final static float SHADOW_MULTIPLIER = 1.5f; - - final float mInsetShadow; // extra shadow to avoid gaps between card and shadow - - Paint mCornerShadowPaint; - - Paint mEdgeShadowPaint; - - final RectF mCardBounds; - - float mCornerRadius; - - Path mCornerShadowPath; - - // updated value with inset - float mMaxShadowSize; - - // actual value set by developer - float mRawMaxShadowSize; - - // multiplied value to account for shadow offset - float mShadowSize; - - // actual value set by developer - float mRawShadowSize; - - private boolean mDirty = true; - - private final int mShadowStartColor; - - private final int mShadowEndColor; - - private boolean mAddPaddingForCorners = true; - - /** - * If shadow size is set to a value above max shadow, we print a warning - */ - private boolean mPrintedShadowClipWarning = false; - - public FakeShadowDrawable(Resources resources, RecentsConfiguration config) { - mShadowStartColor = resources.getColor(R.color.fake_shadow_start_color); - mShadowEndColor = resources.getColor(R.color.fake_shadow_end_color); - mInsetShadow = resources.getDimension(R.dimen.fake_shadow_inset); - setShadowSize(resources.getDimensionPixelSize(R.dimen.fake_shadow_size), - resources.getDimensionPixelSize(R.dimen.fake_shadow_size)); - mCornerShadowPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG); - mCornerShadowPaint.setStyle(Paint.Style.FILL); - mCornerShadowPaint.setDither(true); - mCornerRadius = LegacyRecentsImpl.getConfiguration().isGridEnabled ? - resources.getDimensionPixelSize( - R.dimen.recents_grid_task_view_rounded_corners_radius) : - resources.getDimensionPixelSize(R.dimen.recents_task_view_rounded_corners_radius); - mCardBounds = new RectF(); - mEdgeShadowPaint = new Paint(mCornerShadowPaint); - } - - @Override - public void setAlpha(int alpha) { - mCornerShadowPaint.setAlpha(alpha); - mEdgeShadowPaint.setAlpha(alpha); - } - - @Override - protected void onBoundsChange(Rect bounds) { - super.onBoundsChange(bounds); - mDirty = true; - } - - void setShadowSize(float shadowSize, float maxShadowSize) { - if (shadowSize < 0 || maxShadowSize < 0) { - throw new IllegalArgumentException("invalid shadow size"); - } - if (shadowSize > maxShadowSize) { - shadowSize = maxShadowSize; - if (!mPrintedShadowClipWarning) { - Log.w("CardView", "Shadow size is being clipped by the max shadow size. See " - + "{CardView#setMaxCardElevation}."); - mPrintedShadowClipWarning = true; - } - } - if (mRawShadowSize == shadowSize && mRawMaxShadowSize == maxShadowSize) { - return; - } - mRawShadowSize = shadowSize; - mRawMaxShadowSize = maxShadowSize; - mShadowSize = shadowSize * SHADOW_MULTIPLIER + mInsetShadow; - mMaxShadowSize = maxShadowSize + mInsetShadow; - mDirty = true; - invalidateSelf(); - } - - @Override - public boolean getPadding(Rect padding) { - int vOffset = (int) Math.ceil(calculateVerticalPadding(mRawMaxShadowSize, mCornerRadius, - mAddPaddingForCorners)); - int hOffset = (int) Math.ceil(calculateHorizontalPadding(mRawMaxShadowSize, mCornerRadius, - mAddPaddingForCorners)); - padding.set(hOffset, vOffset, hOffset, vOffset); - return true; - } - - static float calculateVerticalPadding(float maxShadowSize, float cornerRadius, - boolean addPaddingForCorners) { - if (addPaddingForCorners) { - return (float) (maxShadowSize * SHADOW_MULTIPLIER + (1 - COS_45) * cornerRadius); - } else { - return maxShadowSize * SHADOW_MULTIPLIER; - } - } - - static float calculateHorizontalPadding(float maxShadowSize, float cornerRadius, - boolean addPaddingForCorners) { - if (addPaddingForCorners) { - return (float) (maxShadowSize + (1 - COS_45) * cornerRadius); - } else { - return maxShadowSize; - } - } - - @Override - public void setColorFilter(ColorFilter colorFilter) { - mCornerShadowPaint.setColorFilter(colorFilter); - mEdgeShadowPaint.setColorFilter(colorFilter); - } - - @Override - public int getOpacity() { - return PixelFormat.OPAQUE; - } - - @Override - public void draw(Canvas canvas) { - if (mDirty) { - buildComponents(getBounds()); - mDirty = false; - } - canvas.translate(0, mRawShadowSize / 4); - drawShadow(canvas); - canvas.translate(0, -mRawShadowSize / 4); - } - - private void drawShadow(Canvas canvas) { - final float edgeShadowTop = -mCornerRadius - mShadowSize; - final float inset = mCornerRadius + mInsetShadow + mRawShadowSize / 2; - final boolean drawHorizontalEdges = mCardBounds.width() - 2 * inset > 0; - final boolean drawVerticalEdges = mCardBounds.height() - 2 * inset > 0; - // LT - int saved = canvas.save(); - canvas.translate(mCardBounds.left + inset, mCardBounds.top + inset); - canvas.drawPath(mCornerShadowPath, mCornerShadowPaint); - if (drawHorizontalEdges) { - canvas.drawRect(0, edgeShadowTop, - mCardBounds.width() - 2 * inset, -mCornerRadius, - mEdgeShadowPaint); - } - canvas.restoreToCount(saved); - // RB - saved = canvas.save(); - canvas.translate(mCardBounds.right - inset, mCardBounds.bottom - inset); - canvas.rotate(180f); - canvas.drawPath(mCornerShadowPath, mCornerShadowPaint); - if (drawHorizontalEdges) { - canvas.drawRect(0, edgeShadowTop, - mCardBounds.width() - 2 * inset, -mCornerRadius + mShadowSize, - mEdgeShadowPaint); - } - canvas.restoreToCount(saved); - // LB - saved = canvas.save(); - canvas.translate(mCardBounds.left + inset, mCardBounds.bottom - inset); - canvas.rotate(270f); - canvas.drawPath(mCornerShadowPath, mCornerShadowPaint); - if (drawVerticalEdges) { - canvas.drawRect(0, edgeShadowTop, - mCardBounds.height() - 2 * inset, -mCornerRadius, mEdgeShadowPaint); - } - canvas.restoreToCount(saved); - // RT - saved = canvas.save(); - canvas.translate(mCardBounds.right - inset, mCardBounds.top + inset); - canvas.rotate(90f); - canvas.drawPath(mCornerShadowPath, mCornerShadowPaint); - if (drawVerticalEdges) { - canvas.drawRect(0, edgeShadowTop, - mCardBounds.height() - 2 * inset, -mCornerRadius, mEdgeShadowPaint); - } - canvas.restoreToCount(saved); - } - - private void buildShadowCorners() { - RectF innerBounds = new RectF(-mCornerRadius, -mCornerRadius, mCornerRadius, mCornerRadius); - RectF outerBounds = new RectF(innerBounds); - outerBounds.inset(-mShadowSize, -mShadowSize); - - if (mCornerShadowPath == null) { - mCornerShadowPath = new Path(); - } else { - mCornerShadowPath.reset(); - } - mCornerShadowPath.setFillType(Path.FillType.EVEN_ODD); - mCornerShadowPath.moveTo(-mCornerRadius, 0); - mCornerShadowPath.rLineTo(-mShadowSize, 0); - // outer arc - mCornerShadowPath.arcTo(outerBounds, 180f, 90f, false); - // inner arc - mCornerShadowPath.arcTo(innerBounds, 270f, -90f, false); - mCornerShadowPath.close(); - - float startRatio = mCornerRadius / (mCornerRadius + mShadowSize); - mCornerShadowPaint.setShader(new RadialGradient(0, 0, mCornerRadius + mShadowSize, - new int[]{mShadowStartColor, mShadowStartColor, mShadowEndColor}, - new float[]{0f, startRatio, 1f} - , Shader.TileMode.CLAMP)); - - // we offset the content shadowSize/2 pixels up to make it more realistic. - // this is why edge shadow shader has some extra space - // When drawing bottom edge shadow, we use that extra space. - mEdgeShadowPaint.setShader(new LinearGradient(0, -mCornerRadius + mShadowSize, 0, - -mCornerRadius - mShadowSize, - new int[]{mShadowStartColor, mShadowStartColor, mShadowEndColor}, - new float[]{0f, .5f, 1f}, Shader.TileMode.CLAMP)); - } - - private void buildComponents(Rect bounds) { - // Card is offset SHADOW_MULTIPLIER * maxShadowSize to account for the shadow shift. - // We could have different top-bottom offsets to avoid extra gap above but in that case - // center aligning Views inside the CardView would be problematic. - final float verticalOffset = mMaxShadowSize * SHADOW_MULTIPLIER; - mCardBounds.set(bounds.left + mMaxShadowSize, bounds.top + verticalOffset, - bounds.right - mMaxShadowSize, bounds.bottom - verticalOffset); - buildShadowCorners(); - } - - float getMinWidth() { - final float content = 2 * - Math.max(mRawMaxShadowSize, mCornerRadius + mInsetShadow + mRawMaxShadowSize / 2); - return content + (mRawMaxShadowSize + mInsetShadow) * 2; - } - - float getMinHeight() { - final float content = 2 * Math.max(mRawMaxShadowSize, mCornerRadius + mInsetShadow - + mRawMaxShadowSize * SHADOW_MULTIPLIER / 2); - return content + (mRawMaxShadowSize * SHADOW_MULTIPLIER + mInsetShadow) * 2; - } -}
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FixedSizeFrameLayout.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FixedSizeFrameLayout.java deleted file mode 100644 index 471df6ae41fa..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FixedSizeFrameLayout.java +++ /dev/null @@ -1,97 +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. - */ - -package com.android.systemui.recents.views; - -import android.content.Context; -import android.graphics.Rect; -import android.util.AttributeSet; -import android.widget.FrameLayout; - -/** - * This is an optimized FrameLayout whose layout is completely directed by its parent, and as a - * result, does not propagate <code>requestLayout()</code> up the view hierarchy. Instead, it will - * relayout its children with the last known layout bounds when a layout is requested from a child - * view. - */ -public class FixedSizeFrameLayout extends FrameLayout { - - private final Rect mLayoutBounds = new Rect(); - - public FixedSizeFrameLayout(Context context) { - super(context); - } - - public FixedSizeFrameLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public FixedSizeFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public FixedSizeFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - @Override - protected final void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - measureContents(MeasureSpec.getSize(widthMeasureSpec), - MeasureSpec.getSize(heightMeasureSpec)); - } - - @Override - protected final void onLayout(boolean changed, int left, int top, int right, int bottom) { - mLayoutBounds.set(left, top, right, bottom); - layoutContents(mLayoutBounds, changed); - } - - @Override - public final void requestLayout() { - // The base ViewGroup constructor attempts to call requestLayout() before this class's - // members are initialized so we should just propagate in that case - if (mLayoutBounds == null || mLayoutBounds.isEmpty()) { - super.requestLayout(); - } else { - // If we are already laid out, then just reuse the same bounds to layout the children - // (but not itself) - // TODO: Investigate whether we should coalesce these to the next frame if needed - measureContents(getMeasuredWidth(), getMeasuredHeight()); - layoutContents(mLayoutBounds, false); - } - } - - /** - * Measures the contents of this fixed layout. - */ - protected void measureContents(int width, int height) { - super.onMeasure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), - MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST)); - } - - /** - * Lays out the contents of this fixed layout. - */ - protected void layoutContents(Rect bounds, boolean changed) { - super.onLayout(changed, bounds.left, bounds.top, bounds.right, bounds.bottom); - - int width = getMeasuredWidth(); - int height = getMeasuredHeight(); - onSizeChanged(width, height, width, height); - } - -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FixedSizeImageView.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FixedSizeImageView.java deleted file mode 100644 index d3b5e473eb7d..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/FixedSizeImageView.java +++ /dev/null @@ -1,77 +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.systemui.recents.views; - -import android.content.Context; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; - -import com.android.systemui.statusbar.AlphaOptimizedImageView; - -/** - * This is an optimized ImageView that does not trigger a <code>requestLayout()</code> or - * <code>invalidate()</code> when setting the image to <code>null</code>. - */ -public class FixedSizeImageView extends AlphaOptimizedImageView { - - private boolean mAllowRelayout = true; - private boolean mAllowInvalidate = true; - - public FixedSizeImageView(Context context) { - this(context, null); - } - - public FixedSizeImageView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public FixedSizeImageView(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public FixedSizeImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - @Override - public void requestLayout() { - if (mAllowRelayout) { - super.requestLayout(); - } - } - - @Override - public void invalidate() { - if (mAllowInvalidate) { - super.invalidate(); - } - } - - @Override - public void setImageDrawable(Drawable drawable) { - boolean isNullBitmapDrawable = (drawable instanceof BitmapDrawable) && - (((BitmapDrawable) drawable).getBitmap() == null); - if (drawable == null || isNullBitmapDrawable) { - mAllowRelayout = false; - mAllowInvalidate = false; - } - super.setImageDrawable(drawable); - mAllowRelayout = true; - mAllowInvalidate = true; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsEntrancePathInterpolator.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsEntrancePathInterpolator.java deleted file mode 100644 index e32da2d3f6be..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsEntrancePathInterpolator.java +++ /dev/null @@ -1,47 +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.recents.views; - -import android.view.animation.PathInterpolator; - -/** - * A helper interpolator to stagger the entrance animation in recents by offsetting the start time - */ -public class RecentsEntrancePathInterpolator extends PathInterpolator { - final float mStartOffsetFraction; - - /** - * Create an interpolator for a cubic Bezier curve with an offset play time. The end points - * <code>(0, 0)</code> and <code>(1, 1)</code> are assumed. - * - * @param controlX1 The x coordinate of the first control point of the cubic Bezier. - * @param controlY1 The y coordinate of the first control point of the cubic Bezier. - * @param controlX2 The x coordinate of the second control point of the cubic Bezier. - * @param controlY2 The y coordinate of the second control point of the cubic Bezier. - * @param startOffsetFraction The fraction from 0 to 1 to start the animation from - */ - public RecentsEntrancePathInterpolator(float controlX1, float controlY1, float controlX2, - float controlY2, float startOffsetFraction) { - super(controlX1, controlY1, controlX2, controlY2); - mStartOffsetFraction = startOffsetFraction; - } - - @Override - public float getInterpolation(float t) { - return super.getInterpolation(t + mStartOffsetFraction); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsTransitionComposer.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsTransitionComposer.java deleted file mode 100644 index ce6631820fd8..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsTransitionComposer.java +++ /dev/null @@ -1,175 +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.systemui.recents.views; - -import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; -import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Rect; -import android.util.Log; - -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsDebugFlags; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecCompat; -import com.android.systemui.shared.recents.view.RecentsTransition; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * A helper class to create the transition app animation specs to/from Recents - */ -public class RecentsTransitionComposer { - - private static final String TAG = "RecentsTransitionComposer"; - - private Context mContext; - private TaskViewTransform mTmpTransform = new TaskViewTransform(); - - public RecentsTransitionComposer(Context context) { - mContext = context; - } - - /** - * Composes a single animation spec for the given {@link TaskView} - */ - private static AppTransitionAnimationSpecCompat composeAnimationSpec(TaskStackView stackView, - TaskView taskView, TaskViewTransform transform, boolean addHeaderBitmap) { - Bitmap b = null; - if (addHeaderBitmap) { - b = composeHeaderBitmap(taskView, transform); - if (b == null) { - return null; - } - } - - Rect taskRect = new Rect(); - transform.rect.round(taskRect); - // Disable in for low ram devices because each task does in Recents does not have fullscreen - // height (stackView height) and when transitioning to fullscreen app, the code below would - // force the task thumbnail to full stackView height immediately causing the transition - // jarring. - if (!LegacyRecentsImpl.getConfiguration().isLowRamDevice && taskView.getTask() != - stackView.getStack().getFrontMostTask()) { - taskRect.bottom = taskRect.top + stackView.getMeasuredHeight(); - } - return new AppTransitionAnimationSpecCompat(taskView.getTask().key.id, b, taskRect); - } - - /** - * Composes the transition spec when docking a task, which includes a full task bitmap. - */ - public List<AppTransitionAnimationSpecCompat> composeDockAnimationSpec(TaskView taskView, - Rect bounds) { - mTmpTransform.fillIn(taskView); - Task task = taskView.getTask(); - Bitmap buffer = RecentsTransitionComposer.composeTaskBitmap(taskView, mTmpTransform); - return Collections.singletonList(new AppTransitionAnimationSpecCompat(task.key.id, buffer, - bounds)); - } - - /** - * Composes the animation specs for all the tasks in the target stack. - */ - public List<AppTransitionAnimationSpecCompat> composeAnimationSpecs(final Task task, - final TaskStackView stackView, int windowingMode, int activityType, Rect windowRect) { - // Calculate the offscreen task rect (for tasks that are not backed by views) - TaskView taskView = stackView.getChildViewForTask(task); - TaskStackLayoutAlgorithm stackLayout = stackView.getStackAlgorithm(); - Rect offscreenTaskRect = new Rect(); - stackLayout.getFrontOfStackTransform().rect.round(offscreenTaskRect); - - // If this is a full screen stack, the transition will be towards the single, full screen - // task. We only need the transition spec for this task. - - // TODO: Sometimes targetStackId is not initialized after reboot, so we also have to - // check for INVALID_STACK_ID (now WINDOWING_MODE_UNDEFINED) - if (windowingMode == WINDOWING_MODE_FULLSCREEN - || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY - || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY - || activityType == ACTIVITY_TYPE_ASSISTANT - || windowingMode == WINDOWING_MODE_UNDEFINED) { - List<AppTransitionAnimationSpecCompat> specs = new ArrayList<>(); - if (taskView == null) { - specs.add(composeOffscreenAnimationSpec(task, offscreenTaskRect)); - } else { - mTmpTransform.fillIn(taskView); - stackLayout.transformToScreenCoordinates(mTmpTransform, windowRect); - AppTransitionAnimationSpecCompat spec = composeAnimationSpec(stackView, taskView, - mTmpTransform, true /* addHeaderBitmap */); - if (spec != null) { - specs.add(spec); - } - } - return specs; - } - return Collections.emptyList(); - } - - /** - * Composes a single animation spec for the given {@link Task} - */ - private static AppTransitionAnimationSpecCompat composeOffscreenAnimationSpec(Task task, - Rect taskRect) { - return new AppTransitionAnimationSpecCompat(task.key.id, null, taskRect); - } - - public static Bitmap composeTaskBitmap(TaskView taskView, TaskViewTransform transform) { - float scale = transform.scale; - int fromWidth = (int) (transform.rect.width() * scale); - int fromHeight = (int) (transform.rect.height() * scale); - if (fromWidth == 0 || fromHeight == 0) { - Log.e(TAG, "Could not compose thumbnail for task: " + taskView.getTask() + - " at transform: " + transform); - - return RecentsTransition.drawViewIntoHardwareBitmap(1, 1, null, 1f, 0x00ffffff); - } else { - if (RecentsDebugFlags.Static.EnableTransitionThumbnailDebugMode) { - return RecentsTransition.drawViewIntoHardwareBitmap(fromWidth, fromHeight, null, 1f, - 0xFFff0000); - } else { - return RecentsTransition.drawViewIntoHardwareBitmap(fromWidth, fromHeight, taskView, - scale, 0); - } - } - } - - private static Bitmap composeHeaderBitmap(TaskView taskView, - TaskViewTransform transform) { - float scale = transform.scale; - int headerWidth = (int) (transform.rect.width()); - int headerHeight = (int) (taskView.mHeaderView.getMeasuredHeight() * scale); - if (headerWidth == 0 || headerHeight == 0) { - return null; - } - - if (RecentsDebugFlags.Static.EnableTransitionThumbnailDebugMode) { - return RecentsTransition.drawViewIntoHardwareBitmap(headerWidth, headerHeight, null, 1f, - 0xFFff0000); - } else { - return RecentsTransition.drawViewIntoHardwareBitmap(headerWidth, headerHeight, - taskView.mHeaderView, scale, 0); - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsView.java deleted file mode 100644 index e60ffba435ff..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsView.java +++ /dev/null @@ -1,1077 +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.systemui.recents.views; - -import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; - -import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_RECENT_APPS; - -import android.animation.ValueAnimator; -import android.animation.ValueAnimator.AnimatorUpdateListener; -import android.annotation.Nullable; -import android.app.ActivityOptions; -import android.content.Context; -import android.content.res.ColorStateList; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Point; -import android.graphics.PointF; -import android.graphics.Rect; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.os.Handler; -import android.util.ArraySet; -import android.util.AttributeSet; -import android.util.Log; -import android.util.MathUtils; -import android.view.LayoutInflater; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewDebug; -import android.view.ViewPropertyAnimator; -import android.view.Window; -import android.view.WindowInsets; -import android.widget.FrameLayout; -import android.widget.TextView; - -import com.android.internal.colorextraction.ColorExtractor; -import com.android.internal.colorextraction.drawable.ScrimDrawable; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settingslib.Utils; -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsActivity; -import com.android.systemui.recents.RecentsActivityLaunchState; -import com.android.systemui.recents.RecentsConfiguration; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent; -import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted; -import com.android.systemui.recents.events.activity.DockedFirstAnimationFrameEvent; -import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent; -import com.android.systemui.recents.events.activity.ExitRecentsWindowFirstAnimationFrameEvent; -import com.android.systemui.recents.events.activity.HideStackActionButtonEvent; -import com.android.systemui.recents.events.activity.LaunchTaskEvent; -import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent; -import com.android.systemui.recents.events.activity.LaunchTaskStartedEvent; -import com.android.systemui.recents.events.activity.LaunchTaskSucceededEvent; -import com.android.systemui.recents.events.activity.MultiWindowStateChangedEvent; -import com.android.systemui.recents.events.activity.ShowEmptyViewEvent; -import com.android.systemui.recents.events.activity.ShowStackActionButtonEvent; -import com.android.systemui.recents.events.component.ExpandPipEvent; -import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; -import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; -import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent; -import com.android.systemui.recents.events.ui.DismissAllTaskViewsEvent; -import com.android.systemui.recents.events.ui.DraggingInRecentsEndedEvent; -import com.android.systemui.recents.events.ui.DraggingInRecentsEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragDropTargetChangedEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndCancelledEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent; -import com.android.systemui.recents.misc.ReferenceCountedTrigger; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecCompat; -import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecsFuture; -import com.android.systemui.shared.recents.view.RecentsTransition; -import com.android.systemui.shared.system.ActivityManagerWrapper; -import com.android.systemui.shared.system.ActivityOptionsCompat; -import com.android.systemui.shared.system.WindowManagerWrapper; -import com.android.systemui.stackdivider.WindowManagerProxy; -import com.android.systemui.statusbar.FlingAnimationUtils; -import com.android.systemui.statusbar.phone.ScrimController; - -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; - -/** - * This view is the the top level layout that contains TaskStacks (which are laid out according - * to their SpaceNode bounds. - */ -public class RecentsView extends FrameLayout { - - private static final String TAG = "RecentsView"; - - private static final int DEFAULT_UPDATE_SCRIM_DURATION = 200; - - private static final int SHOW_STACK_ACTION_BUTTON_DURATION = 134; - private static final int HIDE_STACK_ACTION_BUTTON_DURATION = 100; - - private static final int BUSY_RECENTS_TASK_COUNT = 3; - - private Handler mHandler; - private TaskStackView mTaskStackView; - private TextView mStackActionButton; - private TextView mEmptyView; - private final float mStackButtonShadowRadius; - private final PointF mStackButtonShadowDistance; - private final int mStackButtonShadowColor; - - private boolean mAwaitingFirstLayout = true; - - @ViewDebug.ExportedProperty(category="recents") - Rect mSystemInsets = new Rect(); - private int mDividerSize; - - private float mBusynessFactor; - private ScrimDrawable mBackgroundScrim; - private ColorDrawable mMultiWindowBackgroundScrim; - private ValueAnimator mBackgroundScrimAnimator; - private Point mTmpDisplaySize = new Point(); - - private final AnimatorUpdateListener mUpdateBackgroundScrimAlpha = (animation) -> { - int alpha = (Integer) animation.getAnimatedValue(); - mBackgroundScrim.setAlpha(alpha); - mMultiWindowBackgroundScrim.setAlpha(alpha); - }; - - private RecentsTransitionComposer mTransitionHelper; - @ViewDebug.ExportedProperty(deepExport=true, prefix="touch_") - private RecentsViewTouchHandler mTouchHandler; - private final FlingAnimationUtils mFlingAnimationUtils; - - public RecentsView(Context context) { - this(context, null); - } - - public RecentsView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public RecentsView(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public RecentsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - setWillNotDraw(false); - - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - mHandler = new Handler(); - mTransitionHelper = new RecentsTransitionComposer(getContext()); - mDividerSize = ssp.getDockedDividerSize(context); - mTouchHandler = new RecentsViewTouchHandler(this); - mFlingAnimationUtils = new FlingAnimationUtils(context, 0.3f); - mBackgroundScrim = new ScrimDrawable(); - mMultiWindowBackgroundScrim = new ColorDrawable(); - - LayoutInflater inflater = LayoutInflater.from(context); - mEmptyView = (TextView) inflater.inflate(R.layout.recents_empty, this, false); - addView(mEmptyView); - - if (mStackActionButton != null) { - removeView(mStackActionButton); - } - mStackActionButton = (TextView) inflater.inflate(LegacyRecentsImpl.getConfiguration() - .isLowRamDevice - ? R.layout.recents_low_ram_stack_action_button - : R.layout.recents_stack_action_button, - this, false); - - mStackButtonShadowRadius = mStackActionButton.getShadowRadius(); - mStackButtonShadowDistance = new PointF(mStackActionButton.getShadowDx(), - mStackActionButton.getShadowDy()); - mStackButtonShadowColor = mStackActionButton.getShadowColor(); - addView(mStackActionButton); - - reevaluateStyles(); - } - - public void reevaluateStyles() { - int textColor = Utils.getColorAttrDefaultColor(mContext, R.attr.wallpaperTextColor); - boolean usingDarkText = Color.luminance(textColor) < 0.5f; - - mEmptyView.setTextColor(textColor); - mEmptyView.setCompoundDrawableTintList(new ColorStateList(new int[][]{ - {android.R.attr.state_enabled}}, new int[]{textColor})); - - if (mStackActionButton != null) { - mStackActionButton.setTextColor(textColor); - // Enable/disable shadow if text color is already dark. - if (usingDarkText) { - mStackActionButton.setShadowLayer(0, 0, 0, 0); - } else { - mStackActionButton.setShadowLayer(mStackButtonShadowRadius, - mStackButtonShadowDistance.x, mStackButtonShadowDistance.y, - mStackButtonShadowColor); - } - } - - // Let's also require dark status and nav bars if the text is dark - int systemBarsStyle = usingDarkText ? View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0; - - setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | - View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | - View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | - systemBarsStyle); - } - - /** - * Called from RecentsActivity when it is relaunched. - */ - public void onReload(TaskStack stack, boolean isResumingFromVisible) { - final RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - final RecentsActivityLaunchState launchState = config.getLaunchState(); - final boolean isTaskStackEmpty = stack.getTaskCount() == 0; - - if (mTaskStackView == null) { - isResumingFromVisible = false; - mTaskStackView = new TaskStackView(getContext()); - mTaskStackView.setSystemInsets(mSystemInsets); - addView(mTaskStackView); - } - - // Reset the state - mAwaitingFirstLayout = !isResumingFromVisible; - - // Update the stack - mTaskStackView.onReload(isResumingFromVisible); - updateStack(stack, true /* setStackViewTasks */); - updateBusyness(); - - if (isResumingFromVisible) { - // If we are already visible, then restore the background scrim - animateBackgroundScrim(getOpaqueScrimAlpha(), DEFAULT_UPDATE_SCRIM_DURATION); - } else { - // If we are already occluded by the app, then set the final background scrim alpha now. - // Otherwise, defer until the enter animation completes to animate the scrim alpha with - // the tasks for the home animation. - if (launchState.launchedViaDockGesture || launchState.launchedFromApp - || isTaskStackEmpty) { - mBackgroundScrim.setAlpha((int) (getOpaqueScrimAlpha() * 255)); - } else { - mBackgroundScrim.setAlpha(0); - } - mMultiWindowBackgroundScrim.setAlpha(mBackgroundScrim.getAlpha()); - } - } - - /** - * Called from RecentsActivity when the task stack is updated. - */ - public void updateStack(TaskStack stack, boolean setStackViewTasks) { - if (setStackViewTasks) { - mTaskStackView.setTasks(stack, true /* allowNotifyStackChanges */); - } - - // Update the top level view's visibilities - if (stack.getTaskCount() > 0) { - hideEmptyView(); - } else { - showEmptyView(R.string.recents_empty_message); - } - } - - /** - * Animates the scrim opacity based on how many tasks are visible. - * Called from {@link RecentsActivity} when tasks are dismissed. - */ - public void updateScrimOpacity() { - if (updateBusyness()) { - animateBackgroundScrim(getOpaqueScrimAlpha(), DEFAULT_UPDATE_SCRIM_DURATION); - } - } - - /** - * Updates the busyness factor. - * - * @return True if it changed. - */ - private boolean updateBusyness() { - final int taskCount = mTaskStackView.getStack().getTaskCount(); - final float busyness = Math.min(taskCount, BUSY_RECENTS_TASK_COUNT) - / (float) BUSY_RECENTS_TASK_COUNT; - if (mBusynessFactor == busyness) { - return false; - } else { - mBusynessFactor = busyness; - return true; - } - } - - /** - * Returns the current TaskStack. - */ - public TaskStack getStack() { - return mTaskStackView.getStack(); - } - - /** - * Returns the window background scrim. - */ - public void updateBackgroundScrim(Window window, boolean isInMultiWindow) { - if (isInMultiWindow) { - mBackgroundScrim.setCallback(null); - window.setBackgroundDrawable(mMultiWindowBackgroundScrim); - } else { - mMultiWindowBackgroundScrim.setCallback(null); - window.setBackgroundDrawable(mBackgroundScrim); - } - } - - /** Launches the focused task from the first stack if possible */ - public boolean launchFocusedTask(int logEvent) { - if (mTaskStackView != null) { - Task task = mTaskStackView.getFocusedTask(); - if (task != null) { - TaskView taskView = mTaskStackView.getChildViewForTask(task); - EventBus.getDefault().send(new LaunchTaskEvent(taskView, task, null, false)); - - if (logEvent != 0) { - MetricsLogger.action(getContext(), logEvent, - task.key.getComponent().toString()); - } - return true; - } - } - return false; - } - - /** Launches the task that recents was launched from if possible */ - public boolean launchPreviousTask() { - if (LegacyRecentsImpl.getConfiguration().getLaunchState().launchedFromPipApp) { - // If the app auto-entered PiP on the way to Recents, then just re-expand it - EventBus.getDefault().send(new ExpandPipEvent()); - return true; - } - - if (mTaskStackView != null) { - Task task = getStack().getLaunchTarget(); - if (task != null) { - TaskView taskView = mTaskStackView.getChildViewForTask(task); - EventBus.getDefault().send(new LaunchTaskEvent(taskView, task, null, false)); - return true; - } - } - return false; - } - - /** - * Hides the task stack and shows the empty view. - */ - public void showEmptyView(int msgResId) { - mTaskStackView.setVisibility(View.INVISIBLE); - mEmptyView.setText(msgResId); - mEmptyView.setVisibility(View.VISIBLE); - mEmptyView.bringToFront(); - mStackActionButton.bringToFront(); - } - - /** - * Shows the task stack and hides the empty view. - */ - public void hideEmptyView() { - mEmptyView.setVisibility(View.INVISIBLE); - mTaskStackView.setVisibility(View.VISIBLE); - mTaskStackView.bringToFront(); - mStackActionButton.bringToFront(); - } - - /** - * Set the color of the scrim. - * - * @param scrimColors Colors to use. - * @param animated Interpolate colors if true. - */ - public void setScrimColors(ColorExtractor.GradientColors scrimColors, boolean animated) { - mBackgroundScrim.setColor(scrimColors.getMainColor(), animated); - int alpha = mMultiWindowBackgroundScrim.getAlpha(); - mMultiWindowBackgroundScrim.setColor(scrimColors.getMainColor()); - mMultiWindowBackgroundScrim.setAlpha(alpha); - } - - @Override - protected void onAttachedToWindow() { - EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1); - EventBus.getDefault().register(mTouchHandler, RecentsActivity.EVENT_BUS_PRIORITY + 2); - super.onAttachedToWindow(); - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - EventBus.getDefault().unregister(this); - EventBus.getDefault().unregister(mTouchHandler); - } - - /** - * This is called with the full size of the window since we are handling our own insets. - */ - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - int width = MeasureSpec.getSize(widthMeasureSpec); - int height = MeasureSpec.getSize(heightMeasureSpec); - - if (mTaskStackView.getVisibility() != GONE) { - mTaskStackView.measure(widthMeasureSpec, heightMeasureSpec); - } - - // Measure the empty view to the full size of the screen - if (mEmptyView.getVisibility() != GONE) { - measureChild(mEmptyView, MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), - MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST)); - } - - // Measure the stack action button within the constraints of the space above the stack - Rect buttonBounds = mTaskStackView.mLayoutAlgorithm.getStackActionButtonRect(); - measureChild(mStackActionButton, - MeasureSpec.makeMeasureSpec(buttonBounds.width(), MeasureSpec.AT_MOST), - MeasureSpec.makeMeasureSpec(buttonBounds.height(), MeasureSpec.AT_MOST)); - - setMeasuredDimension(width, height); - } - - /** - * This is called with the full size of the window since we are handling our own insets. - */ - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - if (mTaskStackView.getVisibility() != GONE) { - mTaskStackView.layout(left, top, left + getMeasuredWidth(), top + getMeasuredHeight()); - } - - // Layout the empty view - if (mEmptyView.getVisibility() != GONE) { - int leftRightInsets = mSystemInsets.left + mSystemInsets.right; - int topBottomInsets = mSystemInsets.top + mSystemInsets.bottom; - int childWidth = mEmptyView.getMeasuredWidth(); - int childHeight = mEmptyView.getMeasuredHeight(); - int childLeft = left + mSystemInsets.left + - Math.max(0, (right - left - leftRightInsets - childWidth)) / 2; - int childTop = top + mSystemInsets.top + - Math.max(0, (bottom - top - topBottomInsets - childHeight)) / 2; - mEmptyView.layout(childLeft, childTop, childLeft + childWidth, childTop + childHeight); - } - - // Needs to know the screen size since the gradient never scales up or down - // even when bounds change. - mContext.getDisplay().getRealSize(mTmpDisplaySize); - mBackgroundScrim.setBounds(left, top, right, bottom); - mMultiWindowBackgroundScrim.setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y); - - // Layout the stack action button such that its drawable is start-aligned with the - // stack, vertically centered in the available space above the stack - Rect buttonBounds = getStackActionButtonBoundsFromStackLayout(); - mStackActionButton.layout(buttonBounds.left, buttonBounds.top, buttonBounds.right, - buttonBounds.bottom); - - if (mAwaitingFirstLayout) { - mAwaitingFirstLayout = false; - // If launched via dragging from the nav bar, then we should translate the whole view - // down offscreen - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - if (launchState.launchedViaDragGesture) { - setTranslationY(getMeasuredHeight()); - } else { - setTranslationY(0f); - } - - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice - && mEmptyView.getVisibility() == View.VISIBLE) { - animateEmptyView(true /* show */, null /* postAnimationTrigger */); - } - } - } - - @Override - public WindowInsets onApplyWindowInsets(WindowInsets insets) { - mSystemInsets.set(insets.getSystemWindowInsetsAsRect()); - mTaskStackView.setSystemInsets(mSystemInsets); - requestLayout(); - return insets; - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - return mTouchHandler.onInterceptTouchEvent(ev); - } - - @Override - public boolean onTouchEvent(MotionEvent ev) { - return mTouchHandler.onTouchEvent(ev); - } - - @Override - public void onDrawForeground(Canvas canvas) { - super.onDrawForeground(canvas); - - ArrayList<DockState> visDockStates = mTouchHandler.getVisibleDockStates(); - for (int i = visDockStates.size() - 1; i >= 0; i--) { - visDockStates.get(i).viewState.draw(canvas); - } - } - - @Override - protected boolean verifyDrawable(Drawable who) { - ArrayList<DockState> visDockStates = mTouchHandler.getVisibleDockStates(); - for (int i = visDockStates.size() - 1; i >= 0; i--) { - Drawable d = visDockStates.get(i).viewState.dockAreaOverlay; - if (d == who) { - return true; - } - } - return super.verifyDrawable(who); - } - - /**** EventBus Events ****/ - - public final void onBusEvent(LaunchTaskEvent event) { - launchTaskFromRecents(getStack(), event.task, mTaskStackView, event.taskView, - event.screenPinningRequested, event.targetWindowingMode, event.targetActivityType); - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - EventBus.getDefault().send(new HideStackActionButtonEvent(false /* translate */)); - } - } - - public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) { - int taskViewExitToHomeDuration = TaskStackAnimationHelper.EXIT_TO_HOME_TRANSLATION_DURATION; - // Hide the stack action button - EventBus.getDefault().send(new HideStackActionButtonEvent()); - animateBackgroundScrim(0f, taskViewExitToHomeDuration); - - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - animateEmptyView(false /* show */, event.getAnimationTrigger()); - } - } - - public final void onBusEvent(DragStartEvent event) { - updateVisibleDockRegions(LegacyRecentsImpl.getConfiguration().getDockStatesForCurrentOrientation(), - true /* isDefaultDockState */, DockState.NONE.viewState.dockAreaAlpha, - DockState.NONE.viewState.hintTextAlpha, - true /* animateAlpha */, false /* animateBounds */); - - // Temporarily hide the stack action button without changing visibility - if (mStackActionButton != null) { - mStackActionButton.animate() - .alpha(0f) - .setDuration(HIDE_STACK_ACTION_BUTTON_DURATION) - .setInterpolator(Interpolators.ALPHA_OUT) - .start(); - } - } - - public final void onBusEvent(DragDropTargetChangedEvent event) { - if (event.dropTarget == null || !(event.dropTarget instanceof DockState)) { - updateVisibleDockRegions( - LegacyRecentsImpl.getConfiguration().getDockStatesForCurrentOrientation(), - true /* isDefaultDockState */, DockState.NONE.viewState.dockAreaAlpha, - DockState.NONE.viewState.hintTextAlpha, - true /* animateAlpha */, true /* animateBounds */); - } else { - final DockState dockState = (DockState) event.dropTarget; - updateVisibleDockRegions(new DockState[] {dockState}, - false /* isDefaultDockState */, -1, -1, true /* animateAlpha */, - true /* animateBounds */); - } - if (mStackActionButton != null) { - event.addPostAnimationCallback(new Runnable() { - @Override - public void run() { - // Move the clear all button to its new position - Rect buttonBounds = getStackActionButtonBoundsFromStackLayout(); - mStackActionButton.setLeftTopRightBottom(buttonBounds.left, buttonBounds.top, - buttonBounds.right, buttonBounds.bottom); - } - }); - } - } - - public final void onBusEvent(final DragEndEvent event) { - // Handle the case where we drop onto a dock region - if (event.dropTarget instanceof DockState) { - final DockState dockState = (DockState) event.dropTarget; - - // Hide the dock region - updateVisibleDockRegions(null, false /* isDefaultDockState */, -1, -1, - false /* animateAlpha */, false /* animateBounds */); - - // We translated the view but we need to animate it back from the current layout-space - // rect to its final layout-space rect - Utilities.setViewFrameFromTranslation(event.taskView); - - final ActivityOptions options = ActivityOptionsCompat.makeSplitScreenOptions( - dockState.createMode == SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT); - if (ActivityManagerWrapper.getInstance().startActivityFromRecents(event.task.key.id, - options)) { - final Runnable animStartedListener = () -> { - EventBus.getDefault().send(new DockedFirstAnimationFrameEvent()); - // Remove the task and don't bother relaying out, as all the tasks - // will be relaid out when the stack changes on the multiwindow - // change event - getStack().removeTask(event.task, null, true /* fromDockGesture */); - }; - final Rect taskRect = getTaskRect(event.taskView); - AppTransitionAnimationSpecsFuture future = new AppTransitionAnimationSpecsFuture( - getHandler()) { - @Override - public List<AppTransitionAnimationSpecCompat> composeSpecs() { - return mTransitionHelper.composeDockAnimationSpec(event.taskView, taskRect); - } - }; - WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture( - future, animStartedListener, getHandler(), true /* scaleUp */, - getContext().getDisplayId()); - MetricsLogger.action(mContext, MetricsEvent.ACTION_WINDOW_DOCK_DRAG_DROP, - event.task.getTopComponent().flattenToShortString()); - } else { - EventBus.getDefault().send(new DragEndCancelledEvent(getStack(), event.task, - event.taskView)); - } - } else { - // Animate the overlay alpha back to 0 - updateVisibleDockRegions(null, true /* isDefaultDockState */, -1, -1, - true /* animateAlpha */, false /* animateBounds */); - } - - // Show the stack action button again without changing visibility - if (mStackActionButton != null) { - mStackActionButton.animate() - .alpha(1f) - .setDuration(SHOW_STACK_ACTION_BUTTON_DURATION) - .setInterpolator(Interpolators.ALPHA_IN) - .start(); - } - } - - public final void onBusEvent(final DragEndCancelledEvent event) { - // Animate the overlay alpha back to 0 - updateVisibleDockRegions(null, true /* isDefaultDockState */, -1, -1, - true /* animateAlpha */, false /* animateBounds */); - } - - private Rect getTaskRect(TaskView taskView) { - int[] location = taskView.getLocationOnScreen(); - int viewX = location[0]; - int viewY = location[1]; - return new Rect(viewX, viewY, - (int) (viewX + taskView.getWidth() * taskView.getScaleX()), - (int) (viewY + taskView.getHeight() * taskView.getScaleY())); - } - - public final void onBusEvent(DraggingInRecentsEvent event) { - if (mTaskStackView.getTaskViews().size() > 0) { - setTranslationY(event.distanceFromTop - mTaskStackView.getTaskViews().get(0).getY()); - } - } - - public final void onBusEvent(DraggingInRecentsEndedEvent event) { - ViewPropertyAnimator animator = animate(); - if (event.velocity > mFlingAnimationUtils.getMinVelocityPxPerSecond()) { - animator.translationY(getHeight()); - animator.withEndAction(new Runnable() { - @Override - public void run() { - WindowManagerProxy.getInstance().maximizeDockedStack(); - } - }); - mFlingAnimationUtils.apply(animator, getTranslationY(), getHeight(), event.velocity); - } else { - animator.translationY(0f); - animator.setListener(null); - mFlingAnimationUtils.apply(animator, getTranslationY(), 0, event.velocity); - } - animator.start(); - } - - public final void onBusEvent(EnterRecentsWindowAnimationCompletedEvent event) { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - if (!launchState.launchedViaDockGesture && !launchState.launchedFromApp - && getStack().getTaskCount() > 0) { - animateBackgroundScrim(getOpaqueScrimAlpha(), - TaskStackAnimationHelper.ENTER_FROM_HOME_TRANSLATION_DURATION); - } - } - - public final void onBusEvent(AllTaskViewsDismissedEvent event) { - EventBus.getDefault().send(new HideStackActionButtonEvent()); - } - - public final void onBusEvent(DismissAllTaskViewsEvent event) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - if (!ssp.hasDockedTask()) { - // Animate the background away only if we are dismissing Recents to home - animateBackgroundScrim(0f, DEFAULT_UPDATE_SCRIM_DURATION); - } - } - - public final void onBusEvent(ShowStackActionButtonEvent event) { - showStackActionButton(SHOW_STACK_ACTION_BUTTON_DURATION, event.translate); - } - - public final void onBusEvent(HideStackActionButtonEvent event) { - hideStackActionButton(HIDE_STACK_ACTION_BUTTON_DURATION, true /* translate */); - } - - public final void onBusEvent(MultiWindowStateChangedEvent event) { - updateStack(event.stack, false /* setStackViewTasks */); - } - - public final void onBusEvent(ShowEmptyViewEvent event) { - showEmptyView(R.string.recents_empty_message); - } - - /** - * Shows the stack action button. - */ - private void showStackActionButton(final int duration, final boolean translate) { - final ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(); - if (mStackActionButton.getVisibility() == View.INVISIBLE) { - mStackActionButton.setVisibility(View.VISIBLE); - mStackActionButton.setAlpha(0f); - if (translate) { - mStackActionButton.setTranslationY(mStackActionButton.getMeasuredHeight() * - (LegacyRecentsImpl.getConfiguration().isLowRamDevice ? 1 : -0.25f)); - } else { - mStackActionButton.setTranslationY(0f); - } - postAnimationTrigger.addLastDecrementRunnable(new Runnable() { - @Override - public void run() { - if (translate) { - mStackActionButton.animate() - .translationY(0f); - } - mStackActionButton.animate() - .alpha(1f) - .setDuration(duration) - .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) - .start(); - } - }); - } - postAnimationTrigger.flushLastDecrementRunnables(); - } - - /** - * Hides the stack action button. - */ - private void hideStackActionButton(int duration, boolean translate) { - final ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(); - hideStackActionButton(duration, translate, postAnimationTrigger); - postAnimationTrigger.flushLastDecrementRunnables(); - } - - /** - * Hides the stack action button. - */ - private void hideStackActionButton(int duration, boolean translate, - final ReferenceCountedTrigger postAnimationTrigger) { - if (mStackActionButton.getVisibility() == View.VISIBLE) { - if (translate) { - mStackActionButton.animate().translationY(mStackActionButton.getMeasuredHeight() - * (LegacyRecentsImpl.getConfiguration().isLowRamDevice ? 1 : -0.25f)); - } - mStackActionButton.animate() - .alpha(0f) - .setDuration(duration) - .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) - .withEndAction(new Runnable() { - @Override - public void run() { - mStackActionButton.setVisibility(View.INVISIBLE); - postAnimationTrigger.decrement(); - } - }) - .start(); - postAnimationTrigger.increment(); - } - } - - /** - * Animates a translation in the Y direction and fades in/out for empty view to show or hide it. - * @param show whether to translate up and fade in the empty view to the center of the screen - * @param postAnimationTrigger to keep track of the animation - */ - private void animateEmptyView(boolean show, ReferenceCountedTrigger postAnimationTrigger) { - float start = mTaskStackView.getStackAlgorithm().getTaskRect().height() / 4; - mEmptyView.setTranslationY(show ? start : 0); - mEmptyView.setAlpha(show ? 0f : 1f); - ViewPropertyAnimator animator = mEmptyView.animate() - .setDuration(150) - .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) - .translationY(show ? 0 : start) - .alpha(show ? 1f : 0f); - - if (postAnimationTrigger != null) { - animator.setListener(postAnimationTrigger.decrementOnAnimationEnd()); - postAnimationTrigger.increment(); - } - animator.start(); - } - - /** - * Updates the dock region to match the specified dock state. - */ - private void updateVisibleDockRegions(DockState[] newDockStates, - boolean isDefaultDockState, int overrideAreaAlpha, int overrideHintAlpha, - boolean animateAlpha, boolean animateBounds) { - ArraySet<DockState> newDockStatesSet = Utilities.arrayToSet(newDockStates, - new ArraySet<DockState>()); - ArrayList<DockState> visDockStates = mTouchHandler.getVisibleDockStates(); - for (int i = visDockStates.size() - 1; i >= 0; i--) { - DockState dockState = visDockStates.get(i); - DockState.ViewState viewState = dockState.viewState; - if (newDockStates == null || !newDockStatesSet.contains(dockState)) { - // This is no longer visible, so hide it - viewState.startAnimation(null, 0, 0, TaskStackView.SLOW_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN, animateAlpha, animateBounds); - } else { - // This state is now visible, update the bounds and show it - int areaAlpha = overrideAreaAlpha != -1 - ? overrideAreaAlpha - : viewState.dockAreaAlpha; - int hintAlpha = overrideHintAlpha != -1 - ? overrideHintAlpha - : viewState.hintTextAlpha; - Rect bounds = isDefaultDockState - ? dockState.getPreDockedBounds(getMeasuredWidth(), getMeasuredHeight(), - mSystemInsets) - : dockState.getDockedBounds(getMeasuredWidth(), getMeasuredHeight(), - mDividerSize, mSystemInsets, getResources()); - if (viewState.dockAreaOverlay.getCallback() != this) { - viewState.dockAreaOverlay.setCallback(this); - viewState.dockAreaOverlay.setBounds(bounds); - } - viewState.startAnimation(bounds, areaAlpha, hintAlpha, - TaskStackView.SLOW_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN, - animateAlpha, animateBounds); - } - } - } - - /** - * Scrim alpha based on how busy recents is: - * Scrim will be {@link ScrimController#GRADIENT_SCRIM_ALPHA} when the stack is empty, - * and {@link ScrimController#GRADIENT_SCRIM_ALPHA_BUSY} when it's full. - * - * @return Alpha from 0 to 1. - */ - private float getOpaqueScrimAlpha() { - return MathUtils.map(0, 1, ScrimController.GRADIENT_SCRIM_ALPHA, - ScrimController.GRADIENT_SCRIM_ALPHA_BUSY, mBusynessFactor); - } - - /** - * Animates the background scrim to the given {@param alpha}. - */ - private void animateBackgroundScrim(float alpha, int duration) { - Utilities.cancelAnimationWithoutCallbacks(mBackgroundScrimAnimator); - // Calculate the absolute alpha to animate from - final int fromAlpha = mBackgroundScrim.getAlpha(); - final int toAlpha = (int) (alpha * 255); - mBackgroundScrimAnimator = ValueAnimator.ofInt(fromAlpha, toAlpha); - mBackgroundScrimAnimator.setDuration(duration); - mBackgroundScrimAnimator.setInterpolator(toAlpha > fromAlpha - ? Interpolators.ALPHA_IN - : Interpolators.ALPHA_OUT); - mBackgroundScrimAnimator.addUpdateListener(mUpdateBackgroundScrimAlpha); - mBackgroundScrimAnimator.start(); - } - - /** - * @return the bounds of the stack action button. - */ - Rect getStackActionButtonBoundsFromStackLayout() { - Rect actionButtonRect = new Rect( - mTaskStackView.mLayoutAlgorithm.getStackActionButtonRect()); - int left, top; - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - Rect windowRect = LegacyRecentsImpl.getSystemServices().getWindowRect(); - int spaceLeft = windowRect.width() - mSystemInsets.left - mSystemInsets.right; - left = (spaceLeft - mStackActionButton.getMeasuredWidth()) / 2 + mSystemInsets.left; - top = windowRect.height() - (mStackActionButton.getMeasuredHeight() - + mSystemInsets.bottom + mStackActionButton.getPaddingBottom() / 2); - } else { - left = isLayoutRtl() - ? actionButtonRect.left - mStackActionButton.getPaddingLeft() - : actionButtonRect.right + mStackActionButton.getPaddingRight() - - mStackActionButton.getMeasuredWidth(); - top = actionButtonRect.top + - (actionButtonRect.height() - mStackActionButton.getMeasuredHeight()) / 2; - } - actionButtonRect.set(left, top, left + mStackActionButton.getMeasuredWidth(), - top + mStackActionButton.getMeasuredHeight()); - return actionButtonRect; - } - - View getStackActionButton() { - return mStackActionButton; - } - - /** - * Launches the specified {@link Task}. - */ - public void launchTaskFromRecents(final TaskStack stack, @Nullable final Task task, - final TaskStackView stackView, final TaskView taskView, - final boolean screenPinningRequested, final int windowingMode, final int activityType) { - - final Runnable animStartedListener; - final AppTransitionAnimationSpecsFuture transitionFuture; - if (taskView != null) { - - // Fetch window rect here already in order not to be blocked on lock contention in WM - // when the future calls it. - final Rect windowRect = LegacyRecentsImpl.getSystemServices().getWindowRect(); - transitionFuture = new AppTransitionAnimationSpecsFuture(stackView.getHandler()) { - @Override - public List<AppTransitionAnimationSpecCompat> composeSpecs() { - return mTransitionHelper.composeAnimationSpecs(task, stackView, windowingMode, - activityType, windowRect); - } - }; - animStartedListener = new Runnable() { - private boolean mHandled; - - @Override - public void run() { - if (mHandled) { - return; - } - mHandled = true; - - // If we are launching into another task, cancel the previous task's - // window transition - EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(task)); - EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent()); - stackView.cancelAllTaskViewAnimations(); - - if (screenPinningRequested) { - // Request screen pinning after the animation runs - mHandler.postDelayed(() -> { - EventBus.getDefault().send(new ScreenPinningRequestEvent(mContext, - task.key.id)); - }, 350); - } - - if (!LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - // Reset the state where we are waiting for the transition to start - EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(false)); - } - } - }; - } else { - // This is only the case if the task is not on screen (scrolled offscreen for example) - transitionFuture = null; - animStartedListener = new Runnable() { - private boolean mHandled; - - @Override - public void run() { - if (mHandled) { - return; - } - mHandled = true; - - // If we are launching into another task, cancel the previous task's - // window transition - EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(task)); - EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent()); - stackView.cancelAllTaskViewAnimations(); - - if (!LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - // Reset the state where we are waiting for the transition to start - EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(false)); - } - } - }; - } - - EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(true)); - final ActivityOptions opts = RecentsTransition.createAspectScaleAnimation(mContext, - mHandler, true /* scaleUp */, transitionFuture != null ? transitionFuture : null, - animStartedListener); - if (taskView == null) { - // If there is no task view, then we do not need to worry about animating out occluding - // task views, and we can launch immediately - startTaskActivity(stack, task, taskView, opts, transitionFuture, - windowingMode, activityType); - } else { - LaunchTaskStartedEvent launchStartedEvent = new LaunchTaskStartedEvent(taskView, - screenPinningRequested); - EventBus.getDefault().send(launchStartedEvent); - startTaskActivity(stack, task, taskView, opts, transitionFuture, windowingMode, - activityType); - } - ActivityManagerWrapper.getInstance().closeSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS); - } - - /** - * Starts the activity for the launch task. - * - * @param taskView this is the {@link TaskView} that we are launching from. This can be null if - * we are toggling recents and the launch-to task is now offscreen. - */ - private void startTaskActivity(TaskStack stack, Task task, @Nullable TaskView taskView, - ActivityOptions opts, AppTransitionAnimationSpecsFuture transitionFuture, - int windowingMode, int activityType) { - ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(task.key, opts, - windowingMode, activityType, succeeded -> { - if (succeeded) { - // Keep track of the index of the task launch - int taskIndexFromFront = 0; - int taskIndex = stack.indexOfTask(task); - if (taskIndex > -1) { - taskIndexFromFront = stack.getTaskCount() - taskIndex - 1; - } - EventBus.getDefault().send(new LaunchTaskSucceededEvent(taskIndexFromFront)); - } else { - Log.e(TAG, mContext.getString(R.string.recents_launch_error_message, task.title)); - - // Dismiss the task if we fail to launch it - if (taskView != null) { - taskView.dismissTask(); - } - - // Keep track of failed launches - EventBus.getDefault().send(new LaunchTaskFailedEvent()); - } - }, getHandler()); - if (transitionFuture != null) { - mHandler.post(transitionFuture::composeSpecsSynchronous); - } - } - - @Override - public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) { - super.requestDisallowInterceptTouchEvent(disallowIntercept); - mTouchHandler.cancelStackActionButtonClick(); - } - - public void dump(String prefix, PrintWriter writer) { - String innerPrefix = prefix + " "; - String id = Integer.toHexString(System.identityHashCode(this)); - - writer.print(prefix); writer.print(TAG); - writer.print(" awaitingFirstLayout="); writer.print(mAwaitingFirstLayout ? "Y" : "N"); - writer.print(" insets="); writer.print(Utilities.dumpRect(mSystemInsets)); - writer.print(" [0x"); writer.print(id); writer.print("]"); - writer.println(); - - if (getStack() != null) { - getStack().dump(innerPrefix, writer); - } - if (mTaskStackView != null) { - mTaskStackView.dump(innerPrefix, writer); - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java deleted file mode 100644 index 1a827d5941c0..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java +++ /dev/null @@ -1,286 +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.systemui.recents.views; - -import android.app.ActivityTaskManager; -import android.graphics.Point; -import android.graphics.Rect; -import android.view.InputDevice; -import android.view.MotionEvent; -import android.view.PointerIcon; -import android.view.View; -import android.view.ViewConfiguration; -import android.view.ViewDebug; - -import com.android.internal.policy.DividerSnapAlgorithm; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.ConfigurationChangedEvent; -import com.android.systemui.recents.events.activity.HideRecentsEvent; -import com.android.systemui.recents.events.ui.DismissAllTaskViewsEvent; -import com.android.systemui.recents.events.ui.HideIncompatibleAppOverlayEvent; -import com.android.systemui.recents.events.ui.ShowIncompatibleAppOverlayEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragDropTargetChangedEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragStartInitializeDropTargetsEvent; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.shared.recents.model.Task; - -import java.util.ArrayList; - -/** - * Handles touch events for a RecentsView. - */ -public class RecentsViewTouchHandler { - - private RecentsView mRv; - - @ViewDebug.ExportedProperty(deepExport=true, prefix="drag_task") - private Task mDragTask; - @ViewDebug.ExportedProperty(deepExport=true, prefix="drag_task_view_") - private TaskView mTaskView; - - @ViewDebug.ExportedProperty(category="recents") - private Point mTaskViewOffset = new Point(); - @ViewDebug.ExportedProperty(category="recents") - private Point mDownPos = new Point(); - @ViewDebug.ExportedProperty(category="recents") - private boolean mDragRequested; - @ViewDebug.ExportedProperty(category="recents") - private boolean mIsDragging; - private float mDragSlop; - private int mDeviceId = -1; - - private DropTarget mLastDropTarget; - private DividerSnapAlgorithm mDividerSnapAlgorithm; - private ArrayList<DropTarget> mDropTargets = new ArrayList<>(); - private ArrayList<DockState> mVisibleDockStates = new ArrayList<>(); - - public RecentsViewTouchHandler(RecentsView rv) { - mRv = rv; - mDragSlop = ViewConfiguration.get(rv.getContext()).getScaledTouchSlop(); - updateSnapAlgorithm(); - } - - private void updateSnapAlgorithm() { - Rect insets = new Rect(); - SystemServicesProxy.getInstance(mRv.getContext()).getStableInsets(insets); - mDividerSnapAlgorithm = DividerSnapAlgorithm.create(mRv.getContext(), insets); - } - - /** - * Registers a new drop target for the current drag only. - */ - public void registerDropTargetForCurrentDrag(DropTarget target) { - mDropTargets.add(target); - } - - /** - * Returns the set of visible dock states for this current drag. - */ - public ArrayList<DockState> getVisibleDockStates() { - return mVisibleDockStates; - } - - /** Touch preprocessing for handling below */ - public boolean onInterceptTouchEvent(MotionEvent ev) { - return handleTouchEvent(ev) || mDragRequested; - } - - /** Handles touch events once we have intercepted them */ - public boolean onTouchEvent(MotionEvent ev) { - handleTouchEvent(ev); - if (ev.getAction() == MotionEvent.ACTION_UP && mRv.getStack().getTaskCount() == 0) { - EventBus.getDefault().send(new HideRecentsEvent(false, true)); - } - return true; - } - - /**** Events ****/ - - public final void onBusEvent(DragStartEvent event) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - mRv.getParent().requestDisallowInterceptTouchEvent(true); - mDragRequested = true; - // We defer starting the actual drag handling until the user moves past the drag slop - mIsDragging = false; - mDragTask = event.task; - mTaskView = event.taskView; - mDropTargets.clear(); - - int[] recentsViewLocation = new int[2]; - mRv.getLocationInWindow(recentsViewLocation); - mTaskViewOffset.set(mTaskView.getLeft() - recentsViewLocation[0] + event.tlOffset.x, - mTaskView.getTop() - recentsViewLocation[1] + event.tlOffset.y); - - // Change space coordinates relative to the view to RecentsView when user initiates a touch - if (event.isUserTouchInitiated) { - float x = mDownPos.x - mTaskViewOffset.x; - float y = mDownPos.y - mTaskViewOffset.y; - mTaskView.setTranslationX(x); - mTaskView.setTranslationY(y); - } - - mVisibleDockStates.clear(); - if (ActivityTaskManager.supportsMultiWindow(mRv.getContext()) && !ssp.hasDockedTask() - && mDividerSnapAlgorithm.isSplitScreenFeasible()) { - LegacyRecentsImpl.logDockAttempt(mRv.getContext(), event.task.getTopComponent(), - event.task.resizeMode); - if (!event.task.isDockable) { - EventBus.getDefault().send(new ShowIncompatibleAppOverlayEvent()); - } else { - // Add the dock state drop targets (these take priority) - DockState[] dockStates = LegacyRecentsImpl.getConfiguration() - .getDockStatesForCurrentOrientation(); - for (DockState dockState : dockStates) { - registerDropTargetForCurrentDrag(dockState); - dockState.update(mRv.getContext()); - mVisibleDockStates.add(dockState); - } - } - } - - // Request other drop targets to register themselves - EventBus.getDefault().send(new DragStartInitializeDropTargetsEvent(event.task, - event.taskView, this)); - if (mDeviceId != -1) { - InputDevice device = InputDevice.getDevice(mDeviceId); - if (device != null) { - device.setPointerType(PointerIcon.TYPE_GRABBING); - } - } - } - - public final void onBusEvent(DragEndEvent event) { - if (!mDragTask.isDockable) { - EventBus.getDefault().send(new HideIncompatibleAppOverlayEvent()); - } - mDragRequested = false; - mDragTask = null; - mTaskView = null; - mLastDropTarget = null; - } - - public final void onBusEvent(ConfigurationChangedEvent event) { - if (event.fromDisplayDensityChange || event.fromDeviceOrientationChange) { - updateSnapAlgorithm(); - } - } - - void cancelStackActionButtonClick() { - mRv.getStackActionButton().setPressed(false); - } - - private boolean isWithinStackActionButton(float x, float y) { - Rect rect = mRv.getStackActionButtonBoundsFromStackLayout(); - return mRv.getStackActionButton().getVisibility() == View.VISIBLE && - mRv.getStackActionButton().pointInView(x - rect.left, y - rect.top, 0 /* slop */); - } - - private void changeStackActionButtonDrawableHotspot(float x, float y) { - Rect rect = mRv.getStackActionButtonBoundsFromStackLayout(); - mRv.getStackActionButton().drawableHotspotChanged(x - rect.left, y - rect.top); - } - - /** - * Handles dragging touch events - */ - private boolean handleTouchEvent(MotionEvent ev) { - int action = ev.getActionMasked(); - boolean consumed = false; - float evX = ev.getX(); - float evY = ev.getY(); - switch (action) { - case MotionEvent.ACTION_DOWN: - mDownPos.set((int) evX, (int) evY); - mDeviceId = ev.getDeviceId(); - - if (isWithinStackActionButton(evX, evY)) { - changeStackActionButtonDrawableHotspot(evX, evY); - mRv.getStackActionButton().setPressed(true); - } - break; - case MotionEvent.ACTION_MOVE: { - float x = evX - mTaskViewOffset.x; - float y = evY - mTaskViewOffset.y; - - if (mRv.getStackActionButton().isPressed() && isWithinStackActionButton(evX, evY)) { - changeStackActionButtonDrawableHotspot(evX, evY); - } - - if (mDragRequested) { - if (!mIsDragging) { - mIsDragging = Math.hypot(evX - mDownPos.x, evY - mDownPos.y) > mDragSlop; - } - if (mIsDragging) { - int width = mRv.getMeasuredWidth(); - int height = mRv.getMeasuredHeight(); - - DropTarget currentDropTarget = null; - - // Give priority to the current drop target to retain the touch handling - if (mLastDropTarget != null) { - if (mLastDropTarget.acceptsDrop((int) evX, (int) evY, width, height, - mRv.mSystemInsets, true /* isCurrentTarget */)) { - currentDropTarget = mLastDropTarget; - } - } - - // Otherwise, find the next target to handle this event - if (currentDropTarget == null) { - for (DropTarget target : mDropTargets) { - if (target.acceptsDrop((int) evX, (int) evY, width, height, - mRv.mSystemInsets, false /* isCurrentTarget */)) { - currentDropTarget = target; - break; - } - } - } - if (mLastDropTarget != currentDropTarget) { - mLastDropTarget = currentDropTarget; - EventBus.getDefault().send(new DragDropTargetChangedEvent(mDragTask, - currentDropTarget)); - } - } - mTaskView.setTranslationX(x); - mTaskView.setTranslationY(y); - } - break; - } - case MotionEvent.ACTION_UP: - case MotionEvent.ACTION_CANCEL: { - if (mRv.getStackActionButton().isPressed() && isWithinStackActionButton(evX, evY)) { - EventBus.getDefault().send(new DismissAllTaskViewsEvent()); - consumed = true; - } - cancelStackActionButtonClick(); - if (mDragRequested) { - boolean cancelled = action == MotionEvent.ACTION_CANCEL; - if (cancelled) { - EventBus.getDefault().send(new DragDropTargetChangedEvent(mDragTask, null)); - } - EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView, - !cancelled ? mLastDropTarget : null)); - break; - } - mDeviceId = -1; - } - } - return consumed; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/SystemBarScrimViews.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/SystemBarScrimViews.java deleted file mode 100644 index 22c12b408a13..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/SystemBarScrimViews.java +++ /dev/null @@ -1,194 +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.systemui.recents.views; - -import android.content.Context; -import android.view.View; - -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsActivity; -import com.android.systemui.recents.events.activity.ConfigurationChangedEvent; -import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted; -import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent; -import com.android.systemui.recents.events.ui.DismissAllTaskViewsEvent; -import com.android.systemui.recents.events.activity.MultiWindowStateChangedEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndCancelledEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; -import com.android.systemui.recents.utilities.AnimationProps; - -/** Manages the scrims for the various system bars. */ -public class SystemBarScrimViews { - - private static final int DEFAULT_ANIMATION_DURATION = 150; - - private Context mContext; - - private View mNavBarScrimView; - - private boolean mHasNavBarScrim; - private boolean mShouldAnimateNavBarScrim; - private boolean mHasTransposedNavBar; - private boolean mHasDockedTasks; - private int mNavBarScrimEnterDuration; - - public SystemBarScrimViews(RecentsActivity activity) { - mContext = activity; - mNavBarScrimView = activity.findViewById(R.id.nav_bar_scrim); - mNavBarScrimView.forceHasOverlappingRendering(false); - mNavBarScrimEnterDuration = activity.getResources().getInteger( - R.integer.recents_nav_bar_scrim_enter_duration); - mHasNavBarScrim = LegacyRecentsImpl.getSystemServices().hasTransposedNavigationBar(); - mHasDockedTasks = LegacyRecentsImpl.getSystemServices().hasDockedTask(); - } - - /** - * Updates the nav bar scrim. - */ - public void updateNavBarScrim(boolean animateNavBarScrim, boolean hasStackTasks, - AnimationProps animation) { - prepareEnterRecentsAnimation(isNavBarScrimRequired(hasStackTasks), animateNavBarScrim); - if (animateNavBarScrim && animation != null) { - animateNavBarScrimVisibility(true, animation); - } - } - - /** - * Prepares the scrim views for animating when entering Recents. This will be called before - * the first draw, unless we are updating the scrim on configuration change. - */ - private void prepareEnterRecentsAnimation(boolean hasNavBarScrim, boolean animateNavBarScrim) { - mHasNavBarScrim = hasNavBarScrim; - mShouldAnimateNavBarScrim = animateNavBarScrim; - - mNavBarScrimView.setVisibility(mHasNavBarScrim && !mShouldAnimateNavBarScrim ? - View.VISIBLE : View.INVISIBLE); - } - - /** - * Animates the nav bar scrim visibility. - */ - private void animateNavBarScrimVisibility(boolean visible, AnimationProps animation) { - int toY = 0; - if (visible) { - mNavBarScrimView.setVisibility(View.VISIBLE); - mNavBarScrimView.setTranslationY(mNavBarScrimView.getMeasuredHeight()); - } else { - toY = mNavBarScrimView.getMeasuredHeight(); - } - if (animation != AnimationProps.IMMEDIATE) { - mNavBarScrimView.animate() - .translationY(toY) - .setDuration(animation.getDuration(AnimationProps.BOUNDS)) - .setInterpolator(animation.getInterpolator(AnimationProps.BOUNDS)) - .start(); - } else { - mNavBarScrimView.setTranslationY(toY); - } - } - - /** - * @return Whether to show the nav bar scrim. - */ - private boolean isNavBarScrimRequired(boolean hasStackTasks) { - return hasStackTasks && !mHasTransposedNavBar && !mHasDockedTasks; - } - - /**** EventBus events ****/ - - /** - * Starts animating the scrim views when entering Recents. - */ - public final void onBusEvent(EnterRecentsWindowAnimationCompletedEvent event) { - if (mHasNavBarScrim) { - AnimationProps animation = mShouldAnimateNavBarScrim - ? new AnimationProps() - .setDuration(AnimationProps.BOUNDS, mNavBarScrimEnterDuration) - .setInterpolator(AnimationProps.BOUNDS, Interpolators.DECELERATE_QUINT) - : AnimationProps.IMMEDIATE; - animateNavBarScrimVisibility(true, animation); - } - } - - /** - * Starts animating the scrim views when leaving Recents (either via launching a task, or - * going home). - */ - public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) { - if (mHasNavBarScrim) { - AnimationProps animation = createBoundsAnimation( - TaskStackAnimationHelper.EXIT_TO_HOME_TRANSLATION_DURATION); - animateNavBarScrimVisibility(false, animation); - } - } - - public final void onBusEvent(DismissAllTaskViewsEvent event) { - if (mHasNavBarScrim) { - AnimationProps animation = createBoundsAnimation( - TaskStackAnimationHelper.EXIT_TO_HOME_TRANSLATION_DURATION); - animateNavBarScrimVisibility(false, animation); - } - } - - public final void onBusEvent(ConfigurationChangedEvent event) { - if (event.fromDeviceOrientationChange) { - mHasNavBarScrim = LegacyRecentsImpl.getSystemServices().hasTransposedNavigationBar(); - } - animateScrimToCurrentNavBarState(event.hasStackTasks); - } - - public final void onBusEvent(MultiWindowStateChangedEvent event) { - mHasDockedTasks = event.inMultiWindow; - animateScrimToCurrentNavBarState(event.stack.getTaskCount() > 0); - } - - public final void onBusEvent(final DragEndEvent event) { - // Hide the nav bar scrims once we drop to a dock region - if (event.dropTarget instanceof DockState) { - animateScrimToCurrentNavBarState(false /* hasStackTasks */); - } - } - - public final void onBusEvent(final DragEndCancelledEvent event) { - // Restore the scrims to the normal state - animateScrimToCurrentNavBarState(event.stack.getTaskCount() > 0); - } - - /** - * Animates the scrim to match the state of the current nav bar. - */ - private void animateScrimToCurrentNavBarState(boolean hasStackTasks) { - boolean hasNavBarScrim = isNavBarScrimRequired(hasStackTasks); - if (mHasNavBarScrim != hasNavBarScrim) { - AnimationProps animation = hasNavBarScrim - ? createBoundsAnimation(DEFAULT_ANIMATION_DURATION) - : AnimationProps.IMMEDIATE; - animateNavBarScrimVisibility(hasNavBarScrim, animation); - } - mHasNavBarScrim = hasNavBarScrim; - } - - /** - * @return a default animation to aniamte the bounds of the scrim. - */ - private AnimationProps createBoundsAnimation(int duration) { - return new AnimationProps() - .setDuration(AnimationProps.BOUNDS, duration) - .setInterpolator(AnimationProps.BOUNDS, Interpolators.FAST_OUT_SLOW_IN); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java deleted file mode 100644 index 55749348b004..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java +++ /dev/null @@ -1,705 +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. - */ - -package com.android.systemui.recents.views; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.util.Log; -import android.view.animation.Interpolator; -import android.view.animation.PathInterpolator; - -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsActivityLaunchState; -import com.android.systemui.recents.RecentsConfiguration; -import com.android.systemui.recents.RecentsDebugFlags; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; -import com.android.systemui.recents.misc.ReferenceCountedTrigger; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.views.lowram.TaskStackLowRamLayoutAlgorithm; -import com.android.systemui.recents.utilities.AnimationProps; - -import java.util.ArrayList; -import java.util.List; - -/** - * A helper class to create task view animations for {@link TaskView}s in a {@link TaskStackView}, - * but not the contents of the {@link TaskView}s. - */ -public class TaskStackAnimationHelper { - - /** - * Callbacks from the helper to coordinate view-content animations with view animations. - */ - public interface Callbacks { - /** - * Callback to prepare for the start animation for the launch target {@link TaskView}. - */ - void onPrepareLaunchTargetForEnterAnimation(); - - /** - * Callback to start the animation for the launch target {@link TaskView}. - */ - void onStartLaunchTargetEnterAnimation(TaskViewTransform transform, int duration, - boolean screenPinningEnabled, ReferenceCountedTrigger postAnimationTrigger); - - /** - * Callback to start the animation for the launch target {@link TaskView} when it is - * launched from Recents. - */ - void onStartLaunchTargetLaunchAnimation(int duration, boolean screenPinningRequested, - ReferenceCountedTrigger postAnimationTrigger); - - /** - * Callback to start the animation for the front {@link TaskView} if there is no launch - * target. - */ - void onStartFrontTaskEnterAnimation(boolean screenPinningEnabled); - } - - private static final int DOUBLE_FRAME_OFFSET_MS = 33; - private static final int FRAME_OFFSET_MS = 16; - - private static final int ENTER_EXIT_NUM_ANIMATING_TASKS = 5; - - private static final int ENTER_FROM_HOME_ALPHA_DURATION = 100; - public static final int ENTER_FROM_HOME_TRANSLATION_DURATION = 300; - private static final Interpolator ENTER_FROM_HOME_ALPHA_INTERPOLATOR = Interpolators.LINEAR; - - public static final int EXIT_TO_HOME_TRANSLATION_DURATION = 200; - private static final Interpolator EXIT_TO_HOME_TRANSLATION_INTERPOLATOR = - new PathInterpolator(0.4f, 0, 0.6f, 1f); - - private static final int DISMISS_TASK_DURATION = 175; - private static final int DISMISS_ALL_TASKS_DURATION = 200; - private static final Interpolator DISMISS_ALL_TRANSLATION_INTERPOLATOR = - new PathInterpolator(0.4f, 0, 1f, 1f); - - private static final Interpolator FOCUS_NEXT_TASK_INTERPOLATOR = - new PathInterpolator(0.4f, 0, 0, 1f); - private static final Interpolator FOCUS_IN_FRONT_NEXT_TASK_INTERPOLATOR = - new PathInterpolator(0, 0, 0, 1f); - private static final Interpolator FOCUS_BEHIND_NEXT_TASK_INTERPOLATOR = - Interpolators.LINEAR_OUT_SLOW_IN; - - private static final Interpolator ENTER_WHILE_DOCKING_INTERPOLATOR = - Interpolators.LINEAR_OUT_SLOW_IN; - - private final int mEnterAndExitFromHomeTranslationOffset; - private TaskStackView mStackView; - - private TaskViewTransform mTmpTransform = new TaskViewTransform(); - private ArrayList<TaskViewTransform> mTmpCurrentTaskTransforms = new ArrayList<>(); - private ArrayList<TaskViewTransform> mTmpFinalTaskTransforms = new ArrayList<>(); - - public TaskStackAnimationHelper(Context context, TaskStackView stackView) { - mStackView = stackView; - mEnterAndExitFromHomeTranslationOffset = LegacyRecentsImpl.getConfiguration().isGridEnabled - ? 0 : DOUBLE_FRAME_OFFSET_MS; - } - - /** - * Prepares the stack views and puts them in their initial animation state while visible, before - * the in-app enter animations start (after the window-transition completes). - */ - public void prepareForEnterAnimation() { - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - Resources res = mStackView.getResources(); - Resources appResources = mStackView.getContext().getApplicationContext().getResources(); - - TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); - TaskStackViewScroller stackScroller = mStackView.getScroller(); - TaskStack stack = mStackView.getStack(); - Task launchTargetTask = stack.getLaunchTarget(); - - // Break early if there are no tasks - if (stack.getTaskCount() == 0) { - return; - } - - int offscreenYOffset = stackLayout.mStackRect.height(); - int taskViewAffiliateGroupEnterOffset = res.getDimensionPixelSize( - R.dimen.recents_task_stack_animation_affiliate_enter_offset); - int launchedWhileDockingOffset = res.getDimensionPixelSize( - R.dimen.recents_task_stack_animation_launched_while_docking_offset); - boolean isLandscape = appResources.getConfiguration().orientation - == Configuration.ORIENTATION_LANDSCAPE; - - float top = 0; - final boolean isLowRamDevice = LegacyRecentsImpl.getConfiguration().isLowRamDevice; - if (isLowRamDevice && launchState.launchedFromApp && !launchState.launchedViaDockGesture) { - stackLayout.getStackTransform(launchTargetTask, stackScroller.getStackScroll(), - mTmpTransform, null /* frontTransform */); - top = mTmpTransform.rect.top; - } - - // Prepare each of the task views for their enter animation from front to back - List<TaskView> taskViews = mStackView.getTaskViews(); - for (int i = taskViews.size() - 1; i >= 0; i--) { - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - // Get the current transform for the task, which will be used to position it offscreen - stackLayout.getStackTransform(task, stackScroller.getStackScroll(), mTmpTransform, - null); - - if (launchState.launchedFromApp && !launchState.launchedViaDockGesture) { - if (task.isLaunchTarget) { - tv.onPrepareLaunchTargetForEnterAnimation(); - } else if (isLowRamDevice && i >= taskViews.size() - - (TaskStackLowRamLayoutAlgorithm.MAX_LAYOUT_TASK_COUNT + 1) - && !RecentsDebugFlags.Static.DisableRecentsLowRamEnterExitAnimation) { - // Move the last 2nd and 3rd last tasks in-app animation to match the motion of - // the last task's app transition - stackLayout.getStackTransform(task, stackScroller.getStackScroll(), - mTmpTransform, null); - mTmpTransform.rect.offset(0, -top); - mTmpTransform.alpha = 0f; - mStackView.updateTaskViewToTransform(tv, mTmpTransform, - AnimationProps.IMMEDIATE); - stackLayout.getStackTransform(task, stackScroller.getStackScroll(), - mTmpTransform, null); - mTmpTransform.alpha = 1f; - // Duration see {@link - // com.android.server.wm.AppTransition#DEFAULT_APP_TRANSITION_DURATION} - mStackView.updateTaskViewToTransform(tv, mTmpTransform, - new AnimationProps(336, Interpolators.FAST_OUT_SLOW_IN)); - } - } else if (launchState.launchedFromHome) { - if (isLowRamDevice) { - mTmpTransform.rect.offset(0, stackLayout.getTaskRect().height() / 4); - } else { - // Move the task view off screen (below) so we can animate it in - mTmpTransform.rect.offset(0, offscreenYOffset); - } - mTmpTransform.alpha = 0f; - mStackView.updateTaskViewToTransform(tv, mTmpTransform, AnimationProps.IMMEDIATE); - } else if (launchState.launchedViaDockGesture) { - int offset = isLandscape - ? launchedWhileDockingOffset - : (int) (offscreenYOffset * 0.9f); - mTmpTransform.rect.offset(0, offset); - mTmpTransform.alpha = 0f; - mStackView.updateTaskViewToTransform(tv, mTmpTransform, AnimationProps.IMMEDIATE); - } - } - } - - /** - * Starts the in-app enter animation, which animates the {@link TaskView}s to their final places - * depending on how Recents was triggered. - */ - public void startEnterAnimation(final ReferenceCountedTrigger postAnimationTrigger) { - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - Resources res = mStackView.getResources(); - Resources appRes = mStackView.getContext().getApplicationContext().getResources(); - - TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); - TaskStackViewScroller stackScroller = mStackView.getScroller(); - TaskStack stack = mStackView.getStack(); - Task launchTargetTask = stack.getLaunchTarget(); - - // Break early if there are no tasks - if (stack.getTaskCount() == 0) { - return; - } - - final boolean isLowRamDevice = LegacyRecentsImpl.getConfiguration().isLowRamDevice; - int taskViewEnterFromAppDuration = res.getInteger( - R.integer.recents_task_enter_from_app_duration); - int taskViewEnterFromAffiliatedAppDuration = res.getInteger( - R.integer.recents_task_enter_from_affiliated_app_duration); - int dockGestureAnimDuration = appRes.getInteger( - R.integer.long_press_dock_anim_duration); - - // Since low ram devices have an animation when entering app -> recents, do not allow - // toggle until the animation is complete - if (launchState.launchedFromApp && !launchState.launchedViaDockGesture && isLowRamDevice) { - postAnimationTrigger.addLastDecrementRunnable(() -> EventBus.getDefault() - .send(new SetWaitingForTransitionStartEvent(false))); - } - - // Create enter animations for each of the views from front to back - List<TaskView> taskViews = mStackView.getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = taskViewCount - 1; i >= 0; i--) { - int taskIndexFromFront = taskViewCount - i - 1; - int taskIndexFromBack = i; - final TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - // Get the current transform for the task, which will be updated to the final transform - // to animate to depending on how recents was invoked - stackLayout.getStackTransform(task, stackScroller.getStackScroll(), mTmpTransform, - null); - - if (launchState.launchedFromApp && !launchState.launchedViaDockGesture) { - if (task.isLaunchTarget) { - tv.onStartLaunchTargetEnterAnimation(mTmpTransform, - taskViewEnterFromAppDuration, mStackView.mScreenPinningEnabled, - postAnimationTrigger); - } - - } else if (launchState.launchedFromHome) { - // Animate the tasks up, but offset the animations to be relative to the front-most - // task animation - final float startOffsetFraction = (float) (Math.min(ENTER_EXIT_NUM_ANIMATING_TASKS, - taskIndexFromFront) * mEnterAndExitFromHomeTranslationOffset) / - ENTER_FROM_HOME_TRANSLATION_DURATION; - AnimationProps taskAnimation = new AnimationProps() - .setInterpolator(AnimationProps.ALPHA, ENTER_FROM_HOME_ALPHA_INTERPOLATOR) - .setListener(postAnimationTrigger.decrementOnAnimationEnd()); - if (isLowRamDevice) { - taskAnimation.setInterpolator(AnimationProps.BOUNDS, - Interpolators.FAST_OUT_SLOW_IN) - .setDuration(AnimationProps.BOUNDS, 150) - .setDuration(AnimationProps.ALPHA, 150); - } else { - taskAnimation.setStartDelay(AnimationProps.ALPHA, - Math.min(ENTER_EXIT_NUM_ANIMATING_TASKS, taskIndexFromFront) * - FRAME_OFFSET_MS) - .setInterpolator(AnimationProps.BOUNDS, - new RecentsEntrancePathInterpolator(0f, 0f, 0.2f, 1f, - startOffsetFraction)) - .setDuration(AnimationProps.BOUNDS, ENTER_FROM_HOME_TRANSLATION_DURATION) - .setDuration(AnimationProps.ALPHA, ENTER_FROM_HOME_ALPHA_DURATION); - } - postAnimationTrigger.increment(); - mStackView.updateTaskViewToTransform(tv, mTmpTransform, taskAnimation); - if (i == taskViewCount - 1) { - tv.onStartFrontTaskEnterAnimation(mStackView.mScreenPinningEnabled); - } - } else if (launchState.launchedViaDockGesture) { - // Animate the tasks up - add some delay to match the divider animation - AnimationProps taskAnimation = new AnimationProps() - .setDuration(AnimationProps.BOUNDS, dockGestureAnimDuration + - (taskIndexFromBack * DOUBLE_FRAME_OFFSET_MS)) - .setInterpolator(AnimationProps.BOUNDS, - ENTER_WHILE_DOCKING_INTERPOLATOR) - .setStartDelay(AnimationProps.BOUNDS, 48) - .setListener(postAnimationTrigger.decrementOnAnimationEnd()); - postAnimationTrigger.increment(); - mStackView.updateTaskViewToTransform(tv, mTmpTransform, taskAnimation); - } - } - } - - /** - * Starts an in-app animation to hide all the task views so that we can transition back home. - */ - public void startExitToHomeAnimation(boolean animated, - ReferenceCountedTrigger postAnimationTrigger) { - TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); - TaskStack stack = mStackView.getStack(); - - // Break early if there are no tasks - if (stack.getTaskCount() == 0) { - return; - } - - int offscreenYOffset = stackLayout.mStackRect.height(); - - // Create the animations for each of the tasks - List<TaskView> taskViews = mStackView.getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - int taskIndexFromFront = taskViewCount - i - 1; - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - if (mStackView.isIgnoredTask(task)) { - continue; - } - - // Animate the tasks down - AnimationProps taskAnimation; - if (animated) { - int delay = Math.min(ENTER_EXIT_NUM_ANIMATING_TASKS , taskIndexFromFront) * - mEnterAndExitFromHomeTranslationOffset; - taskAnimation = new AnimationProps() - .setDuration(AnimationProps.BOUNDS, EXIT_TO_HOME_TRANSLATION_DURATION) - .setListener(postAnimationTrigger.decrementOnAnimationEnd()); - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - taskAnimation.setInterpolator(AnimationProps.BOUNDS, - Interpolators.FAST_OUT_SLOW_IN); - } else { - taskAnimation.setStartDelay(AnimationProps.BOUNDS, delay) - .setInterpolator(AnimationProps.BOUNDS, - EXIT_TO_HOME_TRANSLATION_INTERPOLATOR); - } - postAnimationTrigger.increment(); - } else { - taskAnimation = AnimationProps.IMMEDIATE; - } - - mTmpTransform.fillIn(tv); - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - taskAnimation.setInterpolator(AnimationProps.ALPHA, - EXIT_TO_HOME_TRANSLATION_INTERPOLATOR) - .setDuration(AnimationProps.ALPHA, EXIT_TO_HOME_TRANSLATION_DURATION); - mTmpTransform.rect.offset(0, stackLayout.mTaskStackLowRamLayoutAlgorithm - .getTaskRect().height() / 4); - mTmpTransform.alpha = 0f; - } else { - mTmpTransform.rect.offset(0, offscreenYOffset); - } - mStackView.updateTaskViewToTransform(tv, mTmpTransform, taskAnimation); - } - } - - /** - * Starts the animation for the launching task view, hiding any tasks that might occlude the - * window transition for the launching task. - */ - public void startLaunchTaskAnimation(TaskView launchingTaskView, boolean screenPinningRequested, - final ReferenceCountedTrigger postAnimationTrigger) { - Resources res = mStackView.getResources(); - - int taskViewExitToAppDuration = res.getInteger( - R.integer.recents_task_exit_to_app_duration); - int taskViewAffiliateGroupEnterOffset = res.getDimensionPixelSize( - R.dimen.recents_task_stack_animation_affiliate_enter_offset); - - Task launchingTask = launchingTaskView.getTask(); - List<TaskView> taskViews = mStackView.getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - if (tv == launchingTaskView) { - tv.setClipViewInStack(false); - postAnimationTrigger.addLastDecrementRunnable(new Runnable() { - @Override - public void run() { - tv.setClipViewInStack(true); - } - }); - tv.onStartLaunchTargetLaunchAnimation(taskViewExitToAppDuration, - screenPinningRequested, postAnimationTrigger); - } - } - } - - /** - * Starts the delete animation for the specified {@link TaskView}. - */ - public void startDeleteTaskAnimation(final TaskView deleteTaskView, boolean gridLayout, - final ReferenceCountedTrigger postAnimationTrigger) { - if (gridLayout) { - startTaskGridDeleteTaskAnimation(deleteTaskView, postAnimationTrigger); - } else { - startTaskStackDeleteTaskAnimation(deleteTaskView, postAnimationTrigger); - } - } - - /** - * Starts the delete animation for all the {@link TaskView}s. - */ - public void startDeleteAllTasksAnimation(final List<TaskView> taskViews, boolean gridLayout, - final ReferenceCountedTrigger postAnimationTrigger) { - if (gridLayout) { - for (int i = 0; i < taskViews.size(); i++) { - startTaskGridDeleteTaskAnimation(taskViews.get(i), postAnimationTrigger); - } - } else { - startTaskStackDeleteAllTasksAnimation(taskViews, postAnimationTrigger); - } - } - - /** - * Starts the animation to focus the next {@link TaskView} when paging through recents. - * - * @return whether or not this will trigger a scroll in the stack - */ - public boolean startScrollToFocusedTaskAnimation(Task newFocusedTask, - boolean requestViewFocus) { - TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); - TaskStackViewScroller stackScroller = mStackView.getScroller(); - TaskStack stack = mStackView.getStack(); - - final float curScroll = stackScroller.getStackScroll(); - final float newScroll = stackScroller.getBoundedStackScroll( - stackLayout.getStackScrollForTask(newFocusedTask)); - boolean willScrollToFront = newScroll > curScroll; - boolean willScroll = Float.compare(newScroll, curScroll) != 0; - - // Get the current set of task transforms - int taskViewCount = mStackView.getTaskViews().size(); - ArrayList<Task> stackTasks = stack.getTasks(); - mStackView.getCurrentTaskTransforms(stackTasks, mTmpCurrentTaskTransforms); - - // Pick up the newly visible views after the scroll - mStackView.bindVisibleTaskViews(newScroll); - - // Update the internal state - stackLayout.setFocusState(TaskStackLayoutAlgorithm.STATE_FOCUSED); - stackScroller.setStackScroll(newScroll, null /* animation */); - mStackView.cancelDeferredTaskViewLayoutAnimation(); - - // Get the final set of task transforms - mStackView.getLayoutTaskTransforms(newScroll, stackLayout.getFocusState(), stackTasks, - true /* ignoreTaskOverrides */, mTmpFinalTaskTransforms); - - // Focus the task view - TaskView newFocusedTaskView = mStackView.getChildViewForTask(newFocusedTask); - if (newFocusedTaskView == null) { - // Log the error if we have no task view, and skip the animation - Log.e("TaskStackAnimationHelper", "b/27389156 null-task-view prebind:" + taskViewCount + - " postbind:" + mStackView.getTaskViews().size() + " prescroll:" + curScroll + - " postscroll: " + newScroll); - return false; - } - newFocusedTaskView.setFocusedState(true, requestViewFocus); - - // Setup the end listener to return all the hidden views to the view pool after the - // focus animation - ReferenceCountedTrigger postAnimTrigger = new ReferenceCountedTrigger(); - postAnimTrigger.addLastDecrementRunnable(new Runnable() { - @Override - public void run() { - mStackView.bindVisibleTaskViews(newScroll); - } - }); - - List<TaskView> taskViews = mStackView.getTaskViews(); - taskViewCount = taskViews.size(); - int newFocusTaskViewIndex = taskViews.indexOf(newFocusedTaskView); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - if (mStackView.isIgnoredTask(task)) { - continue; - } - - int taskIndex = stackTasks.indexOf(task); - TaskViewTransform fromTransform = mTmpCurrentTaskTransforms.get(taskIndex); - TaskViewTransform toTransform = mTmpFinalTaskTransforms.get(taskIndex); - - // Update the task to the initial state (for the newly picked up tasks) - mStackView.updateTaskViewToTransform(tv, fromTransform, AnimationProps.IMMEDIATE); - - int duration; - Interpolator interpolator; - if (willScrollToFront) { - duration = calculateStaggeredAnimDuration(i); - interpolator = FOCUS_BEHIND_NEXT_TASK_INTERPOLATOR; - } else { - if (i < newFocusTaskViewIndex) { - duration = 150 + ((newFocusTaskViewIndex - i - 1) * 50); - interpolator = FOCUS_BEHIND_NEXT_TASK_INTERPOLATOR; - } else if (i > newFocusTaskViewIndex) { - duration = Math.max(100, 150 - ((i - newFocusTaskViewIndex - 1) * 50)); - interpolator = FOCUS_IN_FRONT_NEXT_TASK_INTERPOLATOR; - } else { - duration = 200; - interpolator = FOCUS_NEXT_TASK_INTERPOLATOR; - } - } - - AnimationProps anim = new AnimationProps() - .setDuration(AnimationProps.BOUNDS, duration) - .setInterpolator(AnimationProps.BOUNDS, interpolator) - .setListener(postAnimTrigger.decrementOnAnimationEnd()); - postAnimTrigger.increment(); - mStackView.updateTaskViewToTransform(tv, toTransform, anim); - } - return willScroll; - } - - /** - * Starts the animation to go to the initial stack layout with a task focused. In addition, the - * previous task will be animated in after the scroll completes. - */ - public void startNewStackScrollAnimation(TaskStack newStack, - ReferenceCountedTrigger animationTrigger) { - TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); - TaskStackViewScroller stackScroller = mStackView.getScroller(); - - // Get the current set of task transforms - ArrayList<Task> stackTasks = newStack.getTasks(); - mStackView.getCurrentTaskTransforms(stackTasks, mTmpCurrentTaskTransforms); - - // Update the stack - mStackView.setTasks(newStack, false /* allowNotifyStackChanges */); - mStackView.updateLayoutAlgorithm(false /* boundScroll */); - - // Pick up the newly visible views after the scroll - final float newScroll = stackLayout.mInitialScrollP; - mStackView.bindVisibleTaskViews(newScroll); - - // Update the internal state - stackLayout.setFocusState(TaskStackLayoutAlgorithm.STATE_UNFOCUSED); - stackLayout.setTaskOverridesForInitialState(newStack, true /* ignoreScrollToFront */); - stackScroller.setStackScroll(newScroll); - mStackView.cancelDeferredTaskViewLayoutAnimation(); - - // Get the final set of task transforms - mStackView.getLayoutTaskTransforms(newScroll, stackLayout.getFocusState(), stackTasks, - false /* ignoreTaskOverrides */, mTmpFinalTaskTransforms); - - // Hide the front most task view until the scroll is complete - Task frontMostTask = newStack.getFrontMostTask(); - final TaskView frontMostTaskView = mStackView.getChildViewForTask(frontMostTask); - final TaskViewTransform frontMostTransform = mTmpFinalTaskTransforms.get( - stackTasks.indexOf(frontMostTask)); - if (frontMostTaskView != null) { - mStackView.updateTaskViewToTransform(frontMostTaskView, - stackLayout.getFrontOfStackTransform(), AnimationProps.IMMEDIATE); - } - - // Setup the end listener to return all the hidden views to the view pool after the - // focus animation - animationTrigger.addLastDecrementRunnable(new Runnable() { - @Override - public void run() { - mStackView.bindVisibleTaskViews(newScroll); - - // Now, animate in the front-most task - if (frontMostTaskView != null) { - mStackView.updateTaskViewToTransform(frontMostTaskView, frontMostTransform, - new AnimationProps(75, 250, FOCUS_BEHIND_NEXT_TASK_INTERPOLATOR)); - } - } - }); - - List<TaskView> taskViews = mStackView.getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - if (mStackView.isIgnoredTask(task)) { - continue; - } - if (task == frontMostTask && frontMostTaskView != null) { - continue; - } - - int taskIndex = stackTasks.indexOf(task); - TaskViewTransform fromTransform = mTmpCurrentTaskTransforms.get(taskIndex); - TaskViewTransform toTransform = mTmpFinalTaskTransforms.get(taskIndex); - - // Update the task to the initial state (for the newly picked up tasks) - mStackView.updateTaskViewToTransform(tv, fromTransform, AnimationProps.IMMEDIATE); - - int duration = calculateStaggeredAnimDuration(i); - Interpolator interpolator = FOCUS_BEHIND_NEXT_TASK_INTERPOLATOR; - - AnimationProps anim = new AnimationProps() - .setDuration(AnimationProps.BOUNDS, duration) - .setInterpolator(AnimationProps.BOUNDS, interpolator) - .setListener(animationTrigger.decrementOnAnimationEnd()); - animationTrigger.increment(); - mStackView.updateTaskViewToTransform(tv, toTransform, anim); - } - } - - /** - * Caclulates a staggered duration for {@link #startScrollToFocusedTaskAnimation} and - * {@link #startNewStackScrollAnimation}. - */ - private int calculateStaggeredAnimDuration(int i) { - return Math.max(100, 100 + ((i - 1) * 50)); - } - - private void startTaskGridDeleteTaskAnimation(final TaskView deleteTaskView, - final ReferenceCountedTrigger postAnimationTrigger) { - postAnimationTrigger.increment(); - postAnimationTrigger.addLastDecrementRunnable(() -> { - mStackView.getTouchHandler().onChildDismissed(deleteTaskView); - }); - deleteTaskView.animate().setDuration(300).scaleX(0.9f).scaleY(0.9f).alpha(0).setListener( - new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - postAnimationTrigger.decrement(); - }}).start(); - } - - private void startTaskStackDeleteTaskAnimation(final TaskView deleteTaskView, - final ReferenceCountedTrigger postAnimationTrigger) { - TaskStackViewTouchHandler touchHandler = mStackView.getTouchHandler(); - touchHandler.onBeginManualDrag(deleteTaskView); - - postAnimationTrigger.increment(); - postAnimationTrigger.addLastDecrementRunnable(() -> { - touchHandler.onChildDismissed(deleteTaskView); - }); - - final float dismissSize = touchHandler.getScaledDismissSize(); - ValueAnimator animator = ValueAnimator.ofFloat(0f, 1f); - animator.setDuration(400); - animator.addUpdateListener((animation) -> { - float progress = (Float) animation.getAnimatedValue(); - deleteTaskView.setTranslationX(progress * dismissSize); - touchHandler.updateSwipeProgress(deleteTaskView, true, progress); - }); - animator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - postAnimationTrigger.decrement(); - } - }); - animator.start(); - } - - private void startTaskStackDeleteAllTasksAnimation(final List<TaskView> taskViews, - final ReferenceCountedTrigger postAnimationTrigger) { - TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); - - int offscreenXOffset = mStackView.getMeasuredWidth() - stackLayout.getTaskRect().left; - - int taskViewCount = taskViews.size(); - for (int i = taskViewCount - 1; i >= 0; i--) { - TaskView tv = taskViews.get(i); - int taskIndexFromFront = taskViewCount - i - 1; - int startDelay = taskIndexFromFront * DOUBLE_FRAME_OFFSET_MS; - - // Disabling clipping with the stack while the view is animating away - tv.setClipViewInStack(false); - - // Compose the new animation and transform and star the animation - AnimationProps taskAnimation = new AnimationProps(startDelay, - DISMISS_ALL_TASKS_DURATION, DISMISS_ALL_TRANSLATION_INTERPOLATOR, - new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - postAnimationTrigger.decrement(); - - // Re-enable clipping with the stack (we will reuse this view) - tv.setClipViewInStack(true); - } - }); - postAnimationTrigger.increment(); - - mTmpTransform.fillIn(tv); - mTmpTransform.rect.offset(offscreenXOffset, 0); - mStackView.updateTaskViewToTransform(tv, mTmpTransform, taskAnimation); - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java deleted file mode 100644 index 58a3f12c465d..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java +++ /dev/null @@ -1,1283 +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.systemui.recents.views; - -import android.annotation.IntDef; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Path; -import android.graphics.Rect; -import android.util.ArraySet; -import android.util.Log; -import android.util.SparseArray; -import android.util.SparseIntArray; -import android.view.ViewDebug; - -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsActivityLaunchState; -import com.android.systemui.recents.RecentsConfiguration; -import com.android.systemui.recents.RecentsDebugFlags; -import com.android.systemui.recents.misc.FreePathInterpolator; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.views.lowram.TaskStackLowRamLayoutAlgorithm; -import com.android.systemui.recents.views.grid.TaskGridLayoutAlgorithm; - -import java.io.PrintWriter; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.ArrayList; -import java.util.List; - -/** - * Used to describe a visible range that can be normalized to [0, 1]. - */ -class Range { - final float relativeMin; - final float relativeMax; - float origin; - float min; - float max; - - public Range(float relMin, float relMax) { - min = relativeMin = relMin; - max = relativeMax = relMax; - } - - /** - * Offsets this range to a given absolute position. - */ - public void offset(float x) { - this.origin = x; - min = x + relativeMin; - max = x + relativeMax; - } - - /** - * Returns x normalized to the range 0 to 1 such that 0 = min, 0.5 = origin and 1 = max - * - * @param x is an absolute value in the same domain as origin - */ - public float getNormalizedX(float x) { - if (x < origin) { - return 0.5f + 0.5f * (x - origin) / -relativeMin; - } else { - return 0.5f + 0.5f * (x - origin) / relativeMax; - } - } - - /** - * Given a normalized {@param x} value in this range, projected onto the full range to get an - * absolute value about the given {@param origin}. - */ - public float getAbsoluteX(float normX) { - if (normX < 0.5f) { - return (normX - 0.5f) / 0.5f * -relativeMin; - } else { - return (normX - 0.5f) / 0.5f * relativeMax; - } - } - - /** - * Returns whether a value at an absolute x would be within range. - */ - public boolean isInRange(float absX) { - return (absX >= Math.floor(min)) && (absX <= Math.ceil(max)); - } -} - -/** - * The layout logic for a TaskStackView. This layout needs to be able to calculate the stack layout - * without an activity-specific context only with the information passed in. This layout can have - * two states focused and unfocused, and in the focused state, there is a task that is displayed - * more prominently in the stack. - */ -public class TaskStackLayoutAlgorithm { - - private static final String TAG = "TaskStackLayoutAlgorithm"; - - // The distribution of view bounds alpha - // XXX: This is a hack because you can currently set the max alpha to be > 1f - public static final float OUTLINE_ALPHA_MIN_VALUE = 0f; - public static final float OUTLINE_ALPHA_MAX_VALUE = 2f; - - // The medium/maximum dim on the tasks - private static final float MED_DIM = 0.15f; - private static final float MAX_DIM = 0.25f; - - // The various focus states - public static final int STATE_FOCUSED = 1; - public static final int STATE_UNFOCUSED = 0; - - // The side that an offset is anchored - @Retention(RetentionPolicy.SOURCE) - @IntDef({FROM_TOP, FROM_BOTTOM}) - public @interface AnchorSide {} - private static final int FROM_TOP = 0; - private static final int FROM_BOTTOM = 1; - - // The extent that we care about when calculating fractions - @Retention(RetentionPolicy.SOURCE) - @IntDef({WIDTH, HEIGHT}) - public @interface Extent {} - private static final int WIDTH = 0; - private static final int HEIGHT = 1; - - public interface TaskStackLayoutAlgorithmCallbacks { - void onFocusStateChanged(int prevFocusState, int curFocusState); - } - - /** - * @return True if we should use the grid layout. - */ - boolean useGridLayout() { - return LegacyRecentsImpl.getConfiguration().isGridEnabled; - } - - // A report of the visibility state of the stack - public static class VisibilityReport { - public int numVisibleTasks; - public int numVisibleThumbnails; - - public VisibilityReport(int tasks, int thumbnails) { - numVisibleTasks = tasks; - numVisibleThumbnails = thumbnails; - } - } - - Context mContext; - private TaskStackLayoutAlgorithmCallbacks mCb; - - // The task bounds (untransformed) for layout. This rect is anchored at mTaskRoot. - @ViewDebug.ExportedProperty(category="recents") - public Rect mTaskRect = new Rect(); - // The stack bounds, inset from the top system insets, and runs to the bottom of the screen - @ViewDebug.ExportedProperty(category="recents") - public Rect mStackRect = new Rect(); - // This is the current system insets - @ViewDebug.ExportedProperty(category="recents") - public Rect mSystemInsets = new Rect(); - - // The visible ranges when the stack is focused and unfocused - private Range mUnfocusedRange; - private Range mFocusedRange; - - // This is the bounds of the stack action above the stack rect - @ViewDebug.ExportedProperty(category="recents") - private Rect mStackActionButtonRect = new Rect(); - // The base top margin for the stack from the system insets - @ViewDebug.ExportedProperty(category="recents") - private int mBaseTopMargin; - // The base side margin for the stack from the system insets - @ViewDebug.ExportedProperty(category="recents") - private int mBaseSideMargin; - // The base bottom margin for the stack from the system insets - @ViewDebug.ExportedProperty(category="recents") - private int mBaseBottomMargin; - private int mMinMargin; - - // The initial offset that the focused task is from the top - @ViewDebug.ExportedProperty(category="recents") - private int mInitialTopOffset; - private int mBaseInitialTopOffset; - // The initial offset that the launch-from task is from the bottom - @ViewDebug.ExportedProperty(category="recents") - private int mInitialBottomOffset; - private int mBaseInitialBottomOffset; - - // The height between the top margin and the top of the focused task - @ViewDebug.ExportedProperty(category="recents") - private int mFocusedTopPeekHeight; - // The height between the bottom margin and the top of task in front of the focused task - @ViewDebug.ExportedProperty(category="recents") - private int mFocusedBottomPeekHeight; - - // The offset from the bottom of the stack to the bottom of the bounds when the stack is - // scrolled to the front - @ViewDebug.ExportedProperty(category="recents") - private int mStackBottomOffset; - - /** The height, in pixels, of each task view's title bar. */ - private int mTitleBarHeight; - - // The paths defining the motion of the tasks when the stack is focused and unfocused - private Path mUnfocusedCurve; - private Path mFocusedCurve; - private FreePathInterpolator mUnfocusedCurveInterpolator; - private FreePathInterpolator mFocusedCurveInterpolator; - - // The paths defining the distribution of the dim to apply to tasks in the stack when focused - // and unfocused - private Path mUnfocusedDimCurve; - private Path mFocusedDimCurve; - private FreePathInterpolator mUnfocusedDimCurveInterpolator; - private FreePathInterpolator mFocusedDimCurveInterpolator; - - // The state of the stack focus (0..1), which controls the transition of the stack from the - // focused to non-focused state - @ViewDebug.ExportedProperty(category="recents") - private int mFocusState; - - // The smallest scroll progress, at this value, the back most task will be visible - @ViewDebug.ExportedProperty(category="recents") - float mMinScrollP; - // The largest scroll progress, at this value, the front most task will be visible above the - // navigation bar - @ViewDebug.ExportedProperty(category="recents") - float mMaxScrollP; - // The initial progress that the scroller is set when you first enter recents - @ViewDebug.ExportedProperty(category="recents") - float mInitialScrollP; - // The task progress for the front-most task in the stack - @ViewDebug.ExportedProperty(category="recents") - float mFrontMostTaskP; - - // The last computed task counts - @ViewDebug.ExportedProperty(category="recents") - int mNumStackTasks; - - // The min/max z translations - @ViewDebug.ExportedProperty(category="recents") - int mMinTranslationZ; - @ViewDebug.ExportedProperty(category="recents") - public int mMaxTranslationZ; - - // Optimization, allows for quick lookup of task -> index - private SparseIntArray mTaskIndexMap = new SparseIntArray(); - private SparseArray<Float> mTaskIndexOverrideMap = new SparseArray<>(); - - TaskGridLayoutAlgorithm mTaskGridLayoutAlgorithm; - TaskStackLowRamLayoutAlgorithm mTaskStackLowRamLayoutAlgorithm; - - // The transform to place TaskViews at the front and back of the stack respectively - TaskViewTransform mBackOfStackTransform = new TaskViewTransform(); - TaskViewTransform mFrontOfStackTransform = new TaskViewTransform(); - - public TaskStackLayoutAlgorithm(Context context, TaskStackLayoutAlgorithmCallbacks cb) { - mContext = context; - mCb = cb; - mTaskGridLayoutAlgorithm = new TaskGridLayoutAlgorithm(context); - mTaskStackLowRamLayoutAlgorithm = new TaskStackLowRamLayoutAlgorithm(context); - reloadOnConfigurationChange(context); - } - - /** - * Reloads the layout for the current configuration. - */ - public void reloadOnConfigurationChange(Context context) { - Resources res = context.getResources(); - mFocusedRange = new Range(res.getFloat(R.integer.recents_layout_focused_range_min), - res.getFloat(R.integer.recents_layout_focused_range_max)); - mUnfocusedRange = new Range(res.getFloat(R.integer.recents_layout_unfocused_range_min), - res.getFloat(R.integer.recents_layout_unfocused_range_max)); - mFocusState = getInitialFocusState(); - mFocusedTopPeekHeight = res.getDimensionPixelSize(R.dimen.recents_layout_top_peek_size); - mFocusedBottomPeekHeight = - res.getDimensionPixelSize(R.dimen.recents_layout_bottom_peek_size); - mMinTranslationZ = res.getDimensionPixelSize(R.dimen.recents_layout_z_min); - mMaxTranslationZ = res.getDimensionPixelSize(R.dimen.recents_layout_z_max); - mBaseInitialTopOffset = getDimensionForDevice(context, - R.dimen.recents_layout_initial_top_offset_phone_port, - R.dimen.recents_layout_initial_top_offset_phone_land, - R.dimen.recents_layout_initial_top_offset_tablet, - R.dimen.recents_layout_initial_top_offset_tablet, - R.dimen.recents_layout_initial_top_offset_tablet, - R.dimen.recents_layout_initial_top_offset_tablet, - R.dimen.recents_layout_initial_top_offset_tablet); - mBaseInitialBottomOffset = getDimensionForDevice(context, - R.dimen.recents_layout_initial_bottom_offset_phone_port, - R.dimen.recents_layout_initial_bottom_offset_phone_land, - R.dimen.recents_layout_initial_bottom_offset_tablet, - R.dimen.recents_layout_initial_bottom_offset_tablet, - R.dimen.recents_layout_initial_bottom_offset_tablet, - R.dimen.recents_layout_initial_bottom_offset_tablet, - R.dimen.recents_layout_initial_bottom_offset_tablet); - mTaskGridLayoutAlgorithm.reloadOnConfigurationChange(context); - mTaskStackLowRamLayoutAlgorithm.reloadOnConfigurationChange(context); - mMinMargin = res.getDimensionPixelSize(R.dimen.recents_layout_min_margin); - mBaseTopMargin = getDimensionForDevice(context, - R.dimen.recents_layout_top_margin_phone, - R.dimen.recents_layout_top_margin_tablet, - R.dimen.recents_layout_top_margin_tablet_xlarge, - R.dimen.recents_layout_top_margin_tablet); - mBaseSideMargin = getDimensionForDevice(context, - R.dimen.recents_layout_side_margin_phone, - R.dimen.recents_layout_side_margin_tablet, - R.dimen.recents_layout_side_margin_tablet_xlarge, - R.dimen.recents_layout_side_margin_tablet); - mBaseBottomMargin = res.getDimensionPixelSize(R.dimen.recents_layout_bottom_margin); - mTitleBarHeight = getDimensionForDevice(mContext, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height_tablet_land, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height_tablet_land, - R.dimen.recents_grid_task_view_header_height); - } - - /** - * Resets this layout when the stack view is reset. - */ - public void reset() { - mTaskIndexOverrideMap.clear(); - setFocusState(getInitialFocusState()); - } - - /** - * Sets the system insets. - */ - public boolean setSystemInsets(Rect systemInsets) { - boolean changed = !mSystemInsets.equals(systemInsets); - mSystemInsets.set(systemInsets); - mTaskGridLayoutAlgorithm.setSystemInsets(systemInsets); - mTaskStackLowRamLayoutAlgorithm.setSystemInsets(systemInsets); - return changed; - } - - /** - * Sets the focused state. - */ - public void setFocusState(int focusState) { - int prevFocusState = mFocusState; - mFocusState = focusState; - updateFrontBackTransforms(); - if (mCb != null) { - mCb.onFocusStateChanged(prevFocusState, focusState); - } - } - - /** - * Gets the focused state. - */ - public int getFocusState() { - return mFocusState; - } - - /** - * Computes the stack and task rects. The given task stack bounds already has the top/right - * insets and left/right padding already applied. - */ - public void initialize(Rect displayRect, Rect windowRect, Rect taskStackBounds) { - Rect lastStackRect = new Rect(mStackRect); - - int topMargin = getScaleForExtent(windowRect, displayRect, mBaseTopMargin, mMinMargin, HEIGHT); - int bottomMargin = getScaleForExtent(windowRect, displayRect, mBaseBottomMargin, mMinMargin, - HEIGHT); - mInitialTopOffset = getScaleForExtent(windowRect, displayRect, mBaseInitialTopOffset, - mMinMargin, HEIGHT); - mInitialBottomOffset = mBaseInitialBottomOffset; - - // Compute the stack bounds - mStackBottomOffset = mSystemInsets.bottom + bottomMargin; - mStackRect.set(taskStackBounds); - mStackRect.top += topMargin; - - // The stack action button will take the full un-padded header space above the stack - mStackActionButtonRect.set(mStackRect.left, mStackRect.top - topMargin, - mStackRect.right, mStackRect.top + mFocusedTopPeekHeight); - - // Anchor the task rect top aligned to the stack rect - int height = mStackRect.height() - mInitialTopOffset - mStackBottomOffset; - mTaskRect.set(mStackRect.left, mStackRect.top, mStackRect.right, mStackRect.top + height); - - if (mTaskRect.width() <= 0 || mTaskRect.height() <= 0) { - // Logging for b/36654830 - Log.e(TAG, "Invalid task rect: taskRect=" + mTaskRect + " stackRect=" + mStackRect - + " displayRect=" + displayRect + " windowRect=" + windowRect - + " taskStackBounds=" + taskStackBounds); - } - - // Short circuit here if the stack rects haven't changed so we don't do all the work below - if (!lastStackRect.equals(mStackRect)) { - // Reinitialize the focused and unfocused curves - mUnfocusedCurve = constructUnfocusedCurve(); - mUnfocusedCurveInterpolator = new FreePathInterpolator(mUnfocusedCurve); - mFocusedCurve = constructFocusedCurve(); - mFocusedCurveInterpolator = new FreePathInterpolator(mFocusedCurve); - mUnfocusedDimCurve = constructUnfocusedDimCurve(); - mUnfocusedDimCurveInterpolator = new FreePathInterpolator(mUnfocusedDimCurve); - mFocusedDimCurve = constructFocusedDimCurve(); - mFocusedDimCurveInterpolator = new FreePathInterpolator(mFocusedDimCurve); - - updateFrontBackTransforms(); - } - - // Initialize the grid layout - mTaskGridLayoutAlgorithm.initialize(windowRect); - mTaskStackLowRamLayoutAlgorithm.initialize(windowRect); - } - - /** - * Computes the minimum and maximum scroll progress values and the progress values for each task - * in the stack. - */ - public void update(TaskStack stack, ArraySet<Task.TaskKey> ignoreTasksSet, - RecentsActivityLaunchState launchState, float lastScrollPPercent) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - - // Clear the progress map - mTaskIndexMap.clear(); - - // Return early if we have no tasks - ArrayList<Task> tasks = stack.getTasks(); - if (tasks.isEmpty()) { - mFrontMostTaskP = 0; - mMinScrollP = mMaxScrollP = mInitialScrollP = 0; - mNumStackTasks = 0; - return; - } - - // Filter the set of stack tasks - ArrayList<Task> stackTasks = new ArrayList<>(); - for (int i = 0; i < tasks.size(); i++) { - Task task = tasks.get(i); - if (ignoreTasksSet.contains(task.key)) { - continue; - } - stackTasks.add(task); - } - mNumStackTasks = stackTasks.size(); - - // Put each of the tasks in the progress map at a fixed index (does not need to actually - // map to a scroll position, just by index) - int taskCount = stackTasks.size(); - for (int i = 0; i < taskCount; i++) { - Task task = stackTasks.get(i); - mTaskIndexMap.put(task.key.id, i); - } - - // Calculate the min/max/initial scroll - Task launchTask = stack.getLaunchTarget(); - int launchTaskIndex = launchTask != null - ? stack.indexOfTask(launchTask) - : mNumStackTasks - 1; - if (getInitialFocusState() == STATE_FOCUSED) { - int maxBottomOffset = mStackBottomOffset + mTaskRect.height(); - float maxBottomNormX = getNormalizedXFromFocusedY(maxBottomOffset, FROM_BOTTOM); - mFocusedRange.offset(0f); - mMinScrollP = 0; - mMaxScrollP = Math.max(mMinScrollP, (mNumStackTasks - 1) - - Math.max(0, mFocusedRange.getAbsoluteX(maxBottomNormX))); - if (launchState.launchedFromHome || launchState.launchedFromPipApp - || launchState.launchedWithNextPipApp) { - mInitialScrollP = Utilities.clamp(launchTaskIndex, mMinScrollP, mMaxScrollP); - } else { - mInitialScrollP = Utilities.clamp(launchTaskIndex - 1, mMinScrollP, mMaxScrollP); - } - } else if (mNumStackTasks == 1) { - // If there is one stack task, ignore the min/max/initial scroll positions - mMinScrollP = 0; - mMaxScrollP = 0; - mInitialScrollP = 0; - } else { - // Set the max scroll to be the point where the front most task is visible with the - // stack bottom offset - int maxBottomOffset = mStackBottomOffset + mTaskRect.height(); - float maxBottomNormX = getNormalizedXFromUnfocusedY(maxBottomOffset, FROM_BOTTOM); - mUnfocusedRange.offset(0f); - mMinScrollP = LegacyRecentsImpl.getConfiguration().isLowRamDevice - ? mTaskStackLowRamLayoutAlgorithm.getMinScrollP() - : 0; - mMaxScrollP = LegacyRecentsImpl.getConfiguration().isLowRamDevice - ? mTaskStackLowRamLayoutAlgorithm.getMaxScrollP(taskCount) - : Math.max(mMinScrollP, (mNumStackTasks - 1) - - Math.max(0, mUnfocusedRange.getAbsoluteX(maxBottomNormX))); - boolean scrollToFront = launchState.launchedFromHome || launchState.launchedFromPipApp - || launchState.launchedWithNextPipApp || launchState.launchedViaDockGesture; - - if (launchState.launchedWithAltTab) { - mInitialScrollP = Utilities.clamp(launchTaskIndex, mMinScrollP, mMaxScrollP); - } else if (0 <= lastScrollPPercent && lastScrollPPercent <= 1) { - mInitialScrollP = Utilities.mapRange(lastScrollPPercent, mMinScrollP, mMaxScrollP); - } else if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - mInitialScrollP = mTaskStackLowRamLayoutAlgorithm.getInitialScrollP(mNumStackTasks, - scrollToFront); - } else if (scrollToFront) { - mInitialScrollP = Utilities.clamp(launchTaskIndex, mMinScrollP, mMaxScrollP); - } else { - // We are overriding the initial two task positions, so set the initial scroll - // position to match the second task (aka focused task) position - float initialTopNormX = getNormalizedXFromUnfocusedY(mInitialTopOffset, FROM_TOP); - mInitialScrollP = Math.max(mMinScrollP, Math.min(mMaxScrollP, (mNumStackTasks - 2)) - - Math.max(0, mUnfocusedRange.getAbsoluteX(initialTopNormX))); - } - } - } - - /** - * Creates task overrides to ensure the initial stack layout if necessary. - */ - public void setTaskOverridesForInitialState(TaskStack stack, boolean ignoreScrollToFront) { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - - mTaskIndexOverrideMap.clear(); - - boolean scrollToFront = launchState.launchedFromHome || - launchState.launchedFromPipApp || - launchState.launchedWithNextPipApp || - launchState.launchedViaDockGesture; - if (getInitialFocusState() == STATE_UNFOCUSED && mNumStackTasks > 1) { - if (ignoreScrollToFront || (!launchState.launchedWithAltTab && !scrollToFront)) { - // Set the initial scroll to the predefined state (which differs from the stack) - float [] initialNormX = null; - float minBottomTaskNormX = getNormalizedXFromUnfocusedY(mSystemInsets.bottom + - mInitialBottomOffset, FROM_BOTTOM); - float maxBottomTaskNormX = getNormalizedXFromUnfocusedY(mFocusedTopPeekHeight + - mTaskRect.height() - mMinMargin, FROM_TOP); - if (mNumStackTasks <= 2) { - // For small stacks, position the tasks so that they are top aligned to under - // the action button, but ensure that it is at least a certain offset from the - // bottom of the stack - initialNormX = new float[] { - Math.min(maxBottomTaskNormX, minBottomTaskNormX), - getNormalizedXFromUnfocusedY(mFocusedTopPeekHeight, FROM_TOP) - }; - } else { - initialNormX = new float[] { - minBottomTaskNormX, - getNormalizedXFromUnfocusedY(mInitialTopOffset, FROM_TOP) - }; - } - - mUnfocusedRange.offset(0f); - List<Task> tasks = stack.getTasks(); - int taskCount = tasks.size(); - for (int i = taskCount - 1; i >= 0; i--) { - int indexFromFront = taskCount - i - 1; - if (indexFromFront >= initialNormX.length) { - break; - } - float newTaskProgress = mInitialScrollP + - mUnfocusedRange.getAbsoluteX(initialNormX[indexFromFront]); - mTaskIndexOverrideMap.put(tasks.get(i).key.id, newTaskProgress); - } - } - } - } - - /** - * Adds and override task progress for the given task when transitioning from focused to - * unfocused state. - */ - public void addUnfocusedTaskOverride(Task task, float stackScroll) { - if (mFocusState != STATE_UNFOCUSED) { - mFocusedRange.offset(stackScroll); - mUnfocusedRange.offset(stackScroll); - float focusedRangeX = mFocusedRange.getNormalizedX(mTaskIndexMap.get(task.key.id)); - float focusedY = mFocusedCurveInterpolator.getInterpolation(focusedRangeX); - float unfocusedRangeX = mUnfocusedCurveInterpolator.getX(focusedY); - float unfocusedTaskProgress = stackScroll + mUnfocusedRange.getAbsoluteX(unfocusedRangeX); - if (Float.compare(focusedRangeX, unfocusedRangeX) != 0) { - mTaskIndexOverrideMap.put(task.key.id, unfocusedTaskProgress); - } - } - } - - /** - * Adds and override task progress for the given task when transitioning from focused to - * unfocused state. - */ - public void addUnfocusedTaskOverride(TaskView taskView, float stackScroll) { - mFocusedRange.offset(stackScroll); - mUnfocusedRange.offset(stackScroll); - - Task task = taskView.getTask(); - int top = taskView.getTop() - mTaskRect.top; - float focusedRangeX = getNormalizedXFromFocusedY(top, FROM_TOP); - float unfocusedRangeX = getNormalizedXFromUnfocusedY(top, FROM_TOP); - float unfocusedTaskProgress = stackScroll + mUnfocusedRange.getAbsoluteX(unfocusedRangeX); - if (Float.compare(focusedRangeX, unfocusedRangeX) != 0) { - mTaskIndexOverrideMap.put(task.key.id, unfocusedTaskProgress); - } - } - - public void clearUnfocusedTaskOverrides() { - mTaskIndexOverrideMap.clear(); - } - - /** - * Updates this stack when a scroll happens. - * - */ - public float updateFocusStateOnScroll(float lastTargetStackScroll, float targetStackScroll, - float lastStackScroll) { - if (targetStackScroll == lastStackScroll || LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - return targetStackScroll; - } - - float deltaScroll = targetStackScroll - lastStackScroll; - float deltaTargetScroll = targetStackScroll - lastTargetStackScroll; - float newScroll = targetStackScroll; - mUnfocusedRange.offset(targetStackScroll); - for (int i = mTaskIndexOverrideMap.size() - 1; i >= 0; i--) { - int taskId = mTaskIndexOverrideMap.keyAt(i); - float x = mTaskIndexMap.get(taskId); - float overrideX = mTaskIndexOverrideMap.get(taskId, 0f); - float newOverrideX = overrideX + deltaScroll; - if (isInvalidOverrideX(x, overrideX, newOverrideX)) { - // Remove the override once we reach the original task index - mTaskIndexOverrideMap.removeAt(i); - } else if ((overrideX >= x && deltaScroll <= 0f) || - (overrideX <= x && deltaScroll >= 0f)) { - // Scrolling from override x towards x, then lock the task in place - mTaskIndexOverrideMap.put(taskId, newOverrideX); - } else { - // Scrolling override x away from x, we should still move the scroll towards x - newScroll = lastStackScroll; - newOverrideX = overrideX - deltaTargetScroll; - if (isInvalidOverrideX(x, overrideX, newOverrideX)) { - mTaskIndexOverrideMap.removeAt(i); - } else{ - mTaskIndexOverrideMap.put(taskId, newOverrideX); - } - } - } - return newScroll; - } - - private boolean isInvalidOverrideX(float x, float overrideX, float newOverrideX) { - boolean outOfBounds = mUnfocusedRange.getNormalizedX(newOverrideX) < 0f || - mUnfocusedRange.getNormalizedX(newOverrideX) > 1f; - return outOfBounds || (overrideX >= x && x >= newOverrideX) || - (overrideX <= x && x <= newOverrideX); - } - - /** - * Returns the default focus state. - */ - public int getInitialFocusState() { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - RecentsDebugFlags debugFlags = LegacyRecentsImpl.getDebugFlags(); - if (launchState.launchedWithAltTab) { - return STATE_FOCUSED; - } else { - return STATE_UNFOCUSED; - } - } - - public Rect getStackActionButtonRect() { - return useGridLayout() - ? mTaskGridLayoutAlgorithm.getStackActionButtonRect() : mStackActionButtonRect; - } - - /** - * Returns the TaskViewTransform that would put the task just off the back of the stack. - */ - public TaskViewTransform getBackOfStackTransform() { - return mBackOfStackTransform; - } - - /** - * Returns the TaskViewTransform that would put the task just off the front of the stack. - */ - public TaskViewTransform getFrontOfStackTransform() { - return mFrontOfStackTransform; - } - - /** - * Returns whether this stack layout has been initialized. - */ - public boolean isInitialized() { - return !mStackRect.isEmpty(); - } - - /** - * Computes the maximum number of visible tasks and thumbnails when the scroll is at the initial - * stack scroll. Requires that update() is called first. - */ - public VisibilityReport computeStackVisibilityReport(ArrayList<Task> tasks) { - if (useGridLayout()) { - return mTaskGridLayoutAlgorithm.computeStackVisibilityReport(tasks); - } - - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - return mTaskStackLowRamLayoutAlgorithm.computeStackVisibilityReport(tasks); - } - - // Ensure minimum visibility count - if (tasks.size() <= 1) { - return new VisibilityReport(1, 1); - } - - // Otherwise, walk backwards in the stack and count the number of tasks and visible - // thumbnails and add that to the total task count - TaskViewTransform tmpTransform = new TaskViewTransform(); - Range currentRange = getInitialFocusState() > 0f ? mFocusedRange : mUnfocusedRange; - currentRange.offset(mInitialScrollP); - int taskBarHeight = mContext.getResources().getDimensionPixelSize( - R.dimen.recents_task_view_header_height); - int numVisibleTasks = 0; - int numVisibleThumbnails = 0; - float prevScreenY = Integer.MAX_VALUE; - for (int i = tasks.size() - 1; i >= 0; i--) { - Task task = tasks.get(i); - - // Skip invisible - float taskProgress = getStackScrollForTask(task); - if (!currentRange.isInRange(taskProgress)) { - continue; - } - - getStackTransform(taskProgress, taskProgress, mInitialScrollP, mFocusState, - tmpTransform, null, false /* ignoreSingleTaskCase */, false /* forceUpdate */); - float screenY = tmpTransform.rect.top; - boolean hasVisibleThumbnail = (prevScreenY - screenY) > taskBarHeight; - if (hasVisibleThumbnail) { - numVisibleThumbnails++; - numVisibleTasks++; - prevScreenY = screenY; - } else { - // Once we hit the next front most task that does not have a visible thumbnail, - // walk through remaining visible set - for (int j = i; j >= 0; j--) { - taskProgress = getStackScrollForTask(tasks.get(j)); - if (!currentRange.isInRange(taskProgress)) { - break; - } - numVisibleTasks++; - } - break; - } - } - return new VisibilityReport(numVisibleTasks, numVisibleThumbnails); - } - - /** - * Returns the transform for the given task. This transform is relative to the mTaskRect, which - * is what the view is measured and laid out with. - */ - public TaskViewTransform getStackTransform(Task task, float stackScroll, - TaskViewTransform transformOut, TaskViewTransform frontTransform) { - return getStackTransform(task, stackScroll, mFocusState, transformOut, frontTransform, - false /* forceUpdate */, false /* ignoreTaskOverrides */); - } - - public TaskViewTransform getStackTransform(Task task, float stackScroll, - TaskViewTransform transformOut, TaskViewTransform frontTransform, - boolean ignoreTaskOverrides) { - return getStackTransform(task, stackScroll, mFocusState, transformOut, frontTransform, - false /* forceUpdate */, ignoreTaskOverrides); - } - - public TaskViewTransform getStackTransform(Task task, float stackScroll, int focusState, - TaskViewTransform transformOut, TaskViewTransform frontTransform, boolean forceUpdate, - boolean ignoreTaskOverrides) { - if (useGridLayout()) { - int taskIndex = mTaskIndexMap.get(task.key.id); - int taskCount = mTaskIndexMap.size(); - mTaskGridLayoutAlgorithm.getTransform(taskIndex, taskCount, transformOut, this); - return transformOut; - } else if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - if (task == null) { - transformOut.reset(); - return transformOut; - } - int taskIndex = mTaskIndexMap.get(task.key.id); - mTaskStackLowRamLayoutAlgorithm.getTransform(taskIndex, stackScroll, transformOut, - mNumStackTasks, this); - return transformOut; - } else { - // Return early if we have an invalid index - int nonOverrideTaskProgress = mTaskIndexMap.get(task.key.id, -1); - if (task == null || nonOverrideTaskProgress == -1) { - transformOut.reset(); - return transformOut; - } - float taskProgress = ignoreTaskOverrides - ? nonOverrideTaskProgress - : getStackScrollForTask(task); - - getStackTransform(taskProgress, nonOverrideTaskProgress, stackScroll, focusState, - transformOut, frontTransform, false /* ignoreSingleTaskCase */, forceUpdate); - return transformOut; - } - } - - /** - * Like {@link #getStackTransform}, but in screen coordinates - */ - public TaskViewTransform getStackTransformScreenCoordinates(Task task, float stackScroll, - TaskViewTransform transformOut, TaskViewTransform frontTransform, - Rect windowOverrideRect) { - TaskViewTransform transform = getStackTransform(task, stackScroll, mFocusState, - transformOut, frontTransform, true /* forceUpdate */, - false /* ignoreTaskOverrides */); - return transformToScreenCoordinates(transform, windowOverrideRect); - } - - /** - * Transforms the given {@param transformOut} to the screen coordinates, overriding the current - * window rectangle with {@param windowOverrideRect} if non-null. - */ - TaskViewTransform transformToScreenCoordinates(TaskViewTransform transformOut, - Rect windowOverrideRect) { - Rect windowRect = windowOverrideRect != null - ? windowOverrideRect - : LegacyRecentsImpl.getSystemServices().getWindowRect(); - transformOut.rect.offset(windowRect.left, windowRect.top); - if (useGridLayout()) { - // Draw the thumbnail a little lower to perfectly coincide with the view we are - // transitioning to, where the header bar has already been drawn. - transformOut.rect.offset(0, mTitleBarHeight); - } - return transformOut; - } - - /** - * Update/get the transform. - * - * @param ignoreSingleTaskCase When set, will ensure that the transform computed does not take - * into account the special single-task case. This is only used - * internally to ensure that we can calculate the transform for any - * position in the stack. - */ - public void getStackTransform(float taskProgress, float nonOverrideTaskProgress, - float stackScroll, int focusState, TaskViewTransform transformOut, - TaskViewTransform frontTransform, boolean ignoreSingleTaskCase, boolean forceUpdate) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - - // Ensure that the task is in range - mUnfocusedRange.offset(stackScroll); - mFocusedRange.offset(stackScroll); - boolean unfocusedVisible = mUnfocusedRange.isInRange(taskProgress); - boolean focusedVisible = mFocusedRange.isInRange(taskProgress); - - // Skip if the task is not visible - if (!forceUpdate && !unfocusedVisible && !focusedVisible) { - transformOut.reset(); - return; - } - - // Map the absolute task progress to the normalized x at the stack scroll. We use this to - // calculate positions along the curve. - mUnfocusedRange.offset(stackScroll); - mFocusedRange.offset(stackScroll); - float unfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress); - float focusedRangeX = mFocusedRange.getNormalizedX(taskProgress); - - // Map the absolute task progress to the normalized x at the bounded stack scroll. We use - // this to calculate bounded properties, like translationZ and outline alpha. - float boundedStackScroll = Utilities.clamp(stackScroll, mMinScrollP, mMaxScrollP); - mUnfocusedRange.offset(boundedStackScroll); - mFocusedRange.offset(boundedStackScroll); - float boundedScrollUnfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress); - float boundedScrollUnfocusedNonOverrideRangeX = - mUnfocusedRange.getNormalizedX(nonOverrideTaskProgress); - - // Map the absolute task progress to the normalized x at the upper bounded stack scroll. - // We use this to calculate the dim, which is bounded only on one end. - float lowerBoundedStackScroll = Utilities.clamp(stackScroll, -Float.MAX_VALUE, mMaxScrollP); - mUnfocusedRange.offset(lowerBoundedStackScroll); - mFocusedRange.offset(lowerBoundedStackScroll); - float lowerBoundedUnfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress); - float lowerBoundedFocusedRangeX = mFocusedRange.getNormalizedX(taskProgress); - - int x = (mStackRect.width() - mTaskRect.width()) / 2; - int y; - float z; - float dimAlpha; - float viewOutlineAlpha; - if (mNumStackTasks == 1 && !ignoreSingleTaskCase) { - // When there is exactly one task, then decouple the task from the stack and just move - // in screen space - float tmpP = (mMinScrollP - stackScroll) / mNumStackTasks; - int centerYOffset = (mStackRect.top - mTaskRect.top) + - (mStackRect.height() - mSystemInsets.bottom - mTaskRect.height()) / 2; - y = centerYOffset + getYForDeltaP(tmpP, 0); - z = mMaxTranslationZ; - dimAlpha = 0f; - viewOutlineAlpha = OUTLINE_ALPHA_MIN_VALUE + - (OUTLINE_ALPHA_MAX_VALUE - OUTLINE_ALPHA_MIN_VALUE) / 2f; - - } else { - // Otherwise, update the task to the stack layout - int unfocusedY = (int) ((1f - mUnfocusedCurveInterpolator.getInterpolation( - unfocusedRangeX)) * mStackRect.height()); - int focusedY = (int) ((1f - mFocusedCurveInterpolator.getInterpolation( - focusedRangeX)) * mStackRect.height()); - float unfocusedDim = mUnfocusedDimCurveInterpolator.getInterpolation( - lowerBoundedUnfocusedRangeX); - float focusedDim = mFocusedDimCurveInterpolator.getInterpolation( - lowerBoundedFocusedRangeX); - - // Special case, because we override the initial task positions differently for small - // stacks, we clamp the dim to 0 in the initial position, and then only modulate the - // dim when the task is scrolled back towards the top of the screen - if (mNumStackTasks <= 2 && nonOverrideTaskProgress == 0f) { - if (boundedScrollUnfocusedRangeX >= 0.5f) { - unfocusedDim = 0f; - } else { - float offset = mUnfocusedDimCurveInterpolator.getInterpolation(0.5f); - unfocusedDim -= offset; - unfocusedDim *= MAX_DIM / (MAX_DIM - offset); - } - } - y = (mStackRect.top - mTaskRect.top) + - (int) com.android.systemui.recents.utilities.Utilities - .mapRange(focusState, unfocusedY, focusedY); - z = Utilities.mapRange(Utilities.clamp01(boundedScrollUnfocusedNonOverrideRangeX), - mMinTranslationZ, mMaxTranslationZ); - dimAlpha = com.android.systemui.recents.utilities.Utilities - .mapRange(focusState, unfocusedDim, focusedDim); - viewOutlineAlpha = Utilities.mapRange(Utilities.clamp01(boundedScrollUnfocusedRangeX), - OUTLINE_ALPHA_MIN_VALUE, OUTLINE_ALPHA_MAX_VALUE); - } - - // Fill out the transform - transformOut.scale = 1f; - transformOut.alpha = 1f; - transformOut.translationZ = z; - transformOut.dimAlpha = dimAlpha; - transformOut.viewOutlineAlpha = viewOutlineAlpha; - transformOut.rect.set(mTaskRect); - transformOut.rect.offset(x, y); - Utilities.scaleRectAboutCenter(transformOut.rect, transformOut.scale); - transformOut.visible = (transformOut.rect.top < mStackRect.bottom) && - (frontTransform == null || transformOut.rect.top != frontTransform.rect.top); - } - - /** - * Returns the untransformed task view bounds. - */ - public Rect getUntransformedTaskViewBounds() { - return new Rect(mTaskRect); - } - - /** - * Returns the scroll progress to scroll to such that the top of the task is at the top of the - * stack. - */ - float getStackScrollForTask(Task t) { - Float overrideP = mTaskIndexOverrideMap.get(t.key.id, null); - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice || overrideP == null) { - return (float) mTaskIndexMap.get(t.key.id, 0); - } - return overrideP; - } - - /** - * Returns the original scroll progress to scroll to such that the top of the task is at the top - * of the stack. - */ - float getStackScrollForTaskIgnoreOverrides(Task t) { - return (float) mTaskIndexMap.get(t.key.id, 0); - } - - /** - * Returns the scroll progress to scroll to such that the top of the task at the initial top - * offset (which is at the task's brightest point). - */ - float getStackScrollForTaskAtInitialOffset(Task t) { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - return mTaskStackLowRamLayoutAlgorithm.getInitialScrollP(mNumStackTasks, - launchState.launchedFromHome || launchState.launchedFromPipApp - || launchState.launchedWithNextPipApp); - } - float normX = getNormalizedXFromUnfocusedY(mInitialTopOffset, FROM_TOP); - mUnfocusedRange.offset(0f); - return Utilities.clamp((float) mTaskIndexMap.get(t.key.id, 0) - Math.max(0, - mUnfocusedRange.getAbsoluteX(normX)), mMinScrollP, mMaxScrollP); - } - - /** - * Maps a movement in screen y, relative to {@param downY}, to a movement in along the arc - * length of the curve. We know the curve is mostly flat, so we just map the length of the - * screen along the arc-length proportionally (1/arclength). - */ - public float getDeltaPForY(int downY, int y) { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - return mTaskStackLowRamLayoutAlgorithm.scrollToPercentage(downY - y); - } - float deltaP = (float) (y - downY) / mStackRect.height() * - mUnfocusedCurveInterpolator.getArcLength(); - return -deltaP; - } - - /** - * This is the inverse of {@link #getDeltaPForY}. Given a movement along the arc length - * of the curve, map back to the screen y. - */ - public int getYForDeltaP(float downScrollP, float p) { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - return mTaskStackLowRamLayoutAlgorithm.percentageToScroll(downScrollP - p); - } - int y = (int) ((p - downScrollP) * mStackRect.height() * - (1f / mUnfocusedCurveInterpolator.getArcLength())); - return -y; - } - - /** - * Returns the task stack bounds in the current orientation. This rect takes into account the - * top and right system insets (but not the bottom inset) and left/right paddings, but _not_ - * the top/bottom padding or insets. - */ - public void getTaskStackBounds(Rect displayRect, Rect windowRect, int topInset, int leftInset, - int rightInset, Rect taskStackBounds) { - taskStackBounds.set(windowRect.left + leftInset, windowRect.top + topInset, - windowRect.right - rightInset, windowRect.bottom); - - // Ensure that the new width is at most the smaller display edge size - int sideMargin = getScaleForExtent(windowRect, displayRect, mBaseSideMargin, mMinMargin, - WIDTH); - int targetStackWidth = taskStackBounds.width() - 2 * sideMargin; - if (Utilities.getAppConfiguration(mContext).orientation - == Configuration.ORIENTATION_LANDSCAPE) { - // If we are in landscape, calculate the width of the stack in portrait and ensure that - // we are not larger than that size - Rect portraitDisplayRect = new Rect(0, 0, - Math.min(displayRect.width(), displayRect.height()), - Math.max(displayRect.width(), displayRect.height())); - int portraitSideMargin = getScaleForExtent(portraitDisplayRect, portraitDisplayRect, - mBaseSideMargin, mMinMargin, WIDTH); - targetStackWidth = Math.min(targetStackWidth, - portraitDisplayRect.width() - 2 * portraitSideMargin); - } - taskStackBounds.inset((taskStackBounds.width() - targetStackWidth) / 2, 0); - } - - /** - * Retrieves resources that are constant regardless of the current configuration of the device. - */ - public static int getDimensionForDevice(Context ctx, int phoneResId, - int tabletResId, int xlargeTabletResId, int gridLayoutResId) { - return getDimensionForDevice(ctx, phoneResId, phoneResId, tabletResId, tabletResId, - xlargeTabletResId, xlargeTabletResId, gridLayoutResId); - } - - /** - * Retrieves resources that are constant regardless of the current configuration of the device. - */ - public static int getDimensionForDevice(Context ctx, int phonePortResId, int phoneLandResId, - int tabletPortResId, int tabletLandResId, int xlargeTabletPortResId, - int xlargeTabletLandResId, int gridLayoutResId) { - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - Resources res = ctx.getResources(); - boolean isLandscape = Utilities.getAppConfiguration(ctx).orientation == - Configuration.ORIENTATION_LANDSCAPE; - if (config.isGridEnabled) { - return res.getDimensionPixelSize(gridLayoutResId); - } else if (config.isXLargeScreen) { - return res.getDimensionPixelSize(isLandscape - ? xlargeTabletLandResId - : xlargeTabletPortResId); - } else if (config.isLargeScreen) { - return res.getDimensionPixelSize(isLandscape - ? tabletLandResId - : tabletPortResId); - } else { - return res.getDimensionPixelSize(isLandscape - ? phoneLandResId - : phonePortResId); - } - } - - /** - * Returns the normalized x on the unfocused curve given an absolute Y position (relative to the - * stack height). - */ - private float getNormalizedXFromUnfocusedY(float y, @AnchorSide int fromSide) { - float offset = (fromSide == FROM_TOP) - ? mStackRect.height() - y - : y; - float offsetPct = offset / mStackRect.height(); - return mUnfocusedCurveInterpolator.getX(offsetPct); - } - - /** - * Returns the normalized x on the focused curve given an absolute Y position (relative to the - * stack height). - */ - private float getNormalizedXFromFocusedY(float y, @AnchorSide int fromSide) { - float offset = (fromSide == FROM_TOP) - ? mStackRect.height() - y - : y; - float offsetPct = offset / mStackRect.height(); - return mFocusedCurveInterpolator.getX(offsetPct); - } - - /** - * Creates a new path for the focused curve. - */ - private Path constructFocusedCurve() { - // Initialize the focused curve. This curve is a piecewise curve composed of several - // linear pieces that goes from (0,1) through (0.5, peek height offset), - // (0.5, bottom task offsets), and (1,0). - float topPeekHeightPct = (float) mFocusedTopPeekHeight / mStackRect.height(); - float bottomPeekHeightPct = (float) (mStackBottomOffset + mFocusedBottomPeekHeight) / - mStackRect.height(); - float minBottomPeekHeightPct = (float) (mFocusedTopPeekHeight + mTaskRect.height() - - mMinMargin) / mStackRect.height(); - Path p = new Path(); - p.moveTo(0f, 1f); - p.lineTo(0.5f, 1f - topPeekHeightPct); - p.lineTo(1f - (0.5f / mFocusedRange.relativeMax), Math.max(1f - minBottomPeekHeightPct, - bottomPeekHeightPct)); - p.lineTo(1f, 0f); - return p; - } - - /** - * Creates a new path for the unfocused curve. - */ - private Path constructUnfocusedCurve() { - // Initialize the unfocused curve. This curve is a piecewise curve composed of two quadradic - // beziers that goes from (0,1) through (0.5, peek height offset) and ends at (1,0). This - // ensures that we match the range, at which 0.5 represents the stack scroll at the current - // task progress. Because the height offset can change depending on a resource, we compute - // the control point of the second bezier such that between it and a first known point, - // there is a tangent at (0.5, peek height offset). - float cpoint1X = 0.4f; - float cpoint1Y = 0.975f; - float topPeekHeightPct = (float) mFocusedTopPeekHeight / mStackRect.height(); - float slope = ((1f - topPeekHeightPct) - cpoint1Y) / (0.5f - cpoint1X); - float b = 1f - slope * cpoint1X; - float cpoint2X = 0.65f; - float cpoint2Y = slope * cpoint2X + b; - Path p = new Path(); - p.moveTo(0f, 1f); - p.cubicTo(0f, 1f, cpoint1X, cpoint1Y, 0.5f, 1f - topPeekHeightPct); - p.cubicTo(0.5f, 1f - topPeekHeightPct, cpoint2X, cpoint2Y, 1f, 0f); - return p; - } - - /** - * Creates a new path for the focused dim curve. - */ - private Path constructFocusedDimCurve() { - Path p = new Path(); - // The focused dim interpolator starts at max dim, reduces to zero at 0.5 (the focused - // task), then goes back to max dim at the next task - p.moveTo(0f, MAX_DIM); - p.lineTo(0.5f, 0f); - p.lineTo(0.5f + (0.5f / mFocusedRange.relativeMax), MAX_DIM); - p.lineTo(1f, MAX_DIM); - return p; - } - - /** - * Creates a new path for the unfocused dim curve. - */ - private Path constructUnfocusedDimCurve() { - float focusX = getNormalizedXFromUnfocusedY(mInitialTopOffset, FROM_TOP); - float cpoint2X = focusX + (1f - focusX) / 2; - Path p = new Path(); - // The unfocused dim interpolator starts at max dim, reduces to zero at 0.5 (the focused - // task), then goes back to max dim towards the front of the stack - p.moveTo(0f, MAX_DIM); - p.cubicTo(focusX * 0.5f, MAX_DIM, focusX * 0.75f, MAX_DIM * 0.75f, focusX, 0f); - p.cubicTo(cpoint2X, 0f, cpoint2X, MED_DIM, 1f, MED_DIM); - return p; - } - - /** - * Scales the given {@param value} to the scale of the {@param instance} rect relative to the - * {@param other} rect in the {@param extent} side. - */ - private int getScaleForExtent(Rect instance, Rect other, int value, int minValue, - @Extent int extent) { - if (extent == WIDTH) { - float scale = Utilities.clamp01((float) instance.width() / other.width()); - return Math.max(minValue, (int) (scale * value)); - } else if (extent == HEIGHT) { - float scale = Utilities.clamp01((float) instance.height() / other.height()); - return Math.max(minValue, (int) (scale * value)); - } - return value; - } - - /** - * Updates the current transforms that would put a TaskView at the front and back of the stack. - */ - private void updateFrontBackTransforms() { - // Return early if we have not yet initialized - if (mStackRect.isEmpty()) { - return; - } - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - mTaskStackLowRamLayoutAlgorithm.getBackOfStackTransform(mBackOfStackTransform, this); - mTaskStackLowRamLayoutAlgorithm.getFrontOfStackTransform(mFrontOfStackTransform, this); - return; - } - - float min = Utilities.mapRange(mFocusState, mUnfocusedRange.relativeMin, - mFocusedRange.relativeMin); - float max = Utilities.mapRange(mFocusState, mUnfocusedRange.relativeMax, - mFocusedRange.relativeMax); - getStackTransform(min, min, 0f, mFocusState, mBackOfStackTransform, null, - true /* ignoreSingleTaskCase */, true /* forceUpdate */); - getStackTransform(max, max, 0f, mFocusState, mFrontOfStackTransform, null, - true /* ignoreSingleTaskCase */, true /* forceUpdate */); - mBackOfStackTransform.visible = true; - mFrontOfStackTransform.visible = true; - } - - /** - * Returns the proper task rectangle according to the current grid state. - */ - public Rect getTaskRect() { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - return mTaskStackLowRamLayoutAlgorithm.getTaskRect(); - } - return useGridLayout() ? mTaskGridLayoutAlgorithm.getTaskGridRect() : mTaskRect; - } - - public void dump(String prefix, PrintWriter writer) { - String innerPrefix = prefix + " "; - - writer.print(prefix); writer.print(TAG); - writer.write(" numStackTasks="); writer.print(mNumStackTasks); - writer.println(); - - writer.print(innerPrefix); - writer.print("insets="); writer.print(Utilities.dumpRect(mSystemInsets)); - writer.print(" stack="); writer.print(Utilities.dumpRect(mStackRect)); - writer.print(" task="); writer.print(Utilities.dumpRect(mTaskRect)); - writer.print(" actionButton="); writer.print( - Utilities.dumpRect(mStackActionButtonRect)); - writer.println(); - - writer.print(innerPrefix); - writer.print("minScroll="); writer.print(mMinScrollP); - writer.print(" maxScroll="); writer.print(mMaxScrollP); - writer.print(" initialScroll="); writer.print(mInitialScrollP); - writer.println(); - - writer.print(innerPrefix); - writer.print("focusState="); writer.print(mFocusState); - writer.println(); - - if (mTaskIndexOverrideMap.size() > 0) { - for (int i = mTaskIndexOverrideMap.size() - 1; i >= 0; i--) { - int taskId = mTaskIndexOverrideMap.keyAt(i); - float x = mTaskIndexMap.get(taskId); - float overrideX = mTaskIndexOverrideMap.get(taskId, 0f); - - writer.print(innerPrefix); - writer.print("taskId= "); writer.print(taskId); - writer.print(" x= "); writer.print(x); - writer.print(" overrideX= "); writer.print(overrideX); - writer.println(); - } - } - } -}
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackView.java deleted file mode 100644 index b89218c81a91..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackView.java +++ /dev/null @@ -1,2291 +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.systemui.recents.views; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ValueAnimator; -import android.annotation.IntDef; -import android.content.ComponentName; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Rect; -import android.os.Bundle; -import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.MutableBoolean; -import android.view.LayoutInflater; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewDebug; -import android.view.ViewGroup; -import android.view.accessibility.AccessibilityEvent; -import android.view.accessibility.AccessibilityNodeInfo; -import android.widget.FrameLayout; -import android.widget.ScrollView; - -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.Dependency; -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.plugins.FalsingManager; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsActivity; -import com.android.systemui.recents.RecentsActivityLaunchState; -import com.android.systemui.recents.RecentsConfiguration; -import com.android.systemui.recents.RecentsDebugFlags; -import com.android.systemui.recents.RecentsImpl; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent; -import com.android.systemui.recents.events.activity.ConfigurationChangedEvent; -import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted; -import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent; -import com.android.systemui.recents.events.activity.HideRecentsEvent; -import com.android.systemui.recents.events.activity.HideStackActionButtonEvent; -import com.android.systemui.recents.events.activity.LaunchMostRecentTaskRequestEvent; -import com.android.systemui.recents.events.activity.LaunchNextTaskRequestEvent; -import com.android.systemui.recents.events.activity.LaunchTaskEvent; -import com.android.systemui.recents.events.activity.LaunchTaskStartedEvent; -import com.android.systemui.recents.events.activity.MultiWindowStateChangedEvent; -import com.android.systemui.recents.events.activity.PackagesChangedEvent; -import com.android.systemui.recents.events.activity.ShowEmptyViewEvent; -import com.android.systemui.recents.events.activity.ShowStackActionButtonEvent; -import com.android.systemui.recents.events.component.ActivityPinnedEvent; -import com.android.systemui.recents.events.component.ExpandPipEvent; -import com.android.systemui.recents.events.component.HidePipMenuEvent; -import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent; -import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent; -import com.android.systemui.recents.events.ui.DeleteTaskDataEvent; -import com.android.systemui.recents.events.ui.DismissAllTaskViewsEvent; -import com.android.systemui.recents.events.ui.DismissTaskViewEvent; -import com.android.systemui.recents.events.ui.RecentsGrowingEvent; -import com.android.systemui.recents.events.ui.TaskViewDismissedEvent; -import com.android.systemui.recents.events.ui.UserInteractionEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragDropTargetChangedEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndCancelledEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent; -import com.android.systemui.recents.events.ui.focus.DismissFocusedTaskViewEvent; -import com.android.systemui.recents.events.ui.focus.FocusNextTaskViewEvent; -import com.android.systemui.recents.events.ui.focus.FocusPreviousTaskViewEvent; -import com.android.systemui.recents.events.ui.focus.NavigateTaskViewEvent; -import com.android.systemui.recents.misc.DozeTrigger; -import com.android.systemui.recents.misc.ReferenceCountedTrigger; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.utilities.AnimationProps; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.recents.views.grid.GridTaskView; -import com.android.systemui.recents.views.grid.TaskGridLayoutAlgorithm; -import com.android.systemui.recents.views.grid.TaskViewFocusFrame; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.system.ActivityManagerWrapper; - -import java.io.PrintWriter; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.ArrayList; -import java.util.List; - - -/* The visual representation of a task stack view */ -public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCallbacks, - TaskView.TaskViewCallbacks, TaskStackViewScroller.TaskStackViewScrollerCallbacks, - TaskStackLayoutAlgorithm.TaskStackLayoutAlgorithmCallbacks, - ViewPool.ViewPoolConsumer<TaskView, Task> { - - private static final String TAG = "TaskStackView"; - - // The thresholds at which to show/hide the stack action button. - private static final float SHOW_STACK_ACTION_BUTTON_SCROLL_THRESHOLD = 0.3f; - private static final float HIDE_STACK_ACTION_BUTTON_SCROLL_THRESHOLD = 0.3f; - - public static final int DEFAULT_SYNC_STACK_DURATION = 200; - public static final int SLOW_SYNC_STACK_DURATION = 250; - private static final int DRAG_SCALE_DURATION = 175; - static final float DRAG_SCALE_FACTOR = 1.05f; - - private static final int LAUNCH_NEXT_SCROLL_BASE_DURATION = 216; - private static final int LAUNCH_NEXT_SCROLL_INCR_DURATION = 32; - - // The actions to perform when resetting to initial state, - @Retention(RetentionPolicy.SOURCE) - @IntDef({INITIAL_STATE_UPDATE_NONE, INITIAL_STATE_UPDATE_ALL, INITIAL_STATE_UPDATE_LAYOUT_ONLY}) - public @interface InitialStateAction {} - /** Do not update the stack and layout to the initial state. */ - private static final int INITIAL_STATE_UPDATE_NONE = 0; - /** Update both the stack and layout to the initial state. */ - private static final int INITIAL_STATE_UPDATE_ALL = 1; - /** Update only the layout to the initial state. */ - private static final int INITIAL_STATE_UPDATE_LAYOUT_ONLY = 2; - - private LayoutInflater mInflater; - private TaskStack mStack = new TaskStack(); - @ViewDebug.ExportedProperty(deepExport=true, prefix="layout_") - TaskStackLayoutAlgorithm mLayoutAlgorithm; - // The stable layout algorithm is only used to calculate the task rect with the stable bounds - private TaskStackLayoutAlgorithm mStableLayoutAlgorithm; - @ViewDebug.ExportedProperty(deepExport=true, prefix="scroller_") - private TaskStackViewScroller mStackScroller; - @ViewDebug.ExportedProperty(deepExport=true, prefix="touch_") - private TaskStackViewTouchHandler mTouchHandler; - private TaskStackAnimationHelper mAnimationHelper; - private ViewPool<TaskView, Task> mViewPool; - - private ArrayList<TaskView> mTaskViews = new ArrayList<>(); - private ArrayList<TaskViewTransform> mCurrentTaskTransforms = new ArrayList<>(); - private ArraySet<Task.TaskKey> mIgnoreTasks = new ArraySet<>(); - private AnimationProps mDeferredTaskViewLayoutAnimation = null; - - @ViewDebug.ExportedProperty(deepExport=true, prefix="doze_") - private DozeTrigger mUIDozeTrigger; - @ViewDebug.ExportedProperty(deepExport=true, prefix="focused_task_") - private Task mFocusedTask; - - private int mTaskCornerRadiusPx; - private int mDividerSize; - private int mStartTimerIndicatorDuration; - - @ViewDebug.ExportedProperty(category="recents") - private boolean mTaskViewsClipDirty = true; - @ViewDebug.ExportedProperty(category="recents") - private boolean mEnterAnimationComplete = false; - @ViewDebug.ExportedProperty(category="recents") - private boolean mStackReloaded = false; - @ViewDebug.ExportedProperty(category="recents") - private boolean mFinishedLayoutAfterStackReload = false; - @ViewDebug.ExportedProperty(category="recents") - private boolean mLaunchNextAfterFirstMeasure = false; - @ViewDebug.ExportedProperty(category="recents") - @InitialStateAction - private int mInitialState = INITIAL_STATE_UPDATE_ALL; - @ViewDebug.ExportedProperty(category="recents") - private boolean mInMeasureLayout = false; - @ViewDebug.ExportedProperty(category="recents") - boolean mTouchExplorationEnabled; - @ViewDebug.ExportedProperty(category="recents") - boolean mScreenPinningEnabled; - - // The stable stack bounds are the full bounds that we were measured with from RecentsView - @ViewDebug.ExportedProperty(category="recents") - private Rect mStableStackBounds = new Rect(); - // The current stack bounds are dynamic and may change as the user drags and drops - @ViewDebug.ExportedProperty(category="recents") - private Rect mStackBounds = new Rect(); - // The current window bounds at the point we were measured - @ViewDebug.ExportedProperty(category="recents") - private Rect mStableWindowRect = new Rect(); - // The current window bounds are dynamic and may change as the user drags and drops - @ViewDebug.ExportedProperty(category="recents") - private Rect mWindowRect = new Rect(); - // The current display bounds - @ViewDebug.ExportedProperty(category="recents") - private Rect mDisplayRect = new Rect(); - // The current display orientation - @ViewDebug.ExportedProperty(category="recents") - private int mDisplayOrientation = Configuration.ORIENTATION_UNDEFINED; - - private Rect mTmpRect = new Rect(); - private ArrayMap<Task.TaskKey, TaskView> mTmpTaskViewMap = new ArrayMap<>(); - private List<TaskView> mTmpTaskViews = new ArrayList<>(); - private TaskViewTransform mTmpTransform = new TaskViewTransform(); - private int[] mTmpIntPair = new int[2]; - private boolean mResetToInitialStateWhenResized; - private int mLastWidth; - private int mLastHeight; - private boolean mStackActionButtonVisible; - - // Percentage of last ScrollP from the min to max scrollP that lives after configuration changes - private float mLastScrollPPercent = -1; - - // We keep track of the task view focused by user interaction and draw a frame around it in the - // grid layout. - private TaskViewFocusFrame mTaskViewFocusFrame; - - private Task mPrefetchingTask; - private final float mFastFlingVelocity; - - // A convenience update listener to request updating clipping of tasks - private ValueAnimator.AnimatorUpdateListener mRequestUpdateClippingListener = - new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - if (!mTaskViewsClipDirty) { - mTaskViewsClipDirty = true; - invalidate(); - } - } - }; - - private DropTarget mStackDropTarget = new DropTarget() { - @Override - public boolean acceptsDrop(int x, int y, int width, int height, Rect insets, - boolean isCurrentTarget) { - // This drop target has a fixed bounds and should be checked last, so just fall through - // if it is the current target - if (!isCurrentTarget) { - return mLayoutAlgorithm.mStackRect.contains(x, y); - } - return false; - } - }; - - public TaskStackView(Context context) { - super(context); - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - Resources res = context.getResources(); - - // Set the stack first - mStack.setCallbacks(this); - mViewPool = new ViewPool<>(context, this); - mInflater = LayoutInflater.from(context); - mLayoutAlgorithm = new TaskStackLayoutAlgorithm(context, this); - mStableLayoutAlgorithm = new TaskStackLayoutAlgorithm(context, null); - mStackScroller = new TaskStackViewScroller(context, this, mLayoutAlgorithm); - mTouchHandler = new TaskStackViewTouchHandler( - context, this, mStackScroller, Dependency.get(FalsingManager.class)); - mAnimationHelper = new TaskStackAnimationHelper(context, this); - mTaskCornerRadiusPx = LegacyRecentsImpl.getConfiguration().isGridEnabled ? - res.getDimensionPixelSize(R.dimen.recents_grid_task_view_rounded_corners_radius) : - res.getDimensionPixelSize(R.dimen.recents_task_view_rounded_corners_radius); - mFastFlingVelocity = res.getDimensionPixelSize(R.dimen.recents_fast_fling_velocity); - mDividerSize = ssp.getDockedDividerSize(context); - mDisplayOrientation = Utilities.getAppConfiguration(mContext).orientation; - mDisplayRect = ssp.getDisplayRect(); - mStackActionButtonVisible = false; - - // Create a frame to draw around the focused task view - if (LegacyRecentsImpl.getConfiguration().isGridEnabled) { - mTaskViewFocusFrame = new TaskViewFocusFrame(mContext, this, - mLayoutAlgorithm.mTaskGridLayoutAlgorithm); - addView(mTaskViewFocusFrame); - getViewTreeObserver().addOnGlobalFocusChangeListener(mTaskViewFocusFrame); - } - - int taskBarDismissDozeDelaySeconds = getResources().getInteger( - R.integer.recents_task_bar_dismiss_delay_seconds); - mUIDozeTrigger = new DozeTrigger(taskBarDismissDozeDelaySeconds, new Runnable() { - @Override - public void run() { - // Show the task bar dismiss buttons - List<TaskView> taskViews = getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - tv.startNoUserInteractionAnimation(); - } - } - }); - setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); - } - - @Override - protected void onAttachedToWindow() { - EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1); - super.onAttachedToWindow(); - readSystemFlags(); - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - EventBus.getDefault().unregister(this); - } - - /** - * Called from RecentsActivity when it is relaunched. - */ - void onReload(boolean isResumingFromVisible) { - if (!isResumingFromVisible) { - // Reset the focused task - resetFocusedTask(getFocusedTask()); - } - - // Reset the state of each of the task views - List<TaskView> taskViews = new ArrayList<>(); - taskViews.addAll(getTaskViews()); - taskViews.addAll(mViewPool.getViews()); - for (int i = taskViews.size() - 1; i >= 0; i--) { - taskViews.get(i).onReload(isResumingFromVisible); - } - - // Reset the stack state - readSystemFlags(); - mTaskViewsClipDirty = true; - mUIDozeTrigger.stopDozing(); - if (!isResumingFromVisible) { - mStackScroller.reset(); - mStableLayoutAlgorithm.reset(); - mLayoutAlgorithm.reset(); - mLastScrollPPercent = -1; - } - - // Since we always animate to the same place in (the initial state), always reset the stack - // to the initial state when resuming - mStackReloaded = true; - mFinishedLayoutAfterStackReload = false; - mLaunchNextAfterFirstMeasure = false; - mInitialState = INITIAL_STATE_UPDATE_ALL; - requestLayout(); - } - - /** - * Sets the stack tasks of this TaskStackView from the given TaskStack. - */ - public void setTasks(TaskStack stack, boolean allowNotifyStackChanges) { - boolean isInitialized = mLayoutAlgorithm.isInitialized(); - - // Only notify if we are already initialized, otherwise, everything will pick up all the - // new and old tasks when we next layout - mStack.setTasks(stack, allowNotifyStackChanges && isInitialized); - } - - /** Returns the task stack. */ - public TaskStack getStack() { - return mStack; - } - - /** - * Updates this TaskStackView to the initial state. - */ - public void updateToInitialState() { - mStackScroller.setStackScrollToInitialState(); - mLayoutAlgorithm.setTaskOverridesForInitialState(mStack, false /* ignoreScrollToFront */); - } - - /** Updates the list of task views */ - void updateTaskViewsList() { - mTaskViews.clear(); - int childCount = getChildCount(); - for (int i = 0; i < childCount; i++) { - View v = getChildAt(i); - if (v instanceof TaskView) { - mTaskViews.add((TaskView) v); - } - } - } - - /** Gets the list of task views */ - List<TaskView> getTaskViews() { - return mTaskViews; - } - - /** - * Returns the front most task view. - */ - private TaskView getFrontMostTaskView() { - List<TaskView> taskViews = getTaskViews(); - if (taskViews.isEmpty()) { - return null; - } - return taskViews.get(taskViews.size() - 1); - } - - /** - * Finds the child view given a specific {@param task}. - */ - public TaskView getChildViewForTask(Task t) { - List<TaskView> taskViews = getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - if (tv.getTask() == t) { - return tv; - } - } - return null; - } - - /** Returns the stack algorithm for this task stack. */ - public TaskStackLayoutAlgorithm getStackAlgorithm() { - return mLayoutAlgorithm; - } - - /** Returns the grid algorithm for this task stack. */ - public TaskGridLayoutAlgorithm getGridAlgorithm() { - return mLayoutAlgorithm.mTaskGridLayoutAlgorithm; - } - - /** - * Returns the touch handler for this task stack. - */ - public TaskStackViewTouchHandler getTouchHandler() { - return mTouchHandler; - } - - /** - * Adds a task to the ignored set. - */ - void addIgnoreTask(Task task) { - mIgnoreTasks.add(task.key); - } - - /** - * Removes a task from the ignored set. - */ - void removeIgnoreTask(Task task) { - mIgnoreTasks.remove(task.key); - } - - /** - * Returns whether the specified {@param task} is ignored. - */ - boolean isIgnoredTask(Task task) { - return mIgnoreTasks.contains(task.key); - } - - /** - * Computes the task transforms at the current stack scroll for all visible tasks. If a valid - * target stack scroll is provided (ie. is different than {@param curStackScroll}), then the - * visible range includes all tasks at the target stack scroll. This is useful for ensure that - * all views necessary for a transition or animation will be visible at the start. - * - * @param taskTransforms The set of task view transforms to reuse, this list will be sized to - * match the size of {@param tasks} - * @param tasks The set of tasks for which to generate transforms - * @param curStackScroll The current stack scroll - * @param targetStackScroll The stack scroll that we anticipate we are going to be scrolling to. - * The range of the union of the visible views at the current and - * target stack scrolls will be returned. - * @param ignoreTasksSet The set of tasks to skip for purposes of calculaing the visible range. - * Transforms will still be calculated for the ignore tasks. - * @return the front and back most visible task indices (there may be non visible tasks in - * between this range) - */ - int[] computeVisibleTaskTransforms(ArrayList<TaskViewTransform> taskTransforms, - ArrayList<Task> tasks, float curStackScroll, float targetStackScroll, - ArraySet<Task.TaskKey> ignoreTasksSet, boolean ignoreTaskOverrides) { - int taskCount = tasks.size(); - int[] visibleTaskRange = mTmpIntPair; - visibleTaskRange[0] = -1; - visibleTaskRange[1] = -1; - boolean useTargetStackScroll = Float.compare(curStackScroll, targetStackScroll) != 0; - - // We can reuse the task transforms where possible to reduce object allocation - matchTaskListSize(tasks, taskTransforms); - - // Update the stack transforms - TaskViewTransform frontTransform = null; - TaskViewTransform frontTransformAtTarget = null; - TaskViewTransform transform = null; - TaskViewTransform transformAtTarget = null; - for (int i = taskCount - 1; i >= 0; i--) { - Task task = tasks.get(i); - - // Calculate the current and (if necessary) the target transform for the task - transform = mLayoutAlgorithm.getStackTransform(task, curStackScroll, - taskTransforms.get(i), frontTransform, ignoreTaskOverrides); - if (useTargetStackScroll && !transform.visible) { - // If we have a target stack scroll and the task is not currently visible, then we - // just update the transform at the new scroll - // TODO: Optimize this - transformAtTarget = mLayoutAlgorithm.getStackTransform(task, targetStackScroll, - new TaskViewTransform(), frontTransformAtTarget); - if (transformAtTarget.visible) { - transform.copyFrom(transformAtTarget); - } - } - - // For ignore tasks, only calculate the stack transform and skip the calculation of the - // visible stack indices - if (ignoreTasksSet.contains(task.key)) { - continue; - } - - frontTransform = transform; - frontTransformAtTarget = transformAtTarget; - if (transform.visible) { - if (visibleTaskRange[0] < 0) { - visibleTaskRange[0] = i; - } - visibleTaskRange[1] = i; - } - } - return visibleTaskRange; - } - - /** - * Binds the visible {@link TaskView}s at the given target scroll. - */ - void bindVisibleTaskViews(float targetStackScroll) { - bindVisibleTaskViews(targetStackScroll, false /* ignoreTaskOverrides */); - } - - /** - * Synchronizes the set of children {@link TaskView}s to match the visible set of tasks in the - * current {@link TaskStack}. This call does not continue on to update their position to the - * computed {@link TaskViewTransform}s of the visible range, but only ensures that they will - * be added/removed from the view hierarchy and placed in the correct Z order and initial - * position (if not currently on screen). - * - * @param targetStackScroll If provided, will ensure that the set of visible {@link TaskView}s - * includes those visible at the current stack scroll, and all at the - * target stack scroll. - * @param ignoreTaskOverrides If set, the visible task computation will get the transforms for - * tasks at their non-overridden task progress - */ - void bindVisibleTaskViews(float targetStackScroll, boolean ignoreTaskOverrides) { - // Get all the task transforms - ArrayList<Task> tasks = mStack.getTasks(); - int[] visibleTaskRange = computeVisibleTaskTransforms(mCurrentTaskTransforms, tasks, - mStackScroller.getStackScroll(), targetStackScroll, mIgnoreTasks, - ignoreTaskOverrides); - - // Return all the invisible children to the pool - mTmpTaskViewMap.clear(); - List<TaskView> taskViews = getTaskViews(); - int lastFocusedTaskIndex = -1; - int taskViewCount = taskViews.size(); - for (int i = taskViewCount - 1; i >= 0; i--) { - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - // Skip ignored tasks - if (mIgnoreTasks.contains(task.key)) { - continue; - } - - // It is possible for the set of lingering TaskViews to differ from the stack if the - // stack was updated before the relayout. If the task view is no longer in the stack, - // then just return it back to the view pool. - int taskIndex = mStack.indexOfTask(task); - TaskViewTransform transform = null; - if (taskIndex != -1) { - transform = mCurrentTaskTransforms.get(taskIndex); - } - - if (transform != null && transform.visible) { - mTmpTaskViewMap.put(task.key, tv); - } else { - if (mTouchExplorationEnabled && Utilities.isDescendentAccessibilityFocused(tv)) { - lastFocusedTaskIndex = taskIndex; - resetFocusedTask(task); - } - mViewPool.returnViewToPool(tv); - } - } - - // Pick up all the newly visible children - for (int i = tasks.size() - 1; i >= 0; i--) { - Task task = tasks.get(i); - TaskViewTransform transform = mCurrentTaskTransforms.get(i); - - // Skip ignored tasks - if (mIgnoreTasks.contains(task.key)) { - continue; - } - - // Skip the invisible stack tasks - if (!transform.visible) { - continue; - } - - TaskView tv = mTmpTaskViewMap.get(task.key); - if (tv == null) { - tv = mViewPool.pickUpViewFromPool(task, task); - if (transform.rect.top <= mLayoutAlgorithm.mStackRect.top) { - updateTaskViewToTransform(tv, mLayoutAlgorithm.getBackOfStackTransform(), - AnimationProps.IMMEDIATE); - } else { - updateTaskViewToTransform(tv, mLayoutAlgorithm.getFrontOfStackTransform(), - AnimationProps.IMMEDIATE); - } - } else { - // Reattach it in the right z order - final int taskIndex = mStack.indexOfTask(task); - final int insertIndex = findTaskViewInsertIndex(task, taskIndex); - if (insertIndex != getTaskViews().indexOf(tv)){ - detachViewFromParent(tv); - attachViewToParent(tv, insertIndex, tv.getLayoutParams()); - updateTaskViewsList(); - } - } - } - - updatePrefetchingTask(tasks, visibleTaskRange[0], visibleTaskRange[1]); - - // Update the focus if the previous focused task was returned to the view pool - if (lastFocusedTaskIndex != -1) { - int newFocusedTaskIndex = (lastFocusedTaskIndex < visibleTaskRange[1]) - ? visibleTaskRange[1] - : visibleTaskRange[0]; - setFocusedTask(newFocusedTaskIndex, false /* scrollToTask */, - true /* requestViewFocus */); - TaskView focusedTaskView = getChildViewForTask(mFocusedTask); - if (focusedTaskView != null) { - focusedTaskView.requestAccessibilityFocus(); - } - } - } - - /** - * @see #relayoutTaskViews(AnimationProps, ArrayMap<Task, AnimationProps>, boolean) - */ - public void relayoutTaskViews(AnimationProps animation) { - relayoutTaskViews(animation, null /* animationOverrides */, - false /* ignoreTaskOverrides */); - } - - /** - * Relayout the the visible {@link TaskView}s to their current transforms as specified by the - * {@link TaskStackLayoutAlgorithm} with the given {@param animation}. This call cancels any - * animations that are current running on those task views, and will ensure that the children - * {@link TaskView}s will match the set of visible tasks in the stack. If a {@link Task} has - * an animation provided in {@param animationOverrides}, that will be used instead. - */ - private void relayoutTaskViews(AnimationProps animation, - ArrayMap<Task, AnimationProps> animationOverrides, boolean ignoreTaskOverrides) { - // If we had a deferred animation, cancel that - cancelDeferredTaskViewLayoutAnimation(); - - // Synchronize the current set of TaskViews - bindVisibleTaskViews(mStackScroller.getStackScroll(), ignoreTaskOverrides); - - // Animate them to their final transforms with the given animation - List<TaskView> taskViews = getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - if (mIgnoreTasks.contains(task.key)) { - continue; - } - - int taskIndex = mStack.indexOfTask(task); - TaskViewTransform transform = mCurrentTaskTransforms.get(taskIndex); - if (animationOverrides != null && animationOverrides.containsKey(task)) { - animation = animationOverrides.get(task); - } - - updateTaskViewToTransform(tv, transform, animation); - } - } - - /** - * Posts an update to synchronize the {@link TaskView}s with the stack on the next frame. - */ - void relayoutTaskViewsOnNextFrame(AnimationProps animation) { - mDeferredTaskViewLayoutAnimation = animation; - invalidate(); - } - - /** - * Called to update a specific {@link TaskView} to a given {@link TaskViewTransform} with a - * given set of {@link AnimationProps} properties. - */ - public void updateTaskViewToTransform(TaskView taskView, TaskViewTransform transform, - AnimationProps animation) { - if (taskView.isAnimatingTo(transform)) { - return; - } - taskView.cancelTransformAnimation(); - taskView.updateViewPropertiesToTaskTransform(transform, animation, - mRequestUpdateClippingListener); - } - - /** - * Returns the current task transforms of all tasks, falling back to the stack layout if there - * is no {@link TaskView} for the task. - */ - public void getCurrentTaskTransforms(ArrayList<Task> tasks, - ArrayList<TaskViewTransform> transformsOut) { - matchTaskListSize(tasks, transformsOut); - int focusState = mLayoutAlgorithm.getFocusState(); - for (int i = tasks.size() - 1; i >= 0; i--) { - Task task = tasks.get(i); - TaskViewTransform transform = transformsOut.get(i); - TaskView tv = getChildViewForTask(task); - if (tv != null) { - transform.fillIn(tv); - } else { - mLayoutAlgorithm.getStackTransform(task, mStackScroller.getStackScroll(), - focusState, transform, null, true /* forceUpdate */, - false /* ignoreTaskOverrides */); - } - transform.visible = true; - } - } - - /** - * Returns the task transforms for all the tasks in the stack if the stack was at the given - * {@param stackScroll} and {@param focusState}. - */ - public void getLayoutTaskTransforms(float stackScroll, int focusState, ArrayList<Task> tasks, - boolean ignoreTaskOverrides, ArrayList<TaskViewTransform> transformsOut) { - matchTaskListSize(tasks, transformsOut); - for (int i = tasks.size() - 1; i >= 0; i--) { - Task task = tasks.get(i); - TaskViewTransform transform = transformsOut.get(i); - mLayoutAlgorithm.getStackTransform(task, stackScroll, focusState, transform, null, - true /* forceUpdate */, ignoreTaskOverrides); - transform.visible = true; - } - } - - /** - * Cancels the next deferred task view layout. - */ - void cancelDeferredTaskViewLayoutAnimation() { - mDeferredTaskViewLayoutAnimation = null; - } - - /** - * Cancels all {@link TaskView} animations. - */ - void cancelAllTaskViewAnimations() { - List<TaskView> taskViews = getTaskViews(); - for (int i = taskViews.size() - 1; i >= 0; i--) { - final TaskView tv = taskViews.get(i); - if (!mIgnoreTasks.contains(tv.getTask().key)) { - tv.cancelTransformAnimation(); - } - } - } - - /** - * Updates the clip for each of the task views from back to front. - */ - private void clipTaskViews() { - // We never clip task views in grid layout - if (LegacyRecentsImpl.getConfiguration().isGridEnabled) { - return; - } - - // Update the clip on each task child - List<TaskView> taskViews = getTaskViews(); - TaskView tmpTv = null; - TaskView prevVisibleTv = null; - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - TaskView frontTv = null; - int clipBottom = 0; - - if (isIgnoredTask(tv.getTask())) { - // For each of the ignore tasks, update the translationZ of its TaskView to be - // between the translationZ of the tasks immediately underneath it - if (prevVisibleTv != null) { - tv.setTranslationZ(Math.max(tv.getTranslationZ(), - prevVisibleTv.getTranslationZ() + 0.1f)); - } - } - - if (i < (taskViewCount - 1) && tv.shouldClipViewInStack()) { - // Find the next view to clip against - for (int j = i + 1; j < taskViewCount; j++) { - tmpTv = taskViews.get(j); - - if (tmpTv.shouldClipViewInStack()) { - frontTv = tmpTv; - break; - } - } - - // Clip against the next view, this is just an approximation since we are - // stacked and we can make assumptions about the visibility of the this - // task relative to the ones in front of it. - if (frontTv != null) { - float taskBottom = tv.getBottom(); - float frontTaskTop = frontTv.getTop(); - if (frontTaskTop < taskBottom) { - // Map the stack view space coordinate (the rects) to view space - clipBottom = (int) (taskBottom - frontTaskTop) - mTaskCornerRadiusPx; - } - } - } - tv.getViewBounds().setClipBottom(clipBottom); - tv.mThumbnailView.updateThumbnailVisibility(clipBottom - tv.getPaddingBottom()); - prevVisibleTv = tv; - } - mTaskViewsClipDirty = false; - } - - public void updateLayoutAlgorithm(boolean boundScrollToNewMinMax) { - updateLayoutAlgorithm(boundScrollToNewMinMax, LegacyRecentsImpl.getConfiguration().getLaunchState()); - } - - /** - * Updates the layout algorithm min and max virtual scroll bounds. - */ - public void updateLayoutAlgorithm(boolean boundScrollToNewMinMax, - RecentsActivityLaunchState launchState) { - // Compute the min and max scroll values - mLayoutAlgorithm.update(mStack, mIgnoreTasks, launchState, mLastScrollPPercent); - - if (boundScrollToNewMinMax) { - mStackScroller.boundScroll(); - } - } - - /** - * Updates the stack layout to its stable places. - */ - private void updateLayoutToStableBounds() { - mWindowRect.set(mStableWindowRect); - mStackBounds.set(mStableStackBounds); - mLayoutAlgorithm.setSystemInsets(mStableLayoutAlgorithm.mSystemInsets); - mLayoutAlgorithm.initialize(mDisplayRect, mWindowRect, mStackBounds); - updateLayoutAlgorithm(true /* boundScroll */); - } - - /** Returns the scroller. */ - public TaskStackViewScroller getScroller() { - return mStackScroller; - } - - /** - * Sets the focused task to the provided (bounded taskIndex). - * - * @return whether or not the stack will scroll as a part of this focus change - */ - public boolean setFocusedTask(int taskIndex, boolean scrollToTask, - final boolean requestViewFocus) { - return setFocusedTask(taskIndex, scrollToTask, requestViewFocus, 0); - } - - /** - * Sets the focused task to the provided (bounded focusTaskIndex). - * - * @return whether or not the stack will scroll as a part of this focus change - */ - public boolean setFocusedTask(int focusTaskIndex, boolean scrollToTask, - boolean requestViewFocus, int timerIndicatorDuration) { - // Find the next task to focus - int newFocusedTaskIndex = mStack.getTaskCount() > 0 ? - Utilities.clamp(focusTaskIndex, 0, mStack.getTaskCount() - 1) : -1; - final Task newFocusedTask = (newFocusedTaskIndex != -1) ? - mStack.getTasks().get(newFocusedTaskIndex) : null; - - // Reset the last focused task state if changed - if (mFocusedTask != null) { - // Cancel the timer indicator, if applicable - if (timerIndicatorDuration > 0) { - final TaskView tv = getChildViewForTask(mFocusedTask); - if (tv != null) { - tv.getHeaderView().cancelFocusTimerIndicator(); - } - } - - resetFocusedTask(mFocusedTask); - } - - boolean willScroll = false; - mFocusedTask = newFocusedTask; - - if (newFocusedTask != null) { - // Start the timer indicator, if applicable - if (timerIndicatorDuration > 0) { - final TaskView tv = getChildViewForTask(mFocusedTask); - if (tv != null) { - tv.getHeaderView().startFocusTimerIndicator(timerIndicatorDuration); - } else { - // The view is null; set a flag for later - mStartTimerIndicatorDuration = timerIndicatorDuration; - } - } - - if (scrollToTask) { - // Cancel any running enter animations at this point when we scroll or change focus - if (!mEnterAnimationComplete) { - cancelAllTaskViewAnimations(); - } - - mLayoutAlgorithm.clearUnfocusedTaskOverrides(); - willScroll = mAnimationHelper.startScrollToFocusedTaskAnimation(newFocusedTask, - requestViewFocus); - if (willScroll) { - sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SCROLLED); - } - } else { - // Focus the task view - TaskView newFocusedTaskView = getChildViewForTask(newFocusedTask); - if (newFocusedTaskView != null) { - newFocusedTaskView.setFocusedState(true, requestViewFocus); - } - } - // Any time a task view gets the focus, we move the focus frame around it. - if (mTaskViewFocusFrame != null) { - mTaskViewFocusFrame.moveGridTaskViewFocus(getChildViewForTask(newFocusedTask)); - } - } - return willScroll; - } - - /** - * Sets the focused task relative to the currently focused task. - * - * @param forward whether to go to the next task in the stack (along the curve) or the previous - * @param stackTasksOnly if set, will ensure that the traversal only goes along stack tasks, and - * if the currently focused task is not a stack task, will set the focus - * to the first visible stack task - * @param animated determines whether to actually draw the highlight along with the change in - * focus. - */ - public void setRelativeFocusedTask(boolean forward, boolean stackTasksOnly, boolean animated) { - setRelativeFocusedTask(forward, stackTasksOnly, animated, false, 0); - } - - /** - * Sets the focused task relative to the currently focused task. - * - * @param forward whether to go to the next task in the stack (along the curve) or the previous - * @param stackTasksOnly if set, will ensure that the traversal only goes along stack tasks, and - * if the currently focused task is not a stack task, will set the focus - * to the first visible stack task - * @param animated determines whether to actually draw the highlight along with the change in - * focus. - * @param cancelWindowAnimations if set, will attempt to cancel window animations if a scroll - * happens. - * @param timerIndicatorDuration the duration to initialize the auto-advance timer indicator - */ - public void setRelativeFocusedTask(boolean forward, boolean stackTasksOnly, boolean animated, - boolean cancelWindowAnimations, int timerIndicatorDuration) { - Task focusedTask = getFocusedTask(); - int newIndex = mStack.indexOfTask(focusedTask); - if (focusedTask != null) { - if (stackTasksOnly) { - List<Task> tasks = mStack.getTasks(); - // Try the next task if it is a stack task - int tmpNewIndex = newIndex + (forward ? -1 : 1); - if (0 <= tmpNewIndex && tmpNewIndex < tasks.size()) { - newIndex = tmpNewIndex; - } - } else { - // No restrictions, lets just move to the new task (looping forward/backwards if - // necessary) - int taskCount = mStack.getTaskCount(); - newIndex = (newIndex + (forward ? -1 : 1) + taskCount) % taskCount; - } - } else { - // We don't have a focused task - float stackScroll = mStackScroller.getStackScroll(); - ArrayList<Task> tasks = mStack.getTasks(); - int taskCount = tasks.size(); - if (useGridLayout()) { - // For the grid layout, we directly set focus to the most recently used task - // no matter we're moving forwards or backwards. - newIndex = taskCount - 1; - } else { - // For the grid layout we pick a proper task to focus, according to the current - // stack scroll. - if (forward) { - // Walk backwards and focus the next task smaller than the current stack scroll - for (newIndex = taskCount - 1; newIndex >= 0; newIndex--) { - float taskP = mLayoutAlgorithm.getStackScrollForTask(tasks.get(newIndex)); - if (Float.compare(taskP, stackScroll) <= 0) { - break; - } - } - } else { - // Walk forwards and focus the next task larger than the current stack scroll - for (newIndex = 0; newIndex < taskCount; newIndex++) { - float taskP = mLayoutAlgorithm.getStackScrollForTask(tasks.get(newIndex)); - if (Float.compare(taskP, stackScroll) >= 0) { - break; - } - } - } - } - } - if (newIndex != -1) { - boolean willScroll = setFocusedTask(newIndex, true /* scrollToTask */, - true /* requestViewFocus */, timerIndicatorDuration); - if (willScroll && cancelWindowAnimations) { - // As we iterate to the next/previous task, cancel any current/lagging window - // transition animations - EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(null)); - } - } - } - - /** - * Resets the focused task. - */ - public void resetFocusedTask(Task task) { - if (task != null) { - TaskView tv = getChildViewForTask(task); - if (tv != null) { - tv.setFocusedState(false, false /* requestViewFocus */); - } - } - if (mTaskViewFocusFrame != null) { - mTaskViewFocusFrame.moveGridTaskViewFocus(null); - } - mFocusedTask = null; - } - - /** - * Returns the focused task. - */ - public Task getFocusedTask() { - return mFocusedTask; - } - - /** - * Returns the accessibility focused task. - */ - Task getAccessibilityFocusedTask() { - List<TaskView> taskViews = getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - if (Utilities.isDescendentAccessibilityFocused(tv)) { - return tv.getTask(); - } - } - TaskView frontTv = getFrontMostTaskView(); - if (frontTv != null) { - return frontTv.getTask(); - } - return null; - } - - @Override - public void onInitializeAccessibilityEvent(AccessibilityEvent event) { - super.onInitializeAccessibilityEvent(event); - List<TaskView> taskViews = getTaskViews(); - int taskViewCount = taskViews.size(); - if (taskViewCount > 0) { - TaskView backMostTask = taskViews.get(0); - TaskView frontMostTask = taskViews.get(taskViewCount - 1); - event.setFromIndex(mStack.indexOfTask(backMostTask.getTask())); - event.setToIndex(mStack.indexOfTask(frontMostTask.getTask())); - event.setContentDescription(frontMostTask.getTask().title); - } - event.setItemCount(mStack.getTaskCount()); - - int stackHeight = mLayoutAlgorithm.mStackRect.height(); - event.setScrollY((int) (mStackScroller.getStackScroll() * stackHeight)); - event.setMaxScrollY((int) (mLayoutAlgorithm.mMaxScrollP * stackHeight)); - } - - @Override - public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { - super.onInitializeAccessibilityNodeInfo(info); - List<TaskView> taskViews = getTaskViews(); - int taskViewCount = taskViews.size(); - if (taskViewCount > 1) { - // Find the accessibility focused task - Task focusedTask = getAccessibilityFocusedTask(); - info.setScrollable(true); - int focusedTaskIndex = mStack.indexOfTask(focusedTask); - if (focusedTaskIndex > 0 || !mStackActionButtonVisible) { - info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD); - } - if (0 <= focusedTaskIndex && focusedTaskIndex < mStack.getTaskCount() - 1) { - info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD); - } - } - } - - @Override - public CharSequence getAccessibilityClassName() { - return ScrollView.class.getName(); - } - - @Override - public boolean performAccessibilityAction(int action, Bundle arguments) { - if (super.performAccessibilityAction(action, arguments)) { - return true; - } - Task focusedTask = getAccessibilityFocusedTask(); - int taskIndex = mStack.indexOfTask(focusedTask); - if (0 <= taskIndex && taskIndex < mStack.getTaskCount()) { - switch (action) { - case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: { - setFocusedTask(taskIndex + 1, true /* scrollToTask */, true /* requestViewFocus */, - 0); - return true; - } - case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: { - setFocusedTask(taskIndex - 1, true /* scrollToTask */, true /* requestViewFocus */, - 0); - return true; - } - } - } - return false; - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - return mTouchHandler.onInterceptTouchEvent(ev); - } - - @Override - public boolean onTouchEvent(MotionEvent ev) { - return mTouchHandler.onTouchEvent(ev); - } - - @Override - public boolean onGenericMotionEvent(MotionEvent ev) { - return mTouchHandler.onGenericMotionEvent(ev); - } - - @Override - public void computeScroll() { - if (mStackScroller.computeScroll()) { - // Notify accessibility - sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SCROLLED); - LegacyRecentsImpl.getTaskLoader().getHighResThumbnailLoader().setFlingingFast( - mStackScroller.getScrollVelocity() > mFastFlingVelocity); - } - if (mDeferredTaskViewLayoutAnimation != null) { - relayoutTaskViews(mDeferredTaskViewLayoutAnimation); - mTaskViewsClipDirty = true; - mDeferredTaskViewLayoutAnimation = null; - } - if (mTaskViewsClipDirty) { - clipTaskViews(); - } - mLastScrollPPercent = Utilities.clamp(Utilities.unmapRange(mStackScroller.getStackScroll(), - mLayoutAlgorithm.mMinScrollP, mLayoutAlgorithm.mMaxScrollP), 0, 1); - } - - /** - * Computes the maximum number of visible tasks and thumbnails. Requires that - * updateLayoutForStack() is called first. - */ - public TaskStackLayoutAlgorithm.VisibilityReport computeStackVisibilityReport() { - return mLayoutAlgorithm.computeStackVisibilityReport(mStack.getTasks()); - } - - /** - * Updates the system insets. - */ - public void setSystemInsets(Rect systemInsets) { - boolean changed = false; - changed |= mStableLayoutAlgorithm.setSystemInsets(systemInsets); - changed |= mLayoutAlgorithm.setSystemInsets(systemInsets); - if (changed) { - requestLayout(); - } - } - - /** - * This is called with the full window width and height to allow stack view children to - * perform the full screen transition down. - */ - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - mInMeasureLayout = true; - int width = MeasureSpec.getSize(widthMeasureSpec); - int height = MeasureSpec.getSize(heightMeasureSpec); - - // Update the stable stack bounds, but only update the current stack bounds if the stable - // bounds have changed. This is because we may get spurious measures while dragging where - // our current stack bounds reflect the target drop region. - mLayoutAlgorithm.getTaskStackBounds(mDisplayRect, new Rect(0, 0, width, height), - mLayoutAlgorithm.mSystemInsets.top, mLayoutAlgorithm.mSystemInsets.left, - mLayoutAlgorithm.mSystemInsets.right, mTmpRect); - if (!mTmpRect.equals(mStableStackBounds)) { - mStableStackBounds.set(mTmpRect); - mStackBounds.set(mTmpRect); - mStableWindowRect.set(0, 0, width, height); - mWindowRect.set(0, 0, width, height); - } - - // Compute the rects in the stack algorithm - mStableLayoutAlgorithm.initialize(mDisplayRect, mStableWindowRect, mStableStackBounds); - mLayoutAlgorithm.initialize(mDisplayRect, mWindowRect, mStackBounds); - updateLayoutAlgorithm(false /* boundScroll */); - - // If this is the first layout, then scroll to the front of the stack, then update the - // TaskViews with the stack so that we can lay them out - boolean resetToInitialState = (width != mLastWidth || height != mLastHeight) - && mResetToInitialStateWhenResized; - if (!mFinishedLayoutAfterStackReload || mInitialState != INITIAL_STATE_UPDATE_NONE - || resetToInitialState) { - if (mInitialState != INITIAL_STATE_UPDATE_LAYOUT_ONLY || resetToInitialState) { - updateToInitialState(); - mResetToInitialStateWhenResized = false; - } - if (mFinishedLayoutAfterStackReload) { - mInitialState = INITIAL_STATE_UPDATE_NONE; - } - } - // If we got the launch-next event before the first layout pass, then re-send it after the - // initial state has been updated - if (mLaunchNextAfterFirstMeasure) { - mLaunchNextAfterFirstMeasure = false; - EventBus.getDefault().post(new LaunchNextTaskRequestEvent()); - } - - // Rebind all the views, including the ignore ones - bindVisibleTaskViews(mStackScroller.getStackScroll(), false /* ignoreTaskOverrides */); - - // Measure each of the TaskViews - mTmpTaskViews.clear(); - mTmpTaskViews.addAll(getTaskViews()); - mTmpTaskViews.addAll(mViewPool.getViews()); - int taskViewCount = mTmpTaskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - measureTaskView(mTmpTaskViews.get(i)); - } - if (mTaskViewFocusFrame != null) { - mTaskViewFocusFrame.measure(); - } - - setMeasuredDimension(width, height); - mLastWidth = width; - mLastHeight = height; - mInMeasureLayout = false; - } - - /** - * Measures a TaskView. - */ - private void measureTaskView(TaskView tv) { - Rect padding = new Rect(); - if (tv.getBackground() != null) { - tv.getBackground().getPadding(padding); - } - mTmpRect.set(mStableLayoutAlgorithm.getTaskRect()); - mTmpRect.union(mLayoutAlgorithm.getTaskRect()); - tv.measure( - MeasureSpec.makeMeasureSpec(mTmpRect.width() + padding.left + padding.right, - MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(mTmpRect.height() + padding.top + padding.bottom, - MeasureSpec.EXACTLY)); - } - - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - // Layout each of the TaskViews - mTmpTaskViews.clear(); - mTmpTaskViews.addAll(getTaskViews()); - mTmpTaskViews.addAll(mViewPool.getViews()); - int taskViewCount = mTmpTaskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - layoutTaskView(changed, mTmpTaskViews.get(i)); - } - if (mTaskViewFocusFrame != null) { - mTaskViewFocusFrame.layout(); - } - - if (changed) { - if (mStackScroller.isScrollOutOfBounds()) { - mStackScroller.boundScroll(); - } - } - - // Relayout all of the task views including the ignored ones - relayoutTaskViews(AnimationProps.IMMEDIATE); - clipTaskViews(); - - if (!mFinishedLayoutAfterStackReload) { - // Prepare the task enter animations (this can be called numerous times) - mInitialState = INITIAL_STATE_UPDATE_NONE; - onFirstLayout(); - - if (mStackReloaded) { - mFinishedLayoutAfterStackReload = true; - tryStartEnterAnimation(); - } - } - } - - /** - * Lays out a TaskView. - */ - private void layoutTaskView(boolean changed, TaskView tv) { - if (changed) { - Rect padding = new Rect(); - if (tv.getBackground() != null) { - tv.getBackground().getPadding(padding); - } - mTmpRect.set(mStableLayoutAlgorithm.getTaskRect()); - mTmpRect.union(mLayoutAlgorithm.getTaskRect()); - tv.cancelTransformAnimation(); - tv.layout(mTmpRect.left - padding.left, mTmpRect.top - padding.top, - mTmpRect.right + padding.right, mTmpRect.bottom + padding.bottom); - } else { - // If the layout has not changed, then just lay it out again in-place - tv.layout(tv.getLeft(), tv.getTop(), tv.getRight(), tv.getBottom()); - } - } - - /** Handler for the first layout. */ - void onFirstLayout() { - // Setup the view for the enter animation - mAnimationHelper.prepareForEnterAnimation(); - - // Set the task focused state without requesting view focus, and leave the focus animations - // until after the enter-animation - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - - // We set the initial focused task view iff the following conditions are satisfied: - // 1. Recents is showing task views in stack layout. - // 2. Recents is launched with ALT + TAB. - boolean setFocusOnFirstLayout = !useGridLayout() || launchState.launchedWithAltTab; - if (setFocusOnFirstLayout) { - int focusedTaskIndex = getInitialFocusTaskIndex(launchState, mStack.getTaskCount(), - useGridLayout()); - if (focusedTaskIndex != -1) { - setFocusedTask(focusedTaskIndex, false /* scrollToTask */, - false /* requestViewFocus */); - } - } - updateStackActionButtonVisibility(); - } - - public boolean isTouchPointInView(float x, float y, TaskView tv) { - mTmpRect.set(tv.getLeft(), tv.getTop(), tv.getRight(), tv.getBottom()); - mTmpRect.offset((int) tv.getTranslationX(), (int) tv.getTranslationY()); - return mTmpRect.contains((int) x, (int) y); - } - - /** - * Returns a non-ignored task in the {@param tasks} list that can be used as an achor when - * calculating the scroll position before and after a layout change. - */ - public Task findAnchorTask(List<Task> tasks, MutableBoolean isFrontMostTask) { - for (int i = tasks.size() - 1; i >= 0; i--) { - Task task = tasks.get(i); - - // Ignore deleting tasks - if (isIgnoredTask(task)) { - if (i == tasks.size() - 1) { - isFrontMostTask.value = true; - } - continue; - } - return task; - } - return null; - } - - /**** TaskStackCallbacks Implementation ****/ - - @Override - public void onStackTaskAdded(TaskStack stack, Task newTask) { - // Update the min/max scroll and animate other task views into their new positions - updateLayoutAlgorithm(true /* boundScroll */); - - // Animate all the tasks into place - relayoutTaskViews(!mFinishedLayoutAfterStackReload - ? AnimationProps.IMMEDIATE - : new AnimationProps(DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN)); - } - - /** - * We expect that the {@link TaskView} associated with the removed task is already hidden. - */ - @Override - public void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask, - AnimationProps animation, boolean fromDockGesture, boolean dismissRecentsIfAllRemoved) { - if (mFocusedTask == removedTask) { - resetFocusedTask(removedTask); - } - - // Remove the view associated with this task, we can't rely on updateTransforms - // to work here because the task is no longer in the list - TaskView tv = getChildViewForTask(removedTask); - if (tv != null) { - mViewPool.returnViewToPool(tv); - } - - // Remove the task from the ignored set - removeIgnoreTask(removedTask); - - // If requested, relayout with the given animation - if (animation != null) { - updateLayoutAlgorithm(true /* boundScroll */); - relayoutTaskViews(animation); - } - - // Update the new front most task's action button - if (mScreenPinningEnabled && newFrontMostTask != null) { - TaskView frontTv = getChildViewForTask(newFrontMostTask); - if (frontTv != null) { - frontTv.showActionButton(true /* fadeIn */, DEFAULT_SYNC_STACK_DURATION); - } - } - - // If there are no remaining tasks, then just close recents - if (mStack.getTaskCount() == 0) { - if (dismissRecentsIfAllRemoved) { - EventBus.getDefault().send(new AllTaskViewsDismissedEvent(fromDockGesture - ? R.string.recents_empty_message - : R.string.recents_empty_message_dismissed_all)); - } else { - EventBus.getDefault().send(new ShowEmptyViewEvent()); - } - } - } - - @Override - public void onStackTasksRemoved(TaskStack stack) { - // Reset the focused task - resetFocusedTask(getFocusedTask()); - - // Return all the views to the pool - List<TaskView> taskViews = new ArrayList<>(); - taskViews.addAll(getTaskViews()); - for (int i = taskViews.size() - 1; i >= 0; i--) { - mViewPool.returnViewToPool(taskViews.get(i)); - } - - // Remove all the ignore tasks - mIgnoreTasks.clear(); - - // If there are no remaining tasks, then just close recents - EventBus.getDefault().send(new AllTaskViewsDismissedEvent( - R.string.recents_empty_message_dismissed_all)); - } - - @Override - public void onStackTasksUpdated(TaskStack stack) { - if (!mFinishedLayoutAfterStackReload) { - return; - } - - // Update the layout and immediately layout - updateLayoutAlgorithm(false /* boundScroll */); - relayoutTaskViews(AnimationProps.IMMEDIATE); - - // Rebind all the task views. This will not trigger new resources to be loaded - // unless they have actually changed - List<TaskView> taskViews = getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - bindTaskView(tv, tv.getTask()); - } - } - - /**** ViewPoolConsumer Implementation ****/ - - @Override - public TaskView createView(Context context) { - if (LegacyRecentsImpl.getConfiguration().isGridEnabled) { - return (GridTaskView) mInflater.inflate(R.layout.recents_grid_task_view, this, false); - } else { - return (TaskView) mInflater.inflate(R.layout.recents_task_view, this, false); - } - } - - @Override - public void onReturnViewToPool(TaskView tv) { - final Task task = tv.getTask(); - - // Unbind the task from the task view - unbindTaskView(tv, task); - - // Reset the view properties and view state - tv.clearAccessibilityFocus(); - tv.resetViewProperties(); - tv.setFocusedState(false, false /* requestViewFocus */); - tv.setClipViewInStack(false); - if (mScreenPinningEnabled) { - tv.hideActionButton(false /* fadeOut */, 0 /* duration */, false /* scaleDown */, null); - } - - // Detach the view from the hierarchy - detachViewFromParent(tv); - // Update the task views list after removing the task view - updateTaskViewsList(); - } - - @Override - public void onPickUpViewFromPool(TaskView tv, Task task, boolean isNewView) { - // Find the index where this task should be placed in the stack - int taskIndex = mStack.indexOfTask(task); - int insertIndex = findTaskViewInsertIndex(task, taskIndex); - - // Add/attach the view to the hierarchy - if (isNewView) { - if (mInMeasureLayout) { - // If we are measuring the layout, then just add the view normally as it will be - // laid out during the layout pass - addView(tv, insertIndex); - } else { - // Otherwise, this is from a bindVisibleTaskViews() call outside the measure/layout - // pass, and we should layout the new child ourselves - ViewGroup.LayoutParams params = tv.getLayoutParams(); - if (params == null) { - params = generateDefaultLayoutParams(); - } - addViewInLayout(tv, insertIndex, params, true /* preventRequestLayout */); - measureTaskView(tv); - layoutTaskView(true /* changed */, tv); - } - } else { - attachViewToParent(tv, insertIndex, tv.getLayoutParams()); - } - // Update the task views list after adding the new task view - updateTaskViewsList(); - - // Bind the task view to the new task - bindTaskView(tv, task); - - // Set the new state for this view, including the callbacks and view clipping - tv.setCallbacks(this); - tv.setTouchEnabled(true); - tv.setClipViewInStack(true); - if (mFocusedTask == task) { - tv.setFocusedState(true, false /* requestViewFocus */); - if (mStartTimerIndicatorDuration > 0) { - // The timer indicator couldn't be started before, so start it now - tv.getHeaderView().startFocusTimerIndicator(mStartTimerIndicatorDuration); - mStartTimerIndicatorDuration = 0; - } - } - - // Restore the action button visibility if it is the front most task view - if (mScreenPinningEnabled && tv.getTask() == mStack.getFrontMostTask()) { - tv.showActionButton(false /* fadeIn */, 0 /* fadeInDuration */); - } - } - - @Override - public boolean hasPreferredData(TaskView tv, Task preferredData) { - return (tv.getTask() == preferredData); - } - - private void bindTaskView(TaskView tv, Task task) { - // Rebind the task and request that this task's data be filled into the TaskView - tv.onTaskBound(task, mTouchExplorationEnabled, mDisplayOrientation, mDisplayRect); - - // If the doze trigger has already fired, then update the state for this task view - if (mUIDozeTrigger.isAsleep() || - useGridLayout() || LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - tv.setNoUserInteractionState(); - } - - if (task == mPrefetchingTask) { - task.notifyTaskDataLoaded(task.thumbnail, task.icon); - } else { - // Load the task data - LegacyRecentsImpl.getTaskLoader().loadTaskData(task); - } - LegacyRecentsImpl.getTaskLoader().getHighResThumbnailLoader().onTaskVisible(task); - } - - private void unbindTaskView(TaskView tv, Task task) { - if (task != mPrefetchingTask) { - // Report that this task's data is no longer being used - LegacyRecentsImpl.getTaskLoader().unloadTaskData(task); - } - LegacyRecentsImpl.getTaskLoader().getHighResThumbnailLoader().onTaskInvisible(task); - } - - private void updatePrefetchingTask(ArrayList<Task> tasks, int frontIndex, int backIndex) { - Task t = null; - boolean somethingVisible = frontIndex != -1 && backIndex != -1; - if (somethingVisible && frontIndex < tasks.size() - 1) { - t = tasks.get(frontIndex + 1); - } - if (mPrefetchingTask != t) { - if (mPrefetchingTask != null) { - int index = tasks.indexOf(mPrefetchingTask); - if (index < backIndex || index > frontIndex) { - LegacyRecentsImpl.getTaskLoader().unloadTaskData(mPrefetchingTask); - } - } - mPrefetchingTask = t; - if (t != null) { - LegacyRecentsImpl.getTaskLoader().loadTaskData(t); - } - } - } - - private void clearPrefetchingTask() { - if (mPrefetchingTask != null) { - LegacyRecentsImpl.getTaskLoader().unloadTaskData(mPrefetchingTask); - } - mPrefetchingTask = null; - } - - /**** TaskViewCallbacks Implementation ****/ - - @Override - public void onTaskViewClipStateChanged(TaskView tv) { - if (!mTaskViewsClipDirty) { - mTaskViewsClipDirty = true; - invalidate(); - } - } - - /**** TaskStackLayoutAlgorithm.TaskStackLayoutAlgorithmCallbacks ****/ - - @Override - public void onFocusStateChanged(int prevFocusState, int curFocusState) { - if (mDeferredTaskViewLayoutAnimation == null) { - mUIDozeTrigger.poke(); - relayoutTaskViewsOnNextFrame(AnimationProps.IMMEDIATE); - } - } - - /**** TaskStackViewScroller.TaskStackViewScrollerCallbacks ****/ - - @Override - public void onStackScrollChanged(float prevScroll, float curScroll, AnimationProps animation) { - mUIDozeTrigger.poke(); - if (animation != null) { - relayoutTaskViewsOnNextFrame(animation); - } - - // In grid layout, the stack action button always remains visible. - if (mEnterAnimationComplete && !useGridLayout()) { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - // Show stack button when user drags down to show older tasks on low ram devices - if (mStack.getTaskCount() > 0 && !mStackActionButtonVisible - && mTouchHandler.mIsScrolling && curScroll - prevScroll < 0) { - // Going up - EventBus.getDefault().send( - new ShowStackActionButtonEvent(true /* translate */)); - } - return; - } - if (prevScroll > SHOW_STACK_ACTION_BUTTON_SCROLL_THRESHOLD && - curScroll <= SHOW_STACK_ACTION_BUTTON_SCROLL_THRESHOLD && - mStack.getTaskCount() > 0) { - EventBus.getDefault().send(new ShowStackActionButtonEvent(true /* translate */)); - } else if (prevScroll < HIDE_STACK_ACTION_BUTTON_SCROLL_THRESHOLD && - curScroll >= HIDE_STACK_ACTION_BUTTON_SCROLL_THRESHOLD) { - EventBus.getDefault().send(new HideStackActionButtonEvent()); - } - } - } - - /**** EventBus Events ****/ - - public final void onBusEvent(PackagesChangedEvent event) { - // Compute which components need to be removed - ArraySet<ComponentName> removedComponents = mStack.computeComponentsRemoved( - event.packageName, event.userId); - - // For other tasks, just remove them directly if they no longer exist - ArrayList<Task> tasks = mStack.getTasks(); - for (int i = tasks.size() - 1; i >= 0; i--) { - final Task t = tasks.get(i); - if (removedComponents.contains(t.key.getComponent())) { - final TaskView tv = getChildViewForTask(t); - if (tv != null) { - // For visible children, defer removing the task until after the animation - tv.dismissTask(); - } else { - // Otherwise, remove the task from the stack immediately - mStack.removeTask(t, AnimationProps.IMMEDIATE, false /* fromDockGesture */); - } - } - } - } - - public final void onBusEvent(LaunchTaskEvent event) { - // Cancel any doze triggers once a task is launched - mUIDozeTrigger.stopDozing(); - } - - public final void onBusEvent(LaunchMostRecentTaskRequestEvent event) { - if (mStack.getTaskCount() > 0) { - Task mostRecentTask = mStack.getFrontMostTask(); - launchTask(mostRecentTask); - } - } - - public final void onBusEvent(ShowStackActionButtonEvent event) { - mStackActionButtonVisible = true; - } - - public final void onBusEvent(HideStackActionButtonEvent event) { - mStackActionButtonVisible = false; - } - - public final void onBusEvent(LaunchNextTaskRequestEvent event) { - if (!mFinishedLayoutAfterStackReload) { - mLaunchNextAfterFirstMeasure = true; - return; - } - - if (mStack.getTaskCount() == 0) { - if (RecentsImpl.getLastPipTime() != -1) { - EventBus.getDefault().send(new ExpandPipEvent()); - MetricsLogger.action(getContext(), MetricsEvent.OVERVIEW_LAUNCH_PREVIOUS_TASK, - "pip"); - } else { - // If there are no tasks, then just hide recents back to home. - EventBus.getDefault().send(new HideRecentsEvent(false, true)); - } - return; - } - - if (!LegacyRecentsImpl.getConfiguration().getLaunchState().launchedFromPipApp - && mStack.isNextLaunchTargetPip(RecentsImpl.getLastPipTime())) { - // If the launch task is in the pinned stack, then expand the PiP now - EventBus.getDefault().send(new ExpandPipEvent()); - MetricsLogger.action(getContext(), MetricsEvent.OVERVIEW_LAUNCH_PREVIOUS_TASK, "pip"); - } else { - final Task launchTask = mStack.getNextLaunchTarget(); - if (launchTask != null) { - // Defer launching the task until the PiP menu has been dismissed (if it is - // showing at all) - HidePipMenuEvent hideMenuEvent = new HidePipMenuEvent(); - hideMenuEvent.addPostAnimationCallback(() -> { - launchTask(launchTask); - }); - EventBus.getDefault().send(hideMenuEvent); - MetricsLogger.action(getContext(), MetricsEvent.OVERVIEW_LAUNCH_PREVIOUS_TASK, - launchTask.key.getComponent().toString()); - } - } - } - - public final void onBusEvent(LaunchTaskStartedEvent event) { - mAnimationHelper.startLaunchTaskAnimation(event.taskView, event.screenPinningRequested, - event.getAnimationTrigger()); - } - - public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) { - // Stop any scrolling - mTouchHandler.cancelNonDismissTaskAnimations(); - mStackScroller.stopScroller(); - mStackScroller.stopBoundScrollAnimation(); - cancelDeferredTaskViewLayoutAnimation(); - - // Start the task animations - mAnimationHelper.startExitToHomeAnimation(event.animated, event.getAnimationTrigger()); - - // Dismiss the grid task view focus frame - if (mTaskViewFocusFrame != null) { - mTaskViewFocusFrame.moveGridTaskViewFocus(null); - } - } - - public final void onBusEvent(DismissFocusedTaskViewEvent event) { - if (mFocusedTask != null) { - if (mTaskViewFocusFrame != null) { - mTaskViewFocusFrame.moveGridTaskViewFocus(null); - } - TaskView tv = getChildViewForTask(mFocusedTask); - if (tv != null) { - tv.dismissTask(); - } - resetFocusedTask(mFocusedTask); - } - } - - public final void onBusEvent(DismissTaskViewEvent event) { - // For visible children, defer removing the task until after the animation - mAnimationHelper.startDeleteTaskAnimation( - event.taskView, useGridLayout(), event.getAnimationTrigger()); - } - - public final void onBusEvent(final DismissAllTaskViewsEvent event) { - // Keep track of the tasks which will have their data removed - ArrayList<Task> tasks = new ArrayList<>(mStack.getTasks()); - mAnimationHelper.startDeleteAllTasksAnimation( - getTaskViews(), useGridLayout(), event.getAnimationTrigger()); - event.addPostAnimationCallback(new Runnable() { - @Override - public void run() { - // Announce for accessibility - announceForAccessibility(getContext().getString( - R.string.accessibility_recents_all_items_dismissed)); - - // Remove all tasks and delete the task data for all tasks - mStack.removeAllTasks(true /* notifyStackChanges */); - for (int i = tasks.size() - 1; i >= 0; i--) { - EventBus.getDefault().send(new DeleteTaskDataEvent(tasks.get(i))); - } - - MetricsLogger.action(getContext(), MetricsEvent.OVERVIEW_DISMISS_ALL); - } - }); - - } - - public final void onBusEvent(TaskViewDismissedEvent event) { - // Announce for accessibility - announceForAccessibility(getContext().getString( - R.string.accessibility_recents_item_dismissed, event.task.title)); - - if (useGridLayout() && event.animation != null) { - event.animation.setListener(new AnimatorListenerAdapter() { - public void onAnimationEnd(Animator animator) { - if (mTaskViewFocusFrame != null) { - // Resize the grid layout task view focus frame - mTaskViewFocusFrame.resize(); - } - } - }); - } - - // Remove the task from the stack - mStack.removeTask(event.task, event.animation, false /* fromDockGesture */); - EventBus.getDefault().send(new DeleteTaskDataEvent(event.task)); - if (mStack.getTaskCount() > 0 && LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - EventBus.getDefault().send(new ShowStackActionButtonEvent(false /* translate */)); - } - - MetricsLogger.action(getContext(), MetricsEvent.OVERVIEW_DISMISS, - event.task.key.getComponent().toString()); - } - - public final void onBusEvent(FocusNextTaskViewEvent event) { - // Stop any scrolling - mStackScroller.stopScroller(); - mStackScroller.stopBoundScrollAnimation(); - - setRelativeFocusedTask(true, false /* stackTasksOnly */, true /* animated */, false, 0); - } - - public final void onBusEvent(FocusPreviousTaskViewEvent event) { - // Stop any scrolling - mStackScroller.stopScroller(); - mStackScroller.stopBoundScrollAnimation(); - - setRelativeFocusedTask(false, false /* stackTasksOnly */, true /* animated */); - } - - public final void onBusEvent(NavigateTaskViewEvent event) { - if (useGridLayout()) { - final int taskCount = mStack.getTaskCount(); - final int currentIndex = mStack.indexOfTask(getFocusedTask()); - final int nextIndex = mLayoutAlgorithm.mTaskGridLayoutAlgorithm.navigateFocus(taskCount, - currentIndex, event.direction); - setFocusedTask(nextIndex, false, true); - } else { - switch (event.direction) { - case UP: - EventBus.getDefault().send(new FocusPreviousTaskViewEvent()); - break; - case DOWN: - EventBus.getDefault().send(new FocusNextTaskViewEvent()); - break; - } - } - } - - public final void onBusEvent(UserInteractionEvent event) { - // Poke the doze trigger on user interaction - mUIDozeTrigger.poke(); - - RecentsDebugFlags debugFlags = LegacyRecentsImpl.getDebugFlags(); - if (mFocusedTask != null) { - TaskView tv = getChildViewForTask(mFocusedTask); - if (tv != null) { - tv.getHeaderView().cancelFocusTimerIndicator(); - } - } - } - - public final void onBusEvent(DragStartEvent event) { - // Ensure that the drag task is not animated - addIgnoreTask(event.task); - - // Enlarge the dragged view slightly - float finalScale = event.taskView.getScaleX() * DRAG_SCALE_FACTOR; - mLayoutAlgorithm.getStackTransform(event.task, getScroller().getStackScroll(), - mTmpTransform, null); - mTmpTransform.scale = finalScale; - mTmpTransform.translationZ = mLayoutAlgorithm.mMaxTranslationZ + 1; - mTmpTransform.dimAlpha = 0f; - updateTaskViewToTransform(event.taskView, mTmpTransform, - new AnimationProps(DRAG_SCALE_DURATION, Interpolators.FAST_OUT_SLOW_IN)); - } - - public final void onBusEvent(DragDropTargetChangedEvent event) { - AnimationProps animation = new AnimationProps(SLOW_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN); - boolean ignoreTaskOverrides = false; - if (event.dropTarget instanceof DockState) { - // Calculate the new task stack bounds that matches the window size that Recents will - // have after the drop - final DockState dockState = (DockState) event.dropTarget; - Rect systemInsets = new Rect(mStableLayoutAlgorithm.mSystemInsets); - // When docked, the nav bar insets are consumed and the activity is measured without - // insets. However, the window bounds include the insets, so we need to subtract them - // here to make them identical. - int height = getMeasuredHeight(); - height -= systemInsets.bottom; - systemInsets.bottom = 0; - mStackBounds.set(dockState.getDockedTaskStackBounds(mDisplayRect, getMeasuredWidth(), - height, mDividerSize, systemInsets, - mLayoutAlgorithm, getResources(), mWindowRect)); - mLayoutAlgorithm.setSystemInsets(systemInsets); - mLayoutAlgorithm.initialize(mDisplayRect, mWindowRect, mStackBounds); - updateLayoutAlgorithm(true /* boundScroll */); - ignoreTaskOverrides = true; - } else { - // Restore the pre-drag task stack bounds, but ensure that we don't layout the dragging - // task view, so add it back to the ignore set after updating the layout - removeIgnoreTask(event.task); - updateLayoutToStableBounds(); - addIgnoreTask(event.task); - } - relayoutTaskViews(animation, null /* animationOverrides */, ignoreTaskOverrides); - } - - public final void onBusEvent(final DragEndEvent event) { - // We don't handle drops on the dock regions - if (event.dropTarget instanceof DockState) { - // However, we do need to reset the overrides, since the last state of this task stack - // view layout was ignoring task overrides (see DragDropTargetChangedEvent handler) - mLayoutAlgorithm.clearUnfocusedTaskOverrides(); - return; - } - - // Restore the task, so that relayout will apply to it below - removeIgnoreTask(event.task); - - // Convert the dragging task view back to its final layout-space rect - Utilities.setViewFrameFromTranslation(event.taskView); - - // Animate all the tasks into place - ArrayMap<Task, AnimationProps> animationOverrides = new ArrayMap<>(); - animationOverrides.put(event.task, new AnimationProps(SLOW_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN, - event.getAnimationTrigger().decrementOnAnimationEnd())); - relayoutTaskViews(new AnimationProps(SLOW_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN)); - event.getAnimationTrigger().increment(); - } - - public final void onBusEvent(final DragEndCancelledEvent event) { - // Restore the pre-drag task stack bounds, including the dragging task view - removeIgnoreTask(event.task); - updateLayoutToStableBounds(); - - // Convert the dragging task view back to its final layout-space rect - Utilities.setViewFrameFromTranslation(event.taskView); - - // Animate all the tasks into place - ArrayMap<Task, AnimationProps> animationOverrides = new ArrayMap<>(); - animationOverrides.put(event.task, new AnimationProps(SLOW_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN, - event.getAnimationTrigger().decrementOnAnimationEnd())); - relayoutTaskViews(new AnimationProps(SLOW_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN)); - event.getAnimationTrigger().increment(); - } - - public final void onBusEvent(EnterRecentsWindowAnimationCompletedEvent event) { - mEnterAnimationComplete = true; - tryStartEnterAnimation(); - } - - private void tryStartEnterAnimation() { - if (!mStackReloaded || !mFinishedLayoutAfterStackReload || !mEnterAnimationComplete) { - return; - } - - if (mStack.getTaskCount() > 0) { - // Start the task enter animations - ReferenceCountedTrigger trigger = new ReferenceCountedTrigger(); - mAnimationHelper.startEnterAnimation(trigger); - - // Add a runnable to the post animation ref counter to clear all the views - trigger.addLastDecrementRunnable(() -> { - // Start the dozer to trigger to trigger any UI that shows after a timeout - mUIDozeTrigger.startDozing(); - - // Update the focused state here -- since we only set the focused task without - // requesting view focus in onFirstLayout(), actually request view focus and - // animate the focused state if we are alt-tabbing now, after the window enter - // animation is completed - if (mFocusedTask != null) { - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - RecentsActivityLaunchState launchState = config.getLaunchState(); - setFocusedTask(mStack.indexOfTask(mFocusedTask), - false /* scrollToTask */, launchState.launchedWithAltTab); - TaskView focusedTaskView = getChildViewForTask(mFocusedTask); - if (mTouchExplorationEnabled && focusedTaskView != null) { - focusedTaskView.requestAccessibilityFocus(); - } - } - }); - } - - // This flag is only used to choreograph the enter animation, so we can reset it here - mStackReloaded = false; - } - - public final void onBusEvent(final MultiWindowStateChangedEvent event) { - if (event.inMultiWindow || !event.showDeferredAnimation) { - setTasks(event.stack, true /* allowNotifyStackChanges */); - } else { - // Reset the launch state before handling the multiwindow change - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - launchState.reset(); - - // Defer until the next frame to ensure that we have received all the system insets, and - // initial layout updates - event.getAnimationTrigger().increment(); - post(new Runnable() { - @Override - public void run() { - // Scroll the stack to the front to see the undocked task - mAnimationHelper.startNewStackScrollAnimation(event.stack, - event.getAnimationTrigger()); - event.getAnimationTrigger().decrement(); - } - }); - } - } - - public final void onBusEvent(ConfigurationChangedEvent event) { - if (event.fromDeviceOrientationChange) { - mDisplayOrientation = Utilities.getAppConfiguration(mContext).orientation; - mDisplayRect = LegacyRecentsImpl.getSystemServices().getDisplayRect(); - - // Always stop the scroller, otherwise, we may continue setting the stack scroll to the - // wrong bounds in the new layout - mStackScroller.stopScroller(); - } - reloadOnConfigurationChange(); - - // Notify the task views of the configuration change so they can reload their resources - if (!event.fromMultiWindow) { - mTmpTaskViews.clear(); - mTmpTaskViews.addAll(getTaskViews()); - mTmpTaskViews.addAll(mViewPool.getViews()); - int taskViewCount = mTmpTaskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - mTmpTaskViews.get(i).onConfigurationChanged(); - } - } - - // Update the Clear All button in case we're switching in or out of grid layout. - updateStackActionButtonVisibility(); - - // Trigger a new layout and update to the initial state if necessary. When entering split - // screen, the multi-window configuration change event can happen after the stack is already - // reloaded (but pending measure/layout), in this case, do not override the intiial state - // and just wait for the upcoming measure/layout pass. - if (event.fromMultiWindow && mInitialState == INITIAL_STATE_UPDATE_NONE) { - mInitialState = INITIAL_STATE_UPDATE_LAYOUT_ONLY; - requestLayout(); - } else if (event.fromDeviceOrientationChange) { - mInitialState = INITIAL_STATE_UPDATE_ALL; - requestLayout(); - } - } - - public final void onBusEvent(RecentsGrowingEvent event) { - mResetToInitialStateWhenResized = true; - } - - public final void onBusEvent(RecentsVisibilityChangedEvent event) { - if (!event.visible) { - if (mTaskViewFocusFrame != null) { - mTaskViewFocusFrame.moveGridTaskViewFocus(null); - } - - List<TaskView> taskViews = new ArrayList<>(getTaskViews()); - for (int i = 0; i < taskViews.size(); i++) { - mViewPool.returnViewToPool(taskViews.get(i)); - } - clearPrefetchingTask(); - - // We can not reset mEnterAnimationComplete in onReload() because when docking the top - // task, we can receive the enter animation callback before onReload(), so reset it - // here onces Recents is not visible - mEnterAnimationComplete = false; - } - } - - public final void onBusEvent(ActivityPinnedEvent event) { - // If an activity enters PiP while Recents is open, remove the stack task associated with - // the new PiP task - Task removeTask = mStack.findTaskWithId(event.taskId); - if (removeTask != null) { - // In this case, we remove the task, but if the last task is removed, don't dismiss - // Recents to home - mStack.removeTask(removeTask, AnimationProps.IMMEDIATE, false /* fromDockGesture */, - false /* dismissRecentsIfAllRemoved */); - } - updateLayoutAlgorithm(false /* boundScroll */); - updateToInitialState(); - } - - public void reloadOnConfigurationChange() { - mStableLayoutAlgorithm.reloadOnConfigurationChange(getContext()); - mLayoutAlgorithm.reloadOnConfigurationChange(getContext()); - } - - /** - * Returns the insert index for the task in the current set of task views. If the given task - * is already in the task view list, then this method returns the insert index assuming it - * is first removed at the previous index. - * - * @param task the task we are finding the index for - * @param taskIndex the index of the task in the stack - */ - private int findTaskViewInsertIndex(Task task, int taskIndex) { - if (taskIndex != -1) { - List<TaskView> taskViews = getTaskViews(); - boolean foundTaskView = false; - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - Task tvTask = taskViews.get(i).getTask(); - if (tvTask == task) { - foundTaskView = true; - } else if (taskIndex < mStack.indexOfTask(tvTask)) { - if (foundTaskView) { - return i - 1; - } else { - return i; - } - } - } - } - return -1; - } - - private void launchTask(Task task) { - // Stop all animations - cancelAllTaskViewAnimations(); - - float curScroll = mStackScroller.getStackScroll(); - float targetScroll = mLayoutAlgorithm.getStackScrollForTaskAtInitialOffset(task); - float absScrollDiff = Math.abs(targetScroll - curScroll); - if (getChildViewForTask(task) == null || absScrollDiff > 0.35f) { - int duration = (int) (LAUNCH_NEXT_SCROLL_BASE_DURATION + - absScrollDiff * LAUNCH_NEXT_SCROLL_INCR_DURATION); - mStackScroller.animateScroll(targetScroll, - duration, new Runnable() { - @Override - public void run() { - EventBus.getDefault().send(new LaunchTaskEvent( - getChildViewForTask(task), task, null, - false /* screenPinningRequested */)); - } - }); - } else { - EventBus.getDefault().send(new LaunchTaskEvent(getChildViewForTask(task), task, null, - false /* screenPinningRequested */)); - } - } - - /** - * Check whether we should use the grid layout. - */ - public boolean useGridLayout() { - return mLayoutAlgorithm.useGridLayout(); - } - - /** - * Reads current system flags related to accessibility and screen pinning. - */ - private void readSystemFlags() { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - mTouchExplorationEnabled = ssp.isTouchExplorationEnabled(); - mScreenPinningEnabled = ActivityManagerWrapper.getInstance().isScreenPinningEnabled() - && !ActivityManagerWrapper.getInstance().isLockToAppActive(); - } - - private void updateStackActionButtonVisibility() { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - return; - } - - // Always show the button in grid layout. - if (useGridLayout() || - (mStackScroller.getStackScroll() < SHOW_STACK_ACTION_BUTTON_SCROLL_THRESHOLD && - mStack.getTaskCount() > 0)) { - EventBus.getDefault().send(new ShowStackActionButtonEvent(false /* translate */)); - } else { - EventBus.getDefault().send(new HideStackActionButtonEvent()); - } - } - - /** - * Returns the task to focus given the current launch state. - */ - private int getInitialFocusTaskIndex(RecentsActivityLaunchState launchState, int numTasks, - boolean useGridLayout) { - if (launchState.launchedFromApp) { - if (useGridLayout) { - // If coming from another app to the grid layout, focus the front most task - return numTasks - 1; - } - - // If coming from another app, focus the next task - return Math.max(0, numTasks - 2); - } else { - // If coming from home, focus the front most task - return numTasks - 1; - } - } - - /** - * Updates {@param transforms} to be the same size as {@param tasks}. - */ - private void matchTaskListSize(List<Task> tasks, List<TaskViewTransform> transforms) { - // We can reuse the task transforms where possible to reduce object allocation - int taskTransformCount = transforms.size(); - int taskCount = tasks.size(); - if (taskTransformCount < taskCount) { - // If there are less transforms than tasks, then add as many transforms as necessary - for (int i = taskTransformCount; i < taskCount; i++) { - transforms.add(new TaskViewTransform()); - } - } else if (taskTransformCount > taskCount) { - // If there are more transforms than tasks, then just subset the transform list - transforms.subList(taskCount, taskTransformCount).clear(); - } - } - - public void dump(String prefix, PrintWriter writer) { - String innerPrefix = prefix + " "; - String id = Integer.toHexString(System.identityHashCode(this)); - - writer.print(prefix); writer.print(TAG); - writer.print(" hasDefRelayout="); - writer.print(mDeferredTaskViewLayoutAnimation != null ? "Y" : "N"); - writer.print(" clipDirty="); writer.print(mTaskViewsClipDirty ? "Y" : "N"); - writer.print(" awaitingStackReload="); writer.print(mFinishedLayoutAfterStackReload ? "Y" : "N"); - writer.print(" initialState="); writer.print(mInitialState); - writer.print(" inMeasureLayout="); writer.print(mInMeasureLayout ? "Y" : "N"); - writer.print(" enterAnimCompleted="); writer.print(mEnterAnimationComplete ? "Y" : "N"); - writer.print(" touchExplorationOn="); writer.print(mTouchExplorationEnabled ? "Y" : "N"); - writer.print(" screenPinningOn="); writer.print(mScreenPinningEnabled ? "Y" : "N"); - writer.print(" numIgnoreTasks="); writer.print(mIgnoreTasks.size()); - writer.print(" numViewPool="); writer.print(mViewPool.getViews().size()); - writer.print(" stableStackBounds="); writer.print( - Utilities.dumpRect(mStableStackBounds)); - writer.print(" stackBounds="); writer.print( - Utilities.dumpRect(mStackBounds)); - writer.print(" stableWindow="); writer.print( - Utilities.dumpRect(mStableWindowRect)); - writer.print(" window="); writer.print(Utilities.dumpRect(mWindowRect)); - writer.print(" display="); writer.print(Utilities.dumpRect(mDisplayRect)); - writer.print(" orientation="); writer.print(mDisplayOrientation); - writer.print(" [0x"); writer.print(id); writer.print("]"); - writer.println(); - - if (mFocusedTask != null) { - writer.print(innerPrefix); - writer.print("Focused task: "); - mFocusedTask.dump("", writer); - } - - int numTaskViews = mTaskViews.size(); - for (int i = 0; i < numTaskViews; i++) { - mTaskViews.get(i).dump(innerPrefix, writer); - } - - mLayoutAlgorithm.dump(innerPrefix, writer); - mStackScroller.dump(innerPrefix, writer); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackViewScroller.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackViewScroller.java deleted file mode 100644 index 42efe59da54c..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackViewScroller.java +++ /dev/null @@ -1,347 +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.systemui.recents.views; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ObjectAnimator; -import android.animation.TimeInterpolator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.util.FloatProperty; -import android.util.Log; -import android.util.Property; -import android.view.ViewConfiguration; -import android.view.ViewDebug; -import android.widget.OverScroller; - -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.utilities.AnimationProps; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.recents.views.lowram.TaskStackLowRamLayoutAlgorithm; -import com.android.systemui.statusbar.FlingAnimationUtils; - -import java.io.PrintWriter; - -/* The scrolling logic for a TaskStackView */ -public class TaskStackViewScroller { - - private static final String TAG = "TaskStackViewScroller"; - private static final boolean DEBUG = false; - - public interface TaskStackViewScrollerCallbacks { - void onStackScrollChanged(float prevScroll, float curScroll, AnimationProps animation); - } - - /** - * A Property wrapper around the <code>stackScroll</code> functionality handled by the - * {@link #setStackScroll(float)} and - * {@link #getStackScroll()} methods. - */ - private static final Property<TaskStackViewScroller, Float> STACK_SCROLL = - new FloatProperty<TaskStackViewScroller>("stackScroll") { - @Override - public void setValue(TaskStackViewScroller object, float value) { - object.setStackScroll(value); - } - - @Override - public Float get(TaskStackViewScroller object) { - return object.getStackScroll(); - } - }; - - Context mContext; - TaskStackLayoutAlgorithm mLayoutAlgorithm; - TaskStackViewScrollerCallbacks mCb; - - @ViewDebug.ExportedProperty(category="recents") - float mStackScrollP; - @ViewDebug.ExportedProperty(category="recents") - float mLastDeltaP = 0f; - float mFlingDownScrollP; - int mFlingDownY; - - OverScroller mScroller; - ObjectAnimator mScrollAnimator; - float mFinalAnimatedScroll; - - final FlingAnimationUtils mFlingAnimationUtils; - - public TaskStackViewScroller(Context context, TaskStackViewScrollerCallbacks cb, - TaskStackLayoutAlgorithm layoutAlgorithm) { - mContext = context; - mCb = cb; - mScroller = new OverScroller(context); - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - mScroller.setFriction(0.06f); - } - mLayoutAlgorithm = layoutAlgorithm; - mFlingAnimationUtils = new FlingAnimationUtils(context, 0.3f); - } - - /** Resets the task scroller. */ - void reset() { - mStackScrollP = 0f; - mLastDeltaP = 0f; - } - - void resetDeltaScroll() { - mLastDeltaP = 0f; - } - - /** Gets the current stack scroll */ - public float getStackScroll() { - return mStackScrollP; - } - - /** - * Sets the current stack scroll immediately. - */ - public void setStackScroll(float s) { - setStackScroll(s, AnimationProps.IMMEDIATE); - } - - /** - * Sets the current stack scroll immediately, and returns the difference between the target - * scroll and the actual scroll after accounting for the effect on the focus state. - */ - public float setDeltaStackScroll(float downP, float deltaP) { - float targetScroll = downP + deltaP; - float newScroll = mLayoutAlgorithm.updateFocusStateOnScroll(downP + mLastDeltaP, targetScroll, - mStackScrollP); - setStackScroll(newScroll, AnimationProps.IMMEDIATE); - mLastDeltaP = deltaP; - return newScroll - targetScroll; - } - - /** - * Sets the current stack scroll, but indicates to the callback the preferred animation to - * update to this new scroll. - */ - public void setStackScroll(float newScroll, AnimationProps animation) { - float prevScroll = mStackScrollP; - mStackScrollP = newScroll; - if (mCb != null) { - mCb.onStackScrollChanged(prevScroll, mStackScrollP, animation); - } - } - - /** - * Sets the current stack scroll to the initial state when you first enter recents. - * @return whether the stack progress changed. - */ - public boolean setStackScrollToInitialState() { - float prevScroll = mStackScrollP; - setStackScroll(mLayoutAlgorithm.mInitialScrollP); - return Float.compare(prevScroll, mStackScrollP) != 0; - } - - /** - * Starts a fling that is coordinated with the {@link TaskStackViewTouchHandler}. - */ - public void fling(float downScrollP, int downY, int y, int velY, int minY, int maxY, - int overscroll) { - if (DEBUG) { - Log.d(TAG, "fling: " + downScrollP + ", downY: " + downY + ", y: " + y + - ", velY: " + velY + ", minY: " + minY + ", maxY: " + maxY); - } - mFlingDownScrollP = downScrollP; - mFlingDownY = downY; - mScroller.fling(0, y, 0, velY, 0, 0, minY, maxY, 0, overscroll); - } - - /** Bounds the current scroll if necessary */ - public boolean boundScroll() { - float curScroll = getStackScroll(); - float newScroll = getBoundedStackScroll(curScroll); - if (Float.compare(newScroll, curScroll) != 0) { - setStackScroll(newScroll); - return true; - } - return false; - } - - /** Returns the bounded stack scroll */ - float getBoundedStackScroll(float scroll) { - return Utilities.clamp(scroll, mLayoutAlgorithm.mMinScrollP, mLayoutAlgorithm.mMaxScrollP); - } - - /** Returns the amount that the absolute value of how much the scroll is out of bounds. */ - float getScrollAmountOutOfBounds(float scroll) { - if (scroll < mLayoutAlgorithm.mMinScrollP) { - return Math.abs(scroll - mLayoutAlgorithm.mMinScrollP); - } else if (scroll > mLayoutAlgorithm.mMaxScrollP) { - return Math.abs(scroll - mLayoutAlgorithm.mMaxScrollP); - } - return 0f; - } - - /** Returns whether the specified scroll is out of bounds */ - boolean isScrollOutOfBounds() { - return Float.compare(getScrollAmountOutOfBounds(mStackScrollP), 0f) != 0; - } - - /** - * Scrolls the closest task and snaps into place. Only used in recents for low ram devices. - * @param velocity of scroll - */ - void scrollToClosestTask(int velocity) { - float stackScroll = getStackScroll(); - - // Skip if not in low ram layout and if the scroll is out of min and max bounds - if (!LegacyRecentsImpl.getConfiguration().isLowRamDevice || stackScroll < mLayoutAlgorithm.mMinScrollP - || stackScroll > mLayoutAlgorithm.mMaxScrollP) { - return; - } - TaskStackLowRamLayoutAlgorithm algorithm = mLayoutAlgorithm.mTaskStackLowRamLayoutAlgorithm; - - float flingThreshold = ViewConfiguration.get(mContext).getScaledMinimumFlingVelocity(); - if (Math.abs(velocity) > flingThreshold) { - int minY = algorithm.percentageToScroll(mLayoutAlgorithm.mMinScrollP); - int maxY = algorithm.percentageToScroll(mLayoutAlgorithm.mMaxScrollP); - - // Calculate the fling and snap to closest task from final y position, computeScroll() - // never runs when cancelled with animateScroll() and the overscroll is not calculated - // here - fling(0 /* downScrollP */, 0 /* downY */, algorithm.percentageToScroll(stackScroll), - -velocity, minY, maxY, 0 /* overscroll */); - float pos = algorithm.scrollToPercentage(mScroller.getFinalY()); - - float newScrollP = algorithm.getClosestTaskP(pos, mLayoutAlgorithm.mNumStackTasks, - velocity); - ValueAnimator animator = ObjectAnimator.ofFloat(stackScroll, newScrollP); - mFlingAnimationUtils.apply(animator, algorithm.percentageToScroll(stackScroll), - algorithm.percentageToScroll(newScrollP), velocity); - animateScroll(newScrollP, (int) animator.getDuration(), animator.getInterpolator(), - null /* postRunnable */); - } else { - float newScrollP = algorithm.getClosestTaskP(stackScroll, - mLayoutAlgorithm.mNumStackTasks, velocity); - animateScroll(newScrollP, 300, Interpolators.ACCELERATE_DECELERATE, - null /* postRunnable */); - } - } - - /** Animates the stack scroll into bounds */ - ObjectAnimator animateBoundScroll() { - // TODO: Take duration for snap back - float curScroll = getStackScroll(); - float newScroll = getBoundedStackScroll(curScroll); - if (Float.compare(newScroll, curScroll) != 0) { - // Start a new scroll animation - animateScroll(newScroll, null /* postScrollRunnable */); - } - return mScrollAnimator; - } - - /** Animates the stack scroll */ - void animateScroll(float newScroll, final Runnable postRunnable) { - int duration = mContext.getResources().getInteger( - R.integer.recents_animate_task_stack_scroll_duration); - animateScroll(newScroll, duration, postRunnable); - } - - /** Animates the stack scroll */ - void animateScroll(float newScroll, int duration, final Runnable postRunnable) { - animateScroll(newScroll, duration, Interpolators.LINEAR_OUT_SLOW_IN, postRunnable); - } - - /** Animates the stack scroll with time interpolator */ - void animateScroll(float newScroll, int duration, TimeInterpolator interpolator, - final Runnable postRunnable) { - ObjectAnimator an = ObjectAnimator.ofFloat(this, STACK_SCROLL, getStackScroll(), newScroll); - an.setDuration(duration); - an.setInterpolator(interpolator); - animateScroll(newScroll, an, postRunnable); - } - - /** Animates the stack scroll with animator */ - private void animateScroll(float newScroll, ObjectAnimator animator, - final Runnable postRunnable) { - // Finish any current scrolling animations - if (mScrollAnimator != null && mScrollAnimator.isRunning()) { - setStackScroll(mFinalAnimatedScroll); - mScroller.forceFinished(true); - } - stopScroller(); - stopBoundScrollAnimation(); - - if (Float.compare(mStackScrollP, newScroll) != 0) { - mFinalAnimatedScroll = newScroll; - mScrollAnimator = animator; - mScrollAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - if (postRunnable != null) { - postRunnable.run(); - } - mScrollAnimator.removeAllListeners(); - } - }); - mScrollAnimator.start(); - } else { - if (postRunnable != null) { - postRunnable.run(); - } - } - } - - /** Aborts any current stack scrolls */ - void stopBoundScrollAnimation() { - Utilities.cancelAnimationWithoutCallbacks(mScrollAnimator); - } - - /**** OverScroller ****/ - - /** Called from the view draw, computes the next scroll. */ - boolean computeScroll() { - if (mScroller.computeScrollOffset()) { - float deltaP = mLayoutAlgorithm.getDeltaPForY(mFlingDownY, mScroller.getCurrY()); - mFlingDownScrollP += setDeltaStackScroll(mFlingDownScrollP, deltaP); - if (DEBUG) { - Log.d(TAG, "computeScroll: " + (mFlingDownScrollP + deltaP)); - } - return true; - } - return false; - } - - /** Returns whether the overscroller is scrolling. */ - boolean isScrolling() { - return !mScroller.isFinished(); - } - - float getScrollVelocity() { - return mScroller.getCurrVelocity(); - } - - /** Stops the scroller and any current fling. */ - void stopScroller() { - if (!mScroller.isFinished()) { - mScroller.abortAnimation(); - } - } - - public void dump(String prefix, PrintWriter writer) { - writer.print(prefix); writer.print(TAG); - writer.print(" stackScroll:"); writer.print(mStackScrollP); - writer.println(); - } -}
\ No newline at end of file diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java deleted file mode 100644 index a7fb4fae09ec..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java +++ /dev/null @@ -1,706 +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.systemui.recents.views; - -import android.animation.Animator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Path; -import android.util.ArrayMap; -import android.util.MutableBoolean; -import android.view.InputDevice; -import android.view.MotionEvent; -import android.view.VelocityTracker; -import android.view.View; -import android.view.ViewConfiguration; -import android.view.ViewDebug; -import android.view.ViewParent; -import android.view.animation.Interpolator; - -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.SwipeHelper; -import com.android.systemui.plugins.FalsingManager; -import com.android.systemui.recents.Constants; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.HideRecentsEvent; -import com.android.systemui.recents.events.ui.StackViewScrolledEvent; -import com.android.systemui.recents.events.ui.TaskViewDismissedEvent; -import com.android.systemui.recents.misc.FreePathInterpolator; -import com.android.systemui.recents.utilities.AnimationProps; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.statusbar.FlingAnimationUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * Handles touch events for a TaskStackView. - */ -class TaskStackViewTouchHandler implements SwipeHelper.Callback { - - private static final int INACTIVE_POINTER_ID = -1; - private static final float CHALLENGING_SWIPE_ESCAPE_VELOCITY = 800f; // dp/sec - // The min overscroll is the amount of task progress overscroll we want / the max overscroll - // curve value below - private static final float MAX_OVERSCROLL = 0.7f / 0.3f; - private static final Interpolator OVERSCROLL_INTERP; - static { - Path OVERSCROLL_PATH = new Path(); - OVERSCROLL_PATH.moveTo(0, 0); - OVERSCROLL_PATH.cubicTo(0.2f, 0.175f, 0.25f, 0.3f, 1f, 0.3f); - OVERSCROLL_INTERP = new FreePathInterpolator(OVERSCROLL_PATH); - } - - Context mContext; - TaskStackView mSv; - TaskStackViewScroller mScroller; - VelocityTracker mVelocityTracker; - FlingAnimationUtils mFlingAnimUtils; - ValueAnimator mScrollFlingAnimator; - - @ViewDebug.ExportedProperty(category="recents") - boolean mIsScrolling; - float mDownScrollP; - int mDownX, mDownY; - int mLastY; - int mActivePointerId = INACTIVE_POINTER_ID; - int mOverscrollSize; - TaskView mActiveTaskView = null; - - int mMinimumVelocity; - int mMaximumVelocity; - // The scroll touch slop is used to calculate when we start scrolling - int mScrollTouchSlop; - // Used to calculate when a tap is outside a task view rectangle. - final int mWindowTouchSlop; - - private final StackViewScrolledEvent mStackViewScrolledEvent = new StackViewScrolledEvent(); - - // The current and final set of task transforms, sized to match the list of tasks in the stack - private ArrayList<Task> mCurrentTasks = new ArrayList<>(); - private ArrayList<TaskViewTransform> mCurrentTaskTransforms = new ArrayList<>(); - private ArrayList<TaskViewTransform> mFinalTaskTransforms = new ArrayList<>(); - private ArrayMap<View, Animator> mSwipeHelperAnimations = new ArrayMap<>(); - private TaskViewTransform mTmpTransform = new TaskViewTransform(); - private float mTargetStackScroll; - - SwipeHelper mSwipeHelper; - boolean mInterceptedBySwipeHelper; - - public TaskStackViewTouchHandler(Context context, TaskStackView sv, - TaskStackViewScroller scroller, FalsingManager falsingManager) { - Resources res = context.getResources(); - ViewConfiguration configuration = ViewConfiguration.get(context); - mContext = context; - mSv = sv; - mScroller = scroller; - mMinimumVelocity = configuration.getScaledMinimumFlingVelocity(); - mMaximumVelocity = configuration.getScaledMaximumFlingVelocity(); - mScrollTouchSlop = configuration.getScaledTouchSlop(); - mWindowTouchSlop = configuration.getScaledWindowTouchSlop(); - mFlingAnimUtils = new FlingAnimationUtils(context, 0.2f); - mOverscrollSize = res.getDimensionPixelSize(R.dimen.recents_fling_overscroll_distance); - mSwipeHelper = new SwipeHelper(SwipeHelper.X, this, context, falsingManager) { - @Override - protected float getSize(View v) { - return getScaledDismissSize(); - } - - @Override - protected void prepareDismissAnimation(View v, Animator anim) { - mSwipeHelperAnimations.put(v, anim); - } - - @Override - protected void prepareSnapBackAnimation(View v, Animator anim) { - anim.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); - mSwipeHelperAnimations.put(v, anim); - } - - @Override - protected float getUnscaledEscapeVelocity() { - return CHALLENGING_SWIPE_ESCAPE_VELOCITY; - } - - @Override - protected long getMaxEscapeAnimDuration() { - return 700; - } - }; - mSwipeHelper.setDisableHardwareLayers(true); - } - - /** Velocity tracker helpers */ - void initOrResetVelocityTracker() { - if (mVelocityTracker == null) { - mVelocityTracker = VelocityTracker.obtain(); - } else { - mVelocityTracker.clear(); - } - } - void recycleVelocityTracker() { - if (mVelocityTracker != null) { - mVelocityTracker.recycle(); - mVelocityTracker = null; - } - } - - /** Touch preprocessing for handling below */ - public boolean onInterceptTouchEvent(MotionEvent ev) { - // Pass through to swipe helper if we are swiping - mInterceptedBySwipeHelper = isSwipingEnabled() && mSwipeHelper.onInterceptTouchEvent(ev); - if (mInterceptedBySwipeHelper) { - return true; - } - - return handleTouchEvent(ev); - } - - /** Handles touch events once we have intercepted them */ - public boolean onTouchEvent(MotionEvent ev) { - // Pass through to swipe helper if we are swiping - if (mInterceptedBySwipeHelper && mSwipeHelper.onTouchEvent(ev)) { - return true; - } - - handleTouchEvent(ev); - return true; - } - - /** - * Finishes all scroll-fling and non-dismissing animations currently running. - */ - public void cancelNonDismissTaskAnimations() { - Utilities.cancelAnimationWithoutCallbacks(mScrollFlingAnimator); - if (!mSwipeHelperAnimations.isEmpty()) { - // For the non-dismissing tasks, freeze the position into the task overrides - List<TaskView> taskViews = mSv.getTaskViews(); - for (int i = taskViews.size() - 1; i >= 0; i--) { - TaskView tv = taskViews.get(i); - - if (mSv.isIgnoredTask(tv.getTask())) { - continue; - } - - tv.cancelTransformAnimation(); - mSv.getStackAlgorithm().addUnfocusedTaskOverride(tv, mTargetStackScroll); - } - mSv.getStackAlgorithm().setFocusState(TaskStackLayoutAlgorithm.STATE_UNFOCUSED); - // Update the scroll to the final scroll position from onBeginDrag() - mSv.getScroller().setStackScroll(mTargetStackScroll, null); - - mSwipeHelperAnimations.clear(); - } - mActiveTaskView = null; - } - - private boolean handleTouchEvent(MotionEvent ev) { - // Short circuit if we have no children - if (mSv.getTaskViews().size() == 0) { - return false; - } - - final TaskStackLayoutAlgorithm layoutAlgorithm = mSv.mLayoutAlgorithm; - int action = ev.getAction(); - switch (action & MotionEvent.ACTION_MASK) { - case MotionEvent.ACTION_DOWN: { - // Stop the current scroll if it is still flinging - mScroller.stopScroller(); - mScroller.stopBoundScrollAnimation(); - mScroller.resetDeltaScroll(); - cancelNonDismissTaskAnimations(); - mSv.cancelDeferredTaskViewLayoutAnimation(); - - // Save the touch down info - mDownX = (int) ev.getX(); - mDownY = (int) ev.getY(); - mLastY = mDownY; - mDownScrollP = mScroller.getStackScroll(); - mActivePointerId = ev.getPointerId(0); - mActiveTaskView = findViewAtPoint(mDownX, mDownY); - - // Initialize the velocity tracker - initOrResetVelocityTracker(); - mVelocityTracker.addMovement(ev); - break; - } - case MotionEvent.ACTION_POINTER_DOWN: { - final int index = ev.getActionIndex(); - mActivePointerId = ev.getPointerId(index); - mDownX = (int) ev.getX(index); - mDownY = (int) ev.getY(index); - mLastY = mDownY; - mDownScrollP = mScroller.getStackScroll(); - mScroller.resetDeltaScroll(); - mVelocityTracker.addMovement(ev); - break; - } - case MotionEvent.ACTION_MOVE: { - int activePointerIndex = ev.findPointerIndex(mActivePointerId); - if (activePointerIndex == -1) { - break; - } - int y = (int) ev.getY(activePointerIndex); - int x = (int) ev.getX(activePointerIndex); - if (!mIsScrolling) { - int yDiff = Math.abs(y - mDownY); - int xDiff = Math.abs(x - mDownX); - if (Math.abs(y - mDownY) > mScrollTouchSlop && yDiff > xDiff) { - mIsScrolling = true; - float stackScroll = mScroller.getStackScroll(); - List<TaskView> taskViews = mSv.getTaskViews(); - for (int i = taskViews.size() - 1; i >= 0; i--) { - layoutAlgorithm.addUnfocusedTaskOverride(taskViews.get(i).getTask(), - stackScroll); - } - layoutAlgorithm.setFocusState(TaskStackLayoutAlgorithm.STATE_UNFOCUSED); - - // Disallow parents from intercepting touch events - final ViewParent parent = mSv.getParent(); - if (parent != null) { - parent.requestDisallowInterceptTouchEvent(true); - } - - MetricsLogger.action(mSv.getContext(), MetricsEvent.OVERVIEW_SCROLL); - mLastY = mDownY = y; - } - } - if (mIsScrolling) { - // If we just move linearly on the screen, then that would map to 1/arclength - // of the curve, so just move the scroll proportional to that - float deltaP = layoutAlgorithm.getDeltaPForY(mDownY, y); - - // Modulate the overscroll to prevent users from pulling the stack too far - float minScrollP = layoutAlgorithm.mMinScrollP; - float maxScrollP = layoutAlgorithm.mMaxScrollP; - float curScrollP = mDownScrollP + deltaP; - if (curScrollP < minScrollP || curScrollP > maxScrollP) { - float clampedScrollP = Utilities.clamp(curScrollP, minScrollP, maxScrollP); - float overscrollP = (curScrollP - clampedScrollP); - float maxOverscroll = LegacyRecentsImpl.getConfiguration().isLowRamDevice - ? layoutAlgorithm.mTaskStackLowRamLayoutAlgorithm.getMaxOverscroll() - : MAX_OVERSCROLL; - float overscrollX = Math.abs(overscrollP) / maxOverscroll; - float interpX = OVERSCROLL_INTERP.getInterpolation(overscrollX); - curScrollP = clampedScrollP + Math.signum(overscrollP) * - (interpX * maxOverscroll); - } - mDownScrollP += mScroller.setDeltaStackScroll(mDownScrollP, - curScrollP - mDownScrollP); - mStackViewScrolledEvent.updateY(y - mLastY); - EventBus.getDefault().send(mStackViewScrolledEvent); - } - - mLastY = y; - mVelocityTracker.addMovement(ev); - break; - } - case MotionEvent.ACTION_POINTER_UP: { - int pointerIndex = ev.getActionIndex(); - int pointerId = ev.getPointerId(pointerIndex); - if (pointerId == mActivePointerId) { - // Select a new active pointer id and reset the motion state - final int newPointerIndex = (pointerIndex == 0) ? 1 : 0; - mActivePointerId = ev.getPointerId(newPointerIndex); - mDownX = (int) ev.getX(pointerIndex); - mDownY = (int) ev.getY(pointerIndex); - mLastY = mDownY; - mDownScrollP = mScroller.getStackScroll(); - } - mVelocityTracker.addMovement(ev); - break; - } - case MotionEvent.ACTION_UP: { - mVelocityTracker.addMovement(ev); - mVelocityTracker.computeCurrentVelocity(1000, mMaximumVelocity); - int activePointerIndex = ev.findPointerIndex(mActivePointerId); - int y = (int) ev.getY(activePointerIndex); - int velocity = (int) mVelocityTracker.getYVelocity(mActivePointerId); - if (mIsScrolling) { - if (mScroller.isScrollOutOfBounds()) { - mScroller.animateBoundScroll(); - } else if (Math.abs(velocity) > mMinimumVelocity && - !LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - float minY = mDownY + layoutAlgorithm.getYForDeltaP(mDownScrollP, - layoutAlgorithm.mMaxScrollP); - float maxY = mDownY + layoutAlgorithm.getYForDeltaP(mDownScrollP, - layoutAlgorithm.mMinScrollP); - mScroller.fling(mDownScrollP, mDownY, y, velocity, (int) minY, (int) maxY, - mOverscrollSize); - mSv.invalidate(); - } - - // Reset the focused task after the user has scrolled, but we have no scrolling - // in grid layout and therefore we don't want to reset the focus there. - if (!mSv.mTouchExplorationEnabled && !mSv.useGridLayout()) { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - mScroller.scrollToClosestTask(velocity); - } else { - mSv.resetFocusedTask(mSv.getFocusedTask()); - } - } - } else if (mActiveTaskView == null) { - // This tap didn't start on a task. - maybeHideRecentsFromBackgroundTap((int) ev.getX(), (int) ev.getY()); - } - - mActivePointerId = INACTIVE_POINTER_ID; - mIsScrolling = false; - recycleVelocityTracker(); - break; - } - case MotionEvent.ACTION_CANCEL: { - mActivePointerId = INACTIVE_POINTER_ID; - mIsScrolling = false; - recycleVelocityTracker(); - break; - } - } - return mIsScrolling; - } - - /** Hides recents if the up event at (x, y) is a tap on the background area. */ - void maybeHideRecentsFromBackgroundTap(int x, int y) { - // Ignore the up event if it's too far from its start position. The user might have been - // trying to scroll or swipe. - int dx = Math.abs(mDownX - x); - int dy = Math.abs(mDownY - y); - if (dx > mScrollTouchSlop || dy > mScrollTouchSlop) { - return; - } - - // Shift the tap position toward the center of the task stack and check to see if it would - // have hit a view. The user might have tried to tap on a task and missed slightly. - int shiftedX = x; - if (x > (mSv.getRight() - mSv.getLeft()) / 2) { - shiftedX -= mWindowTouchSlop; - } else { - shiftedX += mWindowTouchSlop; - } - if (findViewAtPoint(shiftedX, y) != null) { - return; - } - - // Disallow tapping above and below the stack to dismiss recents - if (x > mSv.mLayoutAlgorithm.mStackRect.left && x < mSv.mLayoutAlgorithm.mStackRect.right) { - return; - } - - // The user intentionally tapped on the background, which is like a tap on the "desktop". - // Hide recents and transition to the launcher. - EventBus.getDefault().send(new HideRecentsEvent(false, true)); - } - - /** Handles generic motion events */ - public boolean onGenericMotionEvent(MotionEvent ev) { - if ((ev.getSource() & InputDevice.SOURCE_CLASS_POINTER) == - InputDevice.SOURCE_CLASS_POINTER) { - int action = ev.getAction(); - switch (action & MotionEvent.ACTION_MASK) { - case MotionEvent.ACTION_SCROLL: - // Find the front most task and scroll the next task to the front - float vScroll = ev.getAxisValue(MotionEvent.AXIS_VSCROLL); - if (vScroll > 0) { - mSv.setRelativeFocusedTask(true, true /* stackTasksOnly */, - false /* animated */); - } else { - mSv.setRelativeFocusedTask(false, true /* stackTasksOnly */, - false /* animated */); - } - return true; - } - } - return false; - } - - /**** SwipeHelper Implementation ****/ - - @Override - public View getChildAtPosition(MotionEvent ev) { - TaskView tv = findViewAtPoint((int) ev.getX(), (int) ev.getY()); - if (tv != null && canChildBeDismissed(tv)) { - return tv; - } - return null; - } - - @Override - public boolean canChildBeDismissed(View v) { - // Disallow dismissing an already dismissed task - TaskView tv = (TaskView) v; - Task task = tv.getTask(); - return !mSwipeHelperAnimations.containsKey(v) && - (mSv.getStack().indexOfTask(task) != -1); - } - - /** - * Starts a manual drag that goes through the same swipe helper path. - */ - public void onBeginManualDrag(TaskView v) { - mActiveTaskView = v; - mSwipeHelperAnimations.put(v, null); - onBeginDrag(v); - } - - @Override - public void onBeginDrag(View v) { - TaskView tv = (TaskView) v; - - // Disable clipping with the stack while we are swiping - tv.setClipViewInStack(false); - // Disallow touch events from this task view - tv.setTouchEnabled(false); - // Disallow parents from intercepting touch events - final ViewParent parent = mSv.getParent(); - if (parent != null) { - parent.requestDisallowInterceptTouchEvent(true); - } - - // Add this task to the set of tasks we are deleting - mSv.addIgnoreTask(tv.getTask()); - - // Determine if we are animating the other tasks while dismissing this task - mCurrentTasks = new ArrayList<Task>(mSv.getStack().getTasks()); - MutableBoolean isFrontMostTask = new MutableBoolean(false); - Task anchorTask = mSv.findAnchorTask(mCurrentTasks, isFrontMostTask); - TaskStackLayoutAlgorithm layoutAlgorithm = mSv.getStackAlgorithm(); - TaskStackViewScroller stackScroller = mSv.getScroller(); - if (anchorTask != null) { - // Get the current set of task transforms - mSv.getCurrentTaskTransforms(mCurrentTasks, mCurrentTaskTransforms); - - // Get the stack scroll of the task to anchor to (since we are removing something, the - // front most task will be our anchor task) - float prevAnchorTaskScroll = 0; - boolean pullStackForward = mCurrentTasks.size() > 0; - if (pullStackForward) { - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - float index = layoutAlgorithm.getStackScrollForTask(anchorTask); - prevAnchorTaskScroll = mSv.getStackAlgorithm().mTaskStackLowRamLayoutAlgorithm - .getScrollPForTask((int) index); - } else { - prevAnchorTaskScroll = layoutAlgorithm.getStackScrollForTask(anchorTask); - } - } - - // Calculate where the views would be without the deleting tasks - mSv.updateLayoutAlgorithm(false /* boundScroll */); - - float newStackScroll = stackScroller.getStackScroll(); - if (isFrontMostTask.value) { - // Bound the stack scroll to pull tasks forward if necessary - newStackScroll = stackScroller.getBoundedStackScroll(newStackScroll); - } else if (pullStackForward) { - // Otherwise, offset the scroll by the movement of the anchor task - float anchorTaskScroll = - layoutAlgorithm.getStackScrollForTaskIgnoreOverrides(anchorTask); - if (LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - float index = layoutAlgorithm.getStackScrollForTask(anchorTask); - anchorTaskScroll = mSv.getStackAlgorithm().mTaskStackLowRamLayoutAlgorithm - .getScrollPForTask((int) index); - } - float stackScrollOffset = (anchorTaskScroll - prevAnchorTaskScroll); - if (layoutAlgorithm.getFocusState() != TaskStackLayoutAlgorithm.STATE_FOCUSED - && !LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - // If we are focused, we don't want the front task to move, but otherwise, we - // allow the back task to move up, and the front task to move back - stackScrollOffset *= 0.75f; - } - newStackScroll = stackScroller.getBoundedStackScroll(stackScroller.getStackScroll() - + stackScrollOffset); - } - - // Pick up the newly visible views, not including the deleting tasks - mSv.bindVisibleTaskViews(newStackScroll, true /* ignoreTaskOverrides */); - - // Get the final set of task transforms (with task removed) - mSv.getLayoutTaskTransforms(newStackScroll, TaskStackLayoutAlgorithm.STATE_UNFOCUSED, - mCurrentTasks, true /* ignoreTaskOverrides */, mFinalTaskTransforms); - - // Set the target to scroll towards upon dismissal - mTargetStackScroll = newStackScroll; - - /* - * Post condition: All views that will be visible as a part of the gesture are retrieved - * and at their initial positions. The stack is still at the current - * scroll, but the layout is updated without the task currently being - * dismissed. The final layout is in the unfocused stack state, which - * will be applied when the current task is dismissed. - */ - } - } - - @Override - public boolean updateSwipeProgress(View v, boolean dismissable, float swipeProgress) { - // Only update the swipe progress for the surrounding tasks if the dismiss animation was not - // preempted from a call to cancelNonDismissTaskAnimations - if ((mActiveTaskView == v || mSwipeHelperAnimations.containsKey(v)) && - !LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - updateTaskViewTransforms( - Interpolators.FAST_OUT_SLOW_IN.getInterpolation(swipeProgress)); - } - return true; - } - - /** - * Called after the {@link TaskView} is finished animating away. - */ - @Override - public void onChildDismissed(View v) { - TaskView tv = (TaskView) v; - - // Re-enable clipping with the stack (we will reuse this view) - tv.setClipViewInStack(true); - // Re-enable touch events from this task view - tv.setTouchEnabled(true); - // Update the scroll to the final scroll position before laying out the tasks during dismiss - if (mSwipeHelperAnimations.containsKey(v)) { - mSv.getScroller().setStackScroll(mTargetStackScroll, null); - } - // Remove the task view from the stack, ignoring the animation if we've started dragging - // again - EventBus.getDefault().send(new TaskViewDismissedEvent(tv.getTask(), tv, - mSwipeHelperAnimations.containsKey(v) - ? new AnimationProps(TaskStackView.DEFAULT_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN) - : null)); - // Only update the final scroll and layout state (set in onBeginDrag()) if the dismiss - // animation was not preempted from a call to cancelNonDismissTaskAnimations - if (mSwipeHelperAnimations.containsKey(v)) { - // Update the focus state to the final focus state - mSv.getStackAlgorithm().setFocusState(TaskStackLayoutAlgorithm.STATE_UNFOCUSED); - mSv.getStackAlgorithm().clearUnfocusedTaskOverrides(); - // Stop tracking this deletion animation - mSwipeHelperAnimations.remove(v); - } - // Keep track of deletions by keyboard - MetricsLogger.histogram(tv.getContext(), "overview_task_dismissed_source", - Constants.Metrics.DismissSourceSwipeGesture); - } - - /** - * Called after the {@link TaskView} is finished animating back into the list. - * onChildDismissed() calls. - */ - @Override - public void onChildSnappedBack(View v, float targetLeft) { - TaskView tv = (TaskView) v; - - // Re-enable clipping with the stack - tv.setClipViewInStack(true); - // Re-enable touch events from this task view - tv.setTouchEnabled(true); - - // Stop tracking this deleting task, and update the layout to include this task again. The - // stack scroll does not need to be reset, since the scroll has not actually changed in - // onBeginDrag(). - mSv.removeIgnoreTask(tv.getTask()); - mSv.updateLayoutAlgorithm(false /* boundScroll */); - mSv.relayoutTaskViews(AnimationProps.IMMEDIATE); - mSwipeHelperAnimations.remove(v); - } - - @Override - public void onDragCancelled(View v) { - // Do nothing - } - - @Override - public boolean isAntiFalsingNeeded() { - return false; - } - - @Override - public float getFalsingThresholdFactor() { - return 0; - } - - /** - * Interpolates the non-deleting tasks to their final transforms from their current transforms. - */ - private void updateTaskViewTransforms(float dismissFraction) { - List<TaskView> taskViews = mSv.getTaskViews(); - int taskViewCount = taskViews.size(); - for (int i = 0; i < taskViewCount; i++) { - TaskView tv = taskViews.get(i); - Task task = tv.getTask(); - - if (mSv.isIgnoredTask(task)) { - continue; - } - - int taskIndex = mCurrentTasks.indexOf(task); - if (taskIndex == -1) { - // If a task was added to the stack view after the start of the dismiss gesture, - // just ignore it - continue; - } - - TaskViewTransform fromTransform = mCurrentTaskTransforms.get(taskIndex); - TaskViewTransform toTransform = mFinalTaskTransforms.get(taskIndex); - - mTmpTransform.copyFrom(fromTransform); - // We only really need to interpolate the bounds, progress and translation - mTmpTransform.rect.set(Utilities.RECTF_EVALUATOR.evaluate(dismissFraction, - fromTransform.rect, toTransform.rect)); - mTmpTransform.dimAlpha = fromTransform.dimAlpha + (toTransform.dimAlpha - - fromTransform.dimAlpha) * dismissFraction; - mTmpTransform.viewOutlineAlpha = fromTransform.viewOutlineAlpha + - (toTransform.viewOutlineAlpha - fromTransform.viewOutlineAlpha) * - dismissFraction; - mTmpTransform.translationZ = fromTransform.translationZ + - (toTransform.translationZ - fromTransform.translationZ) * dismissFraction; - - mSv.updateTaskViewToTransform(tv, mTmpTransform, AnimationProps.IMMEDIATE); - } - } - - /** Returns the view at the specified coordinates */ - private TaskView findViewAtPoint(int x, int y) { - List<Task> tasks = mSv.getStack().getTasks(); - int taskCount = tasks.size(); - for (int i = taskCount - 1; i >= 0; i--) { - TaskView tv = mSv.getChildViewForTask(tasks.get(i)); - if (tv != null && tv.getVisibility() == View.VISIBLE) { - if (mSv.isTouchPointInView(x, y, tv)) { - return tv; - } - } - } - return null; - } - - /** - * Returns the scaled size used to calculate the dismiss fraction. - */ - public float getScaledDismissSize() { - return 1.5f * Math.max(mSv.getWidth(), mSv.getHeight()); - } - - /** - * Returns whether swiping is enabled. - */ - private boolean isSwipingEnabled() { - return !mSv.useGridLayout(); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskView.java deleted file mode 100644 index ab0bf9570ffd..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskView.java +++ /dev/null @@ -1,737 +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.systemui.recents.views; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Outline; -import android.graphics.Point; -import android.graphics.Rect; -import android.util.AttributeSet; -import android.util.FloatProperty; -import android.util.Property; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewDebug; -import android.view.ViewOutlineProvider; -import android.widget.TextView; -import android.widget.Toast; - -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsActivity; -import com.android.systemui.recents.RecentsConfiguration; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.LaunchTaskEvent; -import com.android.systemui.recents.events.ui.DismissTaskViewEvent; -import com.android.systemui.recents.events.ui.TaskViewDismissedEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndCancelledEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent; -import com.android.systemui.recents.misc.ReferenceCountedTrigger; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.utilities.AnimationProps; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.ThumbnailData; - -import java.io.PrintWriter; -import java.util.ArrayList; - -/** - * A {@link TaskView} represents a fixed view of a task. Because the TaskView's layout is directed - * solely by the {@link TaskStackView}, we make it a fixed size layout which allows relayouts down - * the view hierarchy, but not upwards from any of its children (the TaskView will relayout itself - * with the previous bounds if any child requests layout). - */ -public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks, - TaskStackAnimationHelper.Callbacks, View.OnClickListener, View.OnLongClickListener { - - /** The TaskView callbacks */ - interface TaskViewCallbacks { - void onTaskViewClipStateChanged(TaskView tv); - } - - /** - * The dim overlay is generally calculated from the task progress, but occasionally (like when - * launching) needs to be animated independently of the task progress. This call is only used - * when animating the task into Recents, when the header dim is already applied - */ - public static final Property<TaskView, Float> DIM_ALPHA_WITHOUT_HEADER = - new FloatProperty<TaskView>("dimAlphaWithoutHeader") { - @Override - public void setValue(TaskView tv, float dimAlpha) { - tv.setDimAlphaWithoutHeader(dimAlpha); - } - - @Override - public Float get(TaskView tv) { - return tv.getDimAlpha(); - } - }; - - /** - * The dim overlay is generally calculated from the task progress, but occasionally (like when - * launching) needs to be animated independently of the task progress. - */ - public static final Property<TaskView, Float> DIM_ALPHA = - new FloatProperty<TaskView>("dimAlpha") { - @Override - public void setValue(TaskView tv, float dimAlpha) { - tv.setDimAlpha(dimAlpha); - } - - @Override - public Float get(TaskView tv) { - return tv.getDimAlpha(); - } - }; - - /** - * The dim overlay is generally calculated from the task progress, but occasionally (like when - * launching) needs to be animated independently of the task progress. - */ - public static final Property<TaskView, Float> VIEW_OUTLINE_ALPHA = - new FloatProperty<TaskView>("viewOutlineAlpha") { - @Override - public void setValue(TaskView tv, float alpha) { - tv.getViewBounds().setAlpha(alpha); - } - - @Override - public Float get(TaskView tv) { - return tv.getViewBounds().getAlpha(); - } - }; - - @ViewDebug.ExportedProperty(category="recents") - private float mDimAlpha; - private float mActionButtonTranslationZ; - - @ViewDebug.ExportedProperty(deepExport=true, prefix="task_") - private Task mTask; - private boolean mTaskBound; - @ViewDebug.ExportedProperty(category="recents") - private boolean mClipViewInStack = true; - @ViewDebug.ExportedProperty(category="recents") - private boolean mTouchExplorationEnabled; - @ViewDebug.ExportedProperty(category="recents") - private boolean mIsDisabledInSafeMode; - @ViewDebug.ExportedProperty(deepExport=true, prefix="view_bounds_") - private AnimateableViewBounds mViewBounds; - - private AnimatorSet mTransformAnimation; - private ObjectAnimator mDimAnimator; - private ObjectAnimator mOutlineAnimator; - private final TaskViewTransform mTargetAnimationTransform = new TaskViewTransform(); - private ArrayList<Animator> mTmpAnimators = new ArrayList<>(); - - @ViewDebug.ExportedProperty(deepExport=true, prefix="thumbnail_") - protected TaskViewThumbnail mThumbnailView; - @ViewDebug.ExportedProperty(deepExport=true, prefix="header_") - protected TaskViewHeader mHeaderView; - private View mActionButtonView; - private View mIncompatibleAppToastView; - private TaskViewCallbacks mCb; - - @ViewDebug.ExportedProperty(category="recents") - private Point mDownTouchPos = new Point(); - - private Toast mDisabledAppToast; - - public TaskView(Context context) { - this(context, null); - } - - public TaskView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public TaskView(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public TaskView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - Resources res = context.getResources(); - mViewBounds = createOutlineProvider(); - if (config.fakeShadows) { - setBackground(new FakeShadowDrawable(res, config)); - } - setOutlineProvider(mViewBounds); - setOnLongClickListener(this); - setAccessibilityDelegate(new TaskViewAccessibilityDelegate(this)); - } - - /** Set callback */ - void setCallbacks(TaskViewCallbacks cb) { - mCb = cb; - } - - /** - * Called from RecentsActivity when it is relaunched. - */ - void onReload(boolean isResumingFromVisible) { - resetNoUserInteractionState(); - if (!isResumingFromVisible) { - resetViewProperties(); - } - } - - /** Gets the task */ - public Task getTask() { - return mTask; - } - - /* Create an outline provider to clip and outline the view */ - protected AnimateableViewBounds createOutlineProvider() { - return new AnimateableViewBounds(this, mContext.getResources().getDimensionPixelSize( - R.dimen.recents_task_view_shadow_rounded_corners_radius)); - } - - /** Returns the view bounds. */ - AnimateableViewBounds getViewBounds() { - return mViewBounds; - } - - @Override - protected void onFinishInflate() { - // Bind the views - mHeaderView = findViewById(R.id.task_view_bar); - mThumbnailView = findViewById(R.id.task_view_thumbnail); - mThumbnailView.updateClipToTaskBar(mHeaderView); - mActionButtonView = findViewById(R.id.lock_to_app_fab); - mActionButtonView.setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - // Set the outline to match the FAB background - outline.setOval(0, 0, mActionButtonView.getWidth(), mActionButtonView.getHeight()); - outline.setAlpha(0.35f); - } - }); - mActionButtonView.setOnClickListener(this); - mActionButtonTranslationZ = mActionButtonView.getTranslationZ(); - } - - /** - * Update the task view when the configuration changes. - */ - protected void onConfigurationChanged() { - mHeaderView.onConfigurationChanged(); - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - if (w > 0 && h > 0) { - mHeaderView.onTaskViewSizeChanged(w, h); - mThumbnailView.onTaskViewSizeChanged(w, h); - - mActionButtonView.setTranslationX(w - getMeasuredWidth()); - mActionButtonView.setTranslationY(h - getMeasuredHeight()); - } - } - - @Override - public boolean hasOverlappingRendering() { - return false; - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - if (ev.getAction() == MotionEvent.ACTION_DOWN) { - mDownTouchPos.set((int) (ev.getX() * getScaleX()), (int) (ev.getY() * getScaleY())); - } - return super.onInterceptTouchEvent(ev); - } - - @Override - protected void measureContents(int width, int height) { - int widthWithoutPadding = width - mPaddingLeft - mPaddingRight; - int heightWithoutPadding = height - mPaddingTop - mPaddingBottom; - int widthSpec = MeasureSpec.makeMeasureSpec(widthWithoutPadding, MeasureSpec.EXACTLY); - int heightSpec = MeasureSpec.makeMeasureSpec(heightWithoutPadding, MeasureSpec.EXACTLY); - - // Measure the content - measureChildren(widthSpec, heightSpec); - - setMeasuredDimension(width, height); - } - - void updateViewPropertiesToTaskTransform(TaskViewTransform toTransform, - AnimationProps toAnimation, ValueAnimator.AnimatorUpdateListener updateCallback) { - RecentsConfiguration config = LegacyRecentsImpl.getConfiguration(); - cancelTransformAnimation(); - - // Compose the animations for the transform - mTmpAnimators.clear(); - toTransform.applyToTaskView(this, mTmpAnimators, toAnimation, !config.fakeShadows); - if (toAnimation.isImmediate()) { - if (Float.compare(getDimAlpha(), toTransform.dimAlpha) != 0) { - setDimAlpha(toTransform.dimAlpha); - } - if (Float.compare(mViewBounds.getAlpha(), toTransform.viewOutlineAlpha) != 0) { - mViewBounds.setAlpha(toTransform.viewOutlineAlpha); - } - // Manually call back to the animator listener and update callback - if (toAnimation.getListener() != null) { - toAnimation.getListener().onAnimationEnd(null); - } - if (updateCallback != null) { - updateCallback.onAnimationUpdate(null); - } - } else { - // Both the progress and the update are a function of the bounds movement of the task - if (Float.compare(getDimAlpha(), toTransform.dimAlpha) != 0) { - mDimAnimator = ObjectAnimator.ofFloat(this, DIM_ALPHA, getDimAlpha(), - toTransform.dimAlpha); - mTmpAnimators.add(toAnimation.apply(AnimationProps.BOUNDS, mDimAnimator)); - } - if (Float.compare(mViewBounds.getAlpha(), toTransform.viewOutlineAlpha) != 0) { - mOutlineAnimator = ObjectAnimator.ofFloat(this, VIEW_OUTLINE_ALPHA, - mViewBounds.getAlpha(), toTransform.viewOutlineAlpha); - mTmpAnimators.add(toAnimation.apply(AnimationProps.BOUNDS, mOutlineAnimator)); - } - if (updateCallback != null) { - ValueAnimator updateCallbackAnim = ValueAnimator.ofInt(0, 1); - updateCallbackAnim.addUpdateListener(updateCallback); - mTmpAnimators.add(toAnimation.apply(AnimationProps.BOUNDS, updateCallbackAnim)); - } - - // Create the animator - mTransformAnimation = toAnimation.createAnimator(mTmpAnimators); - mTransformAnimation.start(); - mTargetAnimationTransform.copyFrom(toTransform); - } - } - - /** Resets this view's properties */ - void resetViewProperties() { - cancelTransformAnimation(); - setDimAlpha(0); - setVisibility(View.VISIBLE); - getViewBounds().reset(); - getHeaderView().reset(); - TaskViewTransform.reset(this); - - mActionButtonView.setScaleX(1f); - mActionButtonView.setScaleY(1f); - mActionButtonView.setAlpha(0f); - mActionButtonView.setTranslationX(0f); - mActionButtonView.setTranslationY(0f); - mActionButtonView.setTranslationZ(mActionButtonTranslationZ); - if (mIncompatibleAppToastView != null) { - mIncompatibleAppToastView.setVisibility(View.INVISIBLE); - } - } - - /** - * @return whether we are animating towards {@param transform} - */ - boolean isAnimatingTo(TaskViewTransform transform) { - return mTransformAnimation != null && mTransformAnimation.isStarted() - && mTargetAnimationTransform.isSame(transform); - } - - /** - * Cancels any current transform animations. - */ - public void cancelTransformAnimation() { - cancelDimAnimationIfExists(); - Utilities.cancelAnimationWithoutCallbacks(mTransformAnimation); - Utilities.cancelAnimationWithoutCallbacks(mOutlineAnimator); - } - - private void cancelDimAnimationIfExists() { - if (mDimAnimator != null) { - mDimAnimator.cancel(); - } - } - - /** Enables/disables handling touch on this task view. */ - public void setTouchEnabled(boolean enabled) { - setOnClickListener(enabled ? this : null); - } - - /** Animates this task view if the user does not interact with the stack after a certain time. */ - public void startNoUserInteractionAnimation() { - mHeaderView.startNoUserInteractionAnimation(); - } - - /** Mark this task view that the user does has not interacted with the stack after a certain time. */ - void setNoUserInteractionState() { - mHeaderView.setNoUserInteractionState(); - } - - /** Resets the state tracking that the user has not interacted with the stack after a certain time. */ - void resetNoUserInteractionState() { - mHeaderView.resetNoUserInteractionState(); - } - - /** Dismisses this task. */ - void dismissTask() { - // Animate out the view and call the callback - final TaskView tv = this; - DismissTaskViewEvent dismissEvent = new DismissTaskViewEvent(tv); - dismissEvent.addPostAnimationCallback(new Runnable() { - @Override - public void run() { - EventBus.getDefault().send(new TaskViewDismissedEvent(mTask, tv, - new AnimationProps(TaskStackView.DEFAULT_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN))); - } - }); - EventBus.getDefault().send(dismissEvent); - } - - /** - * Returns whether this view should be clipped, or any views below should clip against this - * view. - */ - boolean shouldClipViewInStack() { - if (getVisibility() != View.VISIBLE || LegacyRecentsImpl.getConfiguration().isLowRamDevice) { - return false; - } - return mClipViewInStack; - } - - /** Sets whether this view should be clipped, or clipped against. */ - void setClipViewInStack(boolean clip) { - if (clip != mClipViewInStack) { - mClipViewInStack = clip; - if (mCb != null) { - mCb.onTaskViewClipStateChanged(this); - } - } - } - - public TaskViewHeader getHeaderView() { - return mHeaderView; - } - - /** - * Sets the current dim. - */ - public void setDimAlpha(float dimAlpha) { - mDimAlpha = dimAlpha; - mThumbnailView.setDimAlpha(dimAlpha); - mHeaderView.setDimAlpha(dimAlpha); - } - - /** - * Sets the current dim without updating the header's dim. - */ - public void setDimAlphaWithoutHeader(float dimAlpha) { - mDimAlpha = dimAlpha; - mThumbnailView.setDimAlpha(dimAlpha); - } - - /** - * Returns the current dim. - */ - public float getDimAlpha() { - return mDimAlpha; - } - - /** - * Explicitly sets the focused state of this task. - */ - public void setFocusedState(boolean isFocused, boolean requestViewFocus) { - if (isFocused) { - if (requestViewFocus && !isFocused()) { - requestFocus(); - } - } else { - if (isAccessibilityFocused() && mTouchExplorationEnabled) { - clearAccessibilityFocus(); - } - } - } - - /** - * Shows the action button. - * @param fadeIn whether or not to animate the action button in. - * @param fadeInDuration the duration of the action button animation, only used if - * {@param fadeIn} is true. - */ - public void showActionButton(boolean fadeIn, int fadeInDuration) { - mActionButtonView.setVisibility(View.VISIBLE); - - if (fadeIn && mActionButtonView.getAlpha() < 1f) { - mActionButtonView.animate() - .alpha(1f) - .scaleX(1f) - .scaleY(1f) - .setDuration(fadeInDuration) - .setInterpolator(Interpolators.ALPHA_IN) - .start(); - } else { - mActionButtonView.setScaleX(1f); - mActionButtonView.setScaleY(1f); - mActionButtonView.setAlpha(1f); - mActionButtonView.setTranslationZ(mActionButtonTranslationZ); - } - } - - /** - * Immediately hides the action button. - * - * @param fadeOut whether or not to animate the action button out. - */ - public void hideActionButton(boolean fadeOut, int fadeOutDuration, boolean scaleDown, - final Animator.AnimatorListener animListener) { - if (fadeOut && mActionButtonView.getAlpha() > 0f) { - if (scaleDown) { - float toScale = 0.9f; - mActionButtonView.animate() - .scaleX(toScale) - .scaleY(toScale); - } - mActionButtonView.animate() - .alpha(0f) - .setDuration(fadeOutDuration) - .setInterpolator(Interpolators.ALPHA_OUT) - .withEndAction(new Runnable() { - @Override - public void run() { - if (animListener != null) { - animListener.onAnimationEnd(null); - } - mActionButtonView.setVisibility(View.INVISIBLE); - } - }) - .start(); - } else { - mActionButtonView.setAlpha(0f); - mActionButtonView.setVisibility(View.INVISIBLE); - if (animListener != null) { - animListener.onAnimationEnd(null); - } - } - } - - /**** TaskStackAnimationHelper.Callbacks Implementation ****/ - - @Override - public void onPrepareLaunchTargetForEnterAnimation() { - // These values will be animated in when onStartLaunchTargetEnterAnimation() is called - setDimAlphaWithoutHeader(0); - mActionButtonView.setAlpha(0f); - if (mIncompatibleAppToastView != null && - mIncompatibleAppToastView.getVisibility() == View.VISIBLE) { - mIncompatibleAppToastView.setAlpha(0f); - } - } - - @Override - public void onStartLaunchTargetEnterAnimation(TaskViewTransform transform, int duration, - boolean screenPinningEnabled, ReferenceCountedTrigger postAnimationTrigger) { - cancelDimAnimationIfExists(); - - // Dim the view after the app window transitions down into recents - postAnimationTrigger.increment(); - AnimationProps animation = new AnimationProps(duration, Interpolators.ALPHA_OUT); - mDimAnimator = animation.apply(AnimationProps.DIM_ALPHA, ObjectAnimator.ofFloat(this, - DIM_ALPHA_WITHOUT_HEADER, getDimAlpha(), transform.dimAlpha)); - mDimAnimator.addListener(postAnimationTrigger.decrementOnAnimationEnd()); - mDimAnimator.start(); - - if (screenPinningEnabled) { - showActionButton(true /* fadeIn */, duration /* fadeInDuration */); - } - - if (mIncompatibleAppToastView != null && - mIncompatibleAppToastView.getVisibility() == View.VISIBLE) { - mIncompatibleAppToastView.animate() - .alpha(1f) - .setDuration(duration) - .setInterpolator(Interpolators.ALPHA_IN) - .start(); - } - } - - @Override - public void onStartLaunchTargetLaunchAnimation(int duration, boolean screenPinningRequested, - ReferenceCountedTrigger postAnimationTrigger) { - Utilities.cancelAnimationWithoutCallbacks(mDimAnimator); - - // Un-dim the view before/while launching the target - AnimationProps animation = new AnimationProps(duration, Interpolators.ALPHA_OUT); - mDimAnimator = animation.apply(AnimationProps.DIM_ALPHA, ObjectAnimator.ofFloat(this, - DIM_ALPHA, getDimAlpha(), 0)); - mDimAnimator.start(); - - postAnimationTrigger.increment(); - hideActionButton(true /* fadeOut */, duration, - !screenPinningRequested /* scaleDown */, - postAnimationTrigger.decrementOnAnimationEnd()); - } - - @Override - public void onStartFrontTaskEnterAnimation(boolean screenPinningEnabled) { - if (screenPinningEnabled) { - showActionButton(false /* fadeIn */, 0 /* fadeInDuration */); - } - } - - /**** TaskCallbacks Implementation ****/ - - public void onTaskBound(Task t, boolean touchExplorationEnabled, int displayOrientation, - Rect displayRect) { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - mTouchExplorationEnabled = touchExplorationEnabled; - mTask = t; - mTaskBound = true; - mTask.addCallback(this); - mIsDisabledInSafeMode = !mTask.isSystemApp && ssp.isInSafeMode(); - mThumbnailView.bindToTask(mTask, mIsDisabledInSafeMode, displayOrientation, displayRect); - mHeaderView.bindToTask(mTask, mTouchExplorationEnabled, mIsDisabledInSafeMode); - - if (!t.isDockable && ssp.hasDockedTask()) { - if (mIncompatibleAppToastView == null) { - mIncompatibleAppToastView = Utilities.findViewStubById(this, - R.id.incompatible_app_toast_stub).inflate(); - TextView msg = findViewById(com.android.internal.R.id.message); - msg.setText(R.string.dock_non_resizeble_failed_to_dock_text); - } - mIncompatibleAppToastView.setVisibility(View.VISIBLE); - } else if (mIncompatibleAppToastView != null) { - mIncompatibleAppToastView.setVisibility(View.INVISIBLE); - } - } - - @Override - public void onTaskDataLoaded(Task task, ThumbnailData thumbnailData) { - if (mTaskBound) { - // Update each of the views to the new task data - mThumbnailView.onTaskDataLoaded(thumbnailData); - mHeaderView.onTaskDataLoaded(); - } - } - - @Override - public void onTaskDataUnloaded() { - // Unbind each of the views from the task and remove the task callback - mTask.removeCallback(this); - mThumbnailView.unbindFromTask(); - mHeaderView.unbindFromTask(mTouchExplorationEnabled); - mTaskBound = false; - } - - @Override - public void onTaskWindowingModeChanged() { - // Force rebind the header, the thumbnail does not change due to stack changes - mHeaderView.bindToTask(mTask, mTouchExplorationEnabled, mIsDisabledInSafeMode); - mHeaderView.onTaskDataLoaded(); - } - - /**** View.OnClickListener Implementation ****/ - - @Override - public void onClick(final View v) { - if (mIsDisabledInSafeMode) { - Context context = getContext(); - String msg = context.getString(R.string.recents_launch_disabled_message, mTask.title); - if (mDisabledAppToast != null) { - mDisabledAppToast.cancel(); - } - mDisabledAppToast = Toast.makeText(context, msg, Toast.LENGTH_SHORT); - mDisabledAppToast.show(); - return; - } - - boolean screenPinningRequested = false; - if (v == mActionButtonView) { - // Reset the translation of the action button before we animate it out - mActionButtonView.setTranslationZ(0f); - screenPinningRequested = true; - } - EventBus.getDefault().send(new LaunchTaskEvent(this, mTask, null, screenPinningRequested)); - - MetricsLogger.action(v.getContext(), MetricsEvent.ACTION_OVERVIEW_SELECT, - mTask.key.getComponent().toString()); - } - - /**** View.OnLongClickListener Implementation ****/ - - @Override - public boolean onLongClick(View v) { - if (!LegacyRecentsImpl.getConfiguration().dragToSplitEnabled) { - return false; - } - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - boolean inBounds = false; - Rect clipBounds = new Rect(mViewBounds.getClipBounds()); - if (!clipBounds.isEmpty()) { - // If we are clipping the view to the bounds, manually do the hit test. - clipBounds.scale(getScaleX()); - inBounds = clipBounds.contains(mDownTouchPos.x, mDownTouchPos.y); - } else { - // Otherwise just make sure we're within the view's bounds. - inBounds = mDownTouchPos.x <= getWidth() && mDownTouchPos.y <= getHeight(); - } - if (v == this && inBounds && !ssp.hasDockedTask()) { - // Start listening for drag events - setClipViewInStack(false); - - mDownTouchPos.x += ((1f - getScaleX()) * getWidth()) / 2; - mDownTouchPos.y += ((1f - getScaleY()) * getHeight()) / 2; - - EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1); - EventBus.getDefault().send(new DragStartEvent(mTask, this, mDownTouchPos)); - return true; - } - return false; - } - - /**** Events ****/ - - public final void onBusEvent(DragEndEvent event) { - if (!(event.dropTarget instanceof DockState)) { - event.addPostAnimationCallback(() -> { - // Reset the clip state for the drag view after the end animation completes - setClipViewInStack(true); - }); - } - EventBus.getDefault().unregister(this); - } - - public final void onBusEvent(DragEndCancelledEvent event) { - // Reset the clip state for the drag view after the cancel animation completes - event.addPostAnimationCallback(() -> { - setClipViewInStack(true); - }); - } - - public void dump(String prefix, PrintWriter writer) { - String innerPrefix = prefix + " "; - - writer.print(prefix); writer.print("TaskView"); - writer.print(" mTask="); writer.print(mTask.key.id); - writer.println(); - - mThumbnailView.dump(innerPrefix, writer); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java deleted file mode 100644 index 7bcad75cefcf..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java +++ /dev/null @@ -1,94 +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.recents.views; - -import android.app.ActivityTaskManager; -import android.content.Context; -import android.graphics.Point; -import android.os.Bundle; -import android.util.SparseArray; -import android.view.View; -import android.view.accessibility.AccessibilityNodeInfo; -import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; -import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent; - -public class TaskViewAccessibilityDelegate extends View.AccessibilityDelegate { - private static final String TAG = "TaskViewAccessibilityDelegate"; - - private final TaskView mTaskView; - - protected static final int SPLIT_TASK_TOP = R.id.action_split_task_to_top; - protected static final int SPLIT_TASK_LEFT = R.id.action_split_task_to_left; - protected static final int SPLIT_TASK_RIGHT = R.id.action_split_task_to_right; - - protected final SparseArray<AccessibilityAction> mActions = new SparseArray<>(); - - public TaskViewAccessibilityDelegate(TaskView taskView) { - mTaskView = taskView; - Context context = taskView.getContext(); - mActions.put(SPLIT_TASK_TOP, new AccessibilityAction(SPLIT_TASK_TOP, - context.getString(R.string.recents_accessibility_split_screen_top))); - mActions.put(SPLIT_TASK_LEFT, new AccessibilityAction(SPLIT_TASK_LEFT, - context.getString(R.string.recents_accessibility_split_screen_left))); - mActions.put(SPLIT_TASK_RIGHT, new AccessibilityAction(SPLIT_TASK_RIGHT, - context.getString(R.string.recents_accessibility_split_screen_right))); - } - - @Override - public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { - super.onInitializeAccessibilityNodeInfo(host, info); - if (ActivityTaskManager.supportsSplitScreenMultiWindow(mTaskView.getContext()) - && !LegacyRecentsImpl.getSystemServices().hasDockedTask()) { - DockState[] dockStates = LegacyRecentsImpl.getConfiguration() - .getDockStatesForCurrentOrientation(); - for (DockState dockState: dockStates) { - if (dockState == DockState.TOP) { - info.addAction(mActions.get(SPLIT_TASK_TOP)); - } else if (dockState == DockState.LEFT) { - info.addAction(mActions.get(SPLIT_TASK_LEFT)); - } else if (dockState == DockState.RIGHT) { - info.addAction(mActions.get(SPLIT_TASK_RIGHT)); - } - } - } - } - - @Override - public boolean performAccessibilityAction(View host, int action, Bundle args) { - if (action == SPLIT_TASK_TOP) { - simulateDragIntoMultiwindow(DockState.TOP); - } else if (action == SPLIT_TASK_LEFT) { - simulateDragIntoMultiwindow(DockState.LEFT); - } else if (action == SPLIT_TASK_RIGHT) { - simulateDragIntoMultiwindow(DockState.RIGHT); - } else { - return super.performAccessibilityAction(host, action, args); - } - return true; - } - - /** Simulate a user drag event to split the screen to the respected side */ - private void simulateDragIntoMultiwindow(DockState dockState) { - EventBus.getDefault().send(new DragStartEvent(mTaskView.getTask(), mTaskView, - new Point(0,0), false /* isUserTouchInitiated */)); - EventBus.getDefault().send(new DragEndEvent(mTaskView.getTask(), mTaskView, dockState)); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewHeader.java deleted file mode 100644 index 21c0234121c4..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewHeader.java +++ /dev/null @@ -1,685 +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.systemui.recents.views; - -import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.annotation.Nullable; -import android.app.AppGlobals; -import android.content.ComponentName; -import android.content.Context; -import android.content.pm.ActivityInfo; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.ColorFilter; -import android.graphics.Paint; -import android.graphics.PixelFormat; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.RippleDrawable; -import android.os.CountDownTimer; -import androidx.core.graphics.ColorUtils; -import android.util.AttributeSet; -import android.util.IconDrawableFactory; -import android.view.Gravity; -import android.view.View; -import android.view.ViewAnimationUtils; -import android.view.ViewDebug; -import android.view.ViewGroup; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.TextView; - -import com.android.internal.logging.MetricsLogger; -import com.android.systemui.Interpolators; -import com.android.systemui.R; -import com.android.systemui.recents.Constants; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.activity.LaunchTaskEvent; -import com.android.systemui.recents.events.ui.ShowApplicationInfoEvent; -import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.shared.system.ActivityManagerWrapper; -import com.android.systemui.shared.system.PackageManagerWrapper; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; - -/* The task bar view */ -public class TaskViewHeader extends FrameLayout - implements View.OnClickListener, View.OnLongClickListener { - - private static IconDrawableFactory sDrawableFactory; - - private static final float HIGHLIGHT_LIGHTNESS_INCREMENT = 0.075f; - private static final float OVERLAY_LIGHTNESS_INCREMENT = -0.0625f; - private static final int OVERLAY_REVEAL_DURATION = 250; - private static final long FOCUS_INDICATOR_INTERVAL_MS = 30; - - /** - * A color drawable that draws a slight highlight at the top to help it stand out. - */ - private class HighlightColorDrawable extends Drawable { - - private Paint mHighlightPaint = new Paint(); - private Paint mBackgroundPaint = new Paint(); - private int mColor; - private float mDimAlpha; - - public HighlightColorDrawable() { - mBackgroundPaint.setColor(Color.argb(255, 0, 0, 0)); - mBackgroundPaint.setAntiAlias(true); - mHighlightPaint.setColor(Color.argb(255, 255, 255, 255)); - mHighlightPaint.setAntiAlias(true); - } - - public void setColorAndDim(int color, float dimAlpha) { - if (mColor != color || Float.compare(mDimAlpha, dimAlpha) != 0) { - mColor = color; - mDimAlpha = dimAlpha; - if (mShouldDarkenBackgroundColor) { - color = getSecondaryColor(color, false /* useLightOverlayColor */); - } - mBackgroundPaint.setColor(color); - - ColorUtils.colorToHSL(color, mTmpHSL); - // TODO: Consider using the saturation of the color to adjust the lightness as well - mTmpHSL[2] = Math.min(1f, - mTmpHSL[2] + HIGHLIGHT_LIGHTNESS_INCREMENT * (1.0f - dimAlpha)); - mHighlightPaint.setColor(ColorUtils.HSLToColor(mTmpHSL)); - - invalidateSelf(); - } - } - - @Override - public void setColorFilter(@Nullable ColorFilter colorFilter) { - // Do nothing - } - - @Override - public void setAlpha(int alpha) { - // Do nothing - } - - @Override - public void draw(Canvas canvas) { - // Draw the highlight at the top edge (but put the bottom edge just out of view) - canvas.drawRoundRect(0, 0, mTaskViewRect.width(), - 2 * Math.max(mHighlightHeight, mCornerRadius), - mCornerRadius, mCornerRadius, mHighlightPaint); - - // Draw the background with the rounded corners - canvas.drawRoundRect(0, mHighlightHeight, mTaskViewRect.width(), - getHeight() + mCornerRadius, - mCornerRadius, mCornerRadius, mBackgroundPaint); - } - - @Override - public int getOpacity() { - return PixelFormat.OPAQUE; - } - - public int getColor() { - return mColor; - } - } - - Task mTask; - - // Header views - ImageView mIconView; - TextView mTitleView; - ImageView mMoveTaskButton; - ImageView mDismissButton; - FrameLayout mAppOverlayView; - ImageView mAppIconView; - ImageView mAppInfoView; - TextView mAppTitleView; - ProgressBar mFocusTimerIndicator; - - // Header drawables - @ViewDebug.ExportedProperty(category="recents") - Rect mTaskViewRect = new Rect(); - int mHeaderBarHeight; - int mHeaderButtonPadding; - int mCornerRadius; - int mHighlightHeight; - @ViewDebug.ExportedProperty(category="recents") - float mDimAlpha; - Drawable mLightDismissDrawable; - Drawable mDarkDismissDrawable; - Drawable mLightFullscreenIcon; - Drawable mDarkFullscreenIcon; - Drawable mLightInfoIcon; - Drawable mDarkInfoIcon; - int mTaskBarViewLightTextColor; - int mTaskBarViewDarkTextColor; - int mDisabledTaskBarBackgroundColor; - String mDismissDescFormat; - String mAppInfoDescFormat; - int mTaskWindowingMode = WINDOWING_MODE_UNDEFINED; - - // Header background - private HighlightColorDrawable mBackground; - private HighlightColorDrawable mOverlayBackground; - private float[] mTmpHSL = new float[3]; - - // Header dim, which is only used when task view hardware layers are not used - private Paint mDimLayerPaint = new Paint(); - - // Whether the background color should be darkened to differentiate from the primary color. - // Used in grid layout. - private boolean mShouldDarkenBackgroundColor = false; - - private CountDownTimer mFocusTimerCountDown; - - public TaskViewHeader(Context context) { - this(context, null); - } - - public TaskViewHeader(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public TaskViewHeader(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public TaskViewHeader(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - setWillNotDraw(false); - - // Load the dismiss resources - Resources res = context.getResources(); - mLightDismissDrawable = context.getDrawable(R.drawable.recents_dismiss_light); - mDarkDismissDrawable = context.getDrawable(R.drawable.recents_dismiss_dark); - mCornerRadius = LegacyRecentsImpl.getConfiguration().isGridEnabled ? - res.getDimensionPixelSize(R.dimen.recents_grid_task_view_rounded_corners_radius) : - res.getDimensionPixelSize(R.dimen.recents_task_view_rounded_corners_radius); - mHighlightHeight = res.getDimensionPixelSize(R.dimen.recents_task_view_highlight); - mTaskBarViewLightTextColor = context.getColor(R.color.recents_task_bar_light_text_color); - mTaskBarViewDarkTextColor = context.getColor(R.color.recents_task_bar_dark_text_color); - mLightFullscreenIcon = context.getDrawable(R.drawable.recents_move_task_fullscreen_light); - mDarkFullscreenIcon = context.getDrawable(R.drawable.recents_move_task_fullscreen_dark); - mLightInfoIcon = context.getDrawable(R.drawable.recents_info_light); - mDarkInfoIcon = context.getDrawable(R.drawable.recents_info_dark); - mDisabledTaskBarBackgroundColor = - context.getColor(R.color.recents_task_bar_disabled_background_color); - mDismissDescFormat = mContext.getString( - R.string.accessibility_recents_item_will_be_dismissed); - mAppInfoDescFormat = mContext.getString(R.string.accessibility_recents_item_open_app_info); - - // Configure the background and dim - mBackground = new HighlightColorDrawable(); - mBackground.setColorAndDim(Color.argb(255, 0, 0, 0), 0f); - setBackground(mBackground); - mOverlayBackground = new HighlightColorDrawable(); - mDimLayerPaint.setColor(Color.argb(255, 0, 0, 0)); - mDimLayerPaint.setAntiAlias(true); - } - - /** - * Resets this header along with the TaskView. - */ - public void reset() { - hideAppOverlay(true /* immediate */); - } - - @Override - protected void onFinishInflate() { - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - - // Initialize the icon and description views - mIconView = findViewById(R.id.icon); - mIconView.setOnLongClickListener(this); - mTitleView = findViewById(R.id.title); - mDismissButton = findViewById(R.id.dismiss_task); - - onConfigurationChanged(); - } - - /** - * Programmatically sets the layout params for a header bar layout. This is necessary because - * we can't get resources based on the current configuration, but instead need to get them - * based on the device configuration. - */ - private void updateLayoutParams(View icon, View title, View secondaryButton, View button) { - FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, mHeaderBarHeight, Gravity.TOP); - setLayoutParams(lp); - lp = new FrameLayout.LayoutParams(mHeaderBarHeight, mHeaderBarHeight, Gravity.START); - icon.setLayoutParams(lp); - lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.START | Gravity.CENTER_VERTICAL); - lp.setMarginStart(mHeaderBarHeight); - lp.setMarginEnd(mMoveTaskButton != null - ? 2 * mHeaderBarHeight - : mHeaderBarHeight); - title.setLayoutParams(lp); - if (secondaryButton != null) { - lp = new FrameLayout.LayoutParams(mHeaderBarHeight, mHeaderBarHeight, Gravity.END); - lp.setMarginEnd(mHeaderBarHeight); - secondaryButton.setLayoutParams(lp); - secondaryButton.setPadding(mHeaderButtonPadding, mHeaderButtonPadding, - mHeaderButtonPadding, mHeaderButtonPadding); - } - lp = new FrameLayout.LayoutParams(mHeaderBarHeight, mHeaderBarHeight, Gravity.END); - button.setLayoutParams(lp); - button.setPadding(mHeaderButtonPadding, mHeaderButtonPadding, mHeaderButtonPadding, - mHeaderButtonPadding); - } - - /** - * Update the header view when the configuration changes. - */ - public void onConfigurationChanged() { - // Update the dimensions of everything in the header. We do this because we need to use - // resources for the display, and not the current configuration. - Resources res = getResources(); - int headerBarHeight = TaskStackLayoutAlgorithm.getDimensionForDevice(getContext(), - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height_tablet_land, - R.dimen.recents_task_view_header_height, - R.dimen.recents_task_view_header_height_tablet_land, - R.dimen.recents_grid_task_view_header_height); - int headerButtonPadding = TaskStackLayoutAlgorithm.getDimensionForDevice(getContext(), - R.dimen.recents_task_view_header_button_padding, - R.dimen.recents_task_view_header_button_padding, - R.dimen.recents_task_view_header_button_padding, - R.dimen.recents_task_view_header_button_padding_tablet_land, - R.dimen.recents_task_view_header_button_padding, - R.dimen.recents_task_view_header_button_padding_tablet_land, - R.dimen.recents_grid_task_view_header_button_padding); - if (headerBarHeight != mHeaderBarHeight || headerButtonPadding != mHeaderButtonPadding) { - mHeaderBarHeight = headerBarHeight; - mHeaderButtonPadding = headerButtonPadding; - updateLayoutParams(mIconView, mTitleView, mMoveTaskButton, mDismissButton); - if (mAppOverlayView != null) { - updateLayoutParams(mAppIconView, mAppTitleView, null, mAppInfoView); - } - } - } - - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - super.onLayout(changed, left, top, right, bottom); - - // Since we update the position of children based on the width of the parent and this view - // recompute these changes with the new view size - onTaskViewSizeChanged(mTaskViewRect.width(), mTaskViewRect.height()); - } - - /** - * Called when the task view frame changes, allowing us to move the contents of the header - * to match the frame changes. - */ - public void onTaskViewSizeChanged(int width, int height) { - mTaskViewRect.set(0, 0, width, height); - - boolean showTitle = true; - boolean showMoveIcon = true; - boolean showDismissIcon = true; - int rightInset = width - getMeasuredWidth(); - - mTitleView.setVisibility(showTitle ? View.VISIBLE : View.INVISIBLE); - if (mMoveTaskButton != null) { - mMoveTaskButton.setVisibility(showMoveIcon ? View.VISIBLE : View.INVISIBLE); - mMoveTaskButton.setTranslationX(rightInset); - } - mDismissButton.setVisibility(showDismissIcon ? View.VISIBLE : View.INVISIBLE); - mDismissButton.setTranslationX(rightInset); - - setLeftTopRightBottom(0, 0, width, getMeasuredHeight()); - } - - @Override - public void onDrawForeground(Canvas canvas) { - super.onDrawForeground(canvas); - - // Draw the dim layer with the rounded corners - canvas.drawRoundRect(0, 0, mTaskViewRect.width(), getHeight() + mCornerRadius, - mCornerRadius, mCornerRadius, mDimLayerPaint); - } - - /** Starts the focus timer. */ - public void startFocusTimerIndicator(int duration) { - if (mFocusTimerIndicator == null) { - return; - } - - mFocusTimerIndicator.setVisibility(View.VISIBLE); - mFocusTimerIndicator.setMax(duration); - mFocusTimerIndicator.setProgress(duration); - if (mFocusTimerCountDown != null) { - mFocusTimerCountDown.cancel(); - } - mFocusTimerCountDown = new CountDownTimer(duration, - FOCUS_INDICATOR_INTERVAL_MS) { - public void onTick(long millisUntilFinished) { - mFocusTimerIndicator.setProgress((int) millisUntilFinished); - } - - public void onFinish() { - // Do nothing - } - }.start(); - } - - /** Cancels the focus timer. */ - public void cancelFocusTimerIndicator() { - if (mFocusTimerIndicator == null) { - return; - } - - if (mFocusTimerCountDown != null) { - mFocusTimerCountDown.cancel(); - mFocusTimerIndicator.setProgress(0); - mFocusTimerIndicator.setVisibility(View.INVISIBLE); - } - } - - /** Only exposed for the workaround for b/27815919. */ - public ImageView getIconView() { - return mIconView; - } - - /** Returns the secondary color for a primary color. */ - int getSecondaryColor(int primaryColor, boolean useLightOverlayColor) { - int overlayColor = useLightOverlayColor ? Color.WHITE : Color.BLACK; - return Utilities.getColorWithOverlay(primaryColor, overlayColor, 0.8f); - } - - /** - * Sets the dim alpha, only used when we are not using hardware layers. - * (see RecentsConfiguration.useHardwareLayers) - */ - public void setDimAlpha(float dimAlpha) { - if (Float.compare(mDimAlpha, dimAlpha) != 0) { - mDimAlpha = dimAlpha; - mTitleView.setAlpha(1f - dimAlpha); - updateBackgroundColor(mBackground.getColor(), dimAlpha); - } - } - - /** - * Updates the background and highlight colors for this header. - */ - private void updateBackgroundColor(int color, float dimAlpha) { - if (mTask != null) { - mBackground.setColorAndDim(color, dimAlpha); - // TODO: Consider using the saturation of the color to adjust the lightness as well - ColorUtils.colorToHSL(color, mTmpHSL); - mTmpHSL[2] = Math.min(1f, mTmpHSL[2] + OVERLAY_LIGHTNESS_INCREMENT * (1.0f - dimAlpha)); - mOverlayBackground.setColorAndDim(ColorUtils.HSLToColor(mTmpHSL), dimAlpha); - mDimLayerPaint.setAlpha((int) (dimAlpha * 255)); - invalidate(); - } - } - - /** - * Sets whether the background color should be darkened to differentiate from the primary color. - */ - public void setShouldDarkenBackgroundColor(boolean flag) { - mShouldDarkenBackgroundColor = flag; - } - - /** - * Binds the bar view to the task. - */ - public void bindToTask(Task t, boolean touchExplorationEnabled, boolean disabledInSafeMode) { - mTask = t; - - int primaryColor = disabledInSafeMode - ? mDisabledTaskBarBackgroundColor - : t.colorPrimary; - if (mBackground.getColor() != primaryColor) { - updateBackgroundColor(primaryColor, mDimAlpha); - } - if (!mTitleView.getText().toString().equals(t.title)) { - mTitleView.setText(t.title); - } - mTitleView.setContentDescription(t.titleDescription); - mTitleView.setTextColor(t.useLightOnPrimaryColor ? - mTaskBarViewLightTextColor : mTaskBarViewDarkTextColor); - mDismissButton.setImageDrawable(t.useLightOnPrimaryColor ? - mLightDismissDrawable : mDarkDismissDrawable); - mDismissButton.setContentDescription(String.format(mDismissDescFormat, t.titleDescription)); - mDismissButton.setOnClickListener(this); - mDismissButton.setClickable(false); - ((RippleDrawable) mDismissButton.getBackground()).setForceSoftware(true); - - // In accessibility, a single click on the focused app info button will show it - if (touchExplorationEnabled) { - mIconView.setContentDescription(String.format(mAppInfoDescFormat, t.titleDescription)); - mIconView.setOnClickListener(this); - mIconView.setClickable(true); - } - } - - /** - * Called when the bound task's data has loaded and this view should update to reflect the - * changes. - */ - public void onTaskDataLoaded() { - if (mTask != null && mTask.icon != null) { - mIconView.setImageDrawable(mTask.icon); - } - } - - /** Unbinds the bar view from the task */ - void unbindFromTask(boolean touchExplorationEnabled) { - mTask = null; - mIconView.setImageDrawable(null); - if (touchExplorationEnabled) { - mIconView.setClickable(false); - } - } - - /** Animates this task bar if the user does not interact with the stack after a certain time. */ - void startNoUserInteractionAnimation() { - int duration = getResources().getInteger(R.integer.recents_task_enter_from_app_duration); - mDismissButton.setVisibility(View.VISIBLE); - mDismissButton.setClickable(true); - if (mDismissButton.getVisibility() == VISIBLE) { - mDismissButton.animate() - .alpha(1f) - .setInterpolator(Interpolators.FAST_OUT_LINEAR_IN) - .setDuration(duration) - .start(); - } else { - mDismissButton.setAlpha(1f); - } - if (mMoveTaskButton != null) { - if (mMoveTaskButton.getVisibility() == VISIBLE) { - mMoveTaskButton.setVisibility(View.VISIBLE); - mMoveTaskButton.setClickable(true); - mMoveTaskButton.animate() - .alpha(1f) - .setInterpolator(Interpolators.FAST_OUT_LINEAR_IN) - .setDuration(duration) - .start(); - } else { - mMoveTaskButton.setAlpha(1f); - } - } - } - - /** - * Mark this task view that the user does has not interacted with the stack after a certain - * time. - */ - public void setNoUserInteractionState() { - mDismissButton.setVisibility(View.VISIBLE); - mDismissButton.animate().cancel(); - mDismissButton.setAlpha(1f); - mDismissButton.setClickable(true); - if (mMoveTaskButton != null) { - mMoveTaskButton.setVisibility(View.VISIBLE); - mMoveTaskButton.animate().cancel(); - mMoveTaskButton.setAlpha(1f); - mMoveTaskButton.setClickable(true); - } - } - - /** - * Resets the state tracking that the user has not interacted with the stack after a certain - * time. - */ - void resetNoUserInteractionState() { - mDismissButton.setVisibility(View.INVISIBLE); - mDismissButton.setAlpha(0f); - mDismissButton.setClickable(false); - if (mMoveTaskButton != null) { - mMoveTaskButton.setVisibility(View.INVISIBLE); - mMoveTaskButton.setAlpha(0f); - mMoveTaskButton.setClickable(false); - } - } - - @Override - protected int[] onCreateDrawableState(int extraSpace) { - - // Don't forward our state to the drawable - we do it manually in onTaskViewFocusChanged. - // This is to prevent layer trashing when the view is pressed. - return new int[] {}; - } - - @Override - public void onClick(View v) { - if (v == mIconView) { - // In accessibility, a single click on the focused app info button will show it - EventBus.getDefault().send(new ShowApplicationInfoEvent(mTask)); - } else if (v == mDismissButton) { - TaskView tv = Utilities.findParent(this, TaskView.class); - tv.dismissTask(); - - // Keep track of deletions by the dismiss button - MetricsLogger.histogram(getContext(), "overview_task_dismissed_source", - Constants.Metrics.DismissSourceHeaderButton); - } else if (v == mMoveTaskButton) { - TaskView tv = Utilities.findParent(this, TaskView.class); - EventBus.getDefault().send(new LaunchTaskEvent(tv, mTask, null, false, - mTaskWindowingMode, ACTIVITY_TYPE_UNDEFINED)); - } else if (v == mAppInfoView) { - EventBus.getDefault().send(new ShowApplicationInfoEvent(mTask)); - } else if (v == mAppIconView) { - hideAppOverlay(false /* immediate */); - } - } - - @Override - public boolean onLongClick(View v) { - if (v == mIconView) { - showAppOverlay(); - return true; - } else if (v == mAppIconView) { - hideAppOverlay(false /* immediate */); - return true; - } - return false; - } - - /** - * Shows the application overlay. - */ - private void showAppOverlay() { - // Skip early if the task is invalid - SystemServicesProxy ssp = LegacyRecentsImpl.getSystemServices(); - ComponentName cn = mTask.key.getComponent(); - int userId = mTask.key.userId; - ActivityInfo activityInfo = PackageManagerWrapper.getInstance().getActivityInfo(cn, userId); - if (activityInfo == null) { - return; - } - - // Inflate the overlay if necessary - if (mAppOverlayView == null) { - mAppOverlayView = (FrameLayout) Utilities.findViewStubById(this, - R.id.app_overlay_stub).inflate(); - mAppOverlayView.setBackground(mOverlayBackground); - mAppIconView = (ImageView) mAppOverlayView.findViewById(R.id.app_icon); - mAppIconView.setOnClickListener(this); - mAppIconView.setOnLongClickListener(this); - mAppInfoView = (ImageView) mAppOverlayView.findViewById(R.id.app_info); - mAppInfoView.setOnClickListener(this); - mAppTitleView = (TextView) mAppOverlayView.findViewById(R.id.app_title); - updateLayoutParams(mAppIconView, mAppTitleView, null, mAppInfoView); - } - - // Update the overlay contents for the current app - mAppTitleView.setText(ActivityManagerWrapper.getInstance().getBadgedApplicationLabel( - activityInfo.applicationInfo, userId)); - mAppTitleView.setTextColor(mTask.useLightOnPrimaryColor ? - mTaskBarViewLightTextColor : mTaskBarViewDarkTextColor); - mAppIconView.setImageDrawable(getIconDrawableFactory().getBadgedIcon( - activityInfo.applicationInfo, userId)); - mAppInfoView.setImageDrawable(mTask.useLightOnPrimaryColor - ? mLightInfoIcon - : mDarkInfoIcon); - mAppOverlayView.setVisibility(View.VISIBLE); - - int x = mIconView.getLeft() + mIconView.getWidth() / 2; - int y = mIconView.getTop() + mIconView.getHeight() / 2; - Animator revealAnim = ViewAnimationUtils.createCircularReveal(mAppOverlayView, x, y, 0, - getWidth()); - revealAnim.setDuration(OVERLAY_REVEAL_DURATION); - revealAnim.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN); - revealAnim.start(); - } - - /** - * Hide the application overlay. - */ - private void hideAppOverlay(boolean immediate) { - // Skip if we haven't even loaded the overlay yet - if (mAppOverlayView == null) { - return; - } - - if (immediate) { - mAppOverlayView.setVisibility(View.GONE); - } else { - int x = mIconView.getLeft() + mIconView.getWidth() / 2; - int y = mIconView.getTop() + mIconView.getHeight() / 2; - Animator revealAnim = ViewAnimationUtils.createCircularReveal(mAppOverlayView, x, y, - getWidth(), 0); - revealAnim.setDuration(OVERLAY_REVEAL_DURATION); - revealAnim.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN); - revealAnim.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mAppOverlayView.setVisibility(View.GONE); - } - }); - revealAnim.start(); - } - } - - private static IconDrawableFactory getIconDrawableFactory() { - if (sDrawableFactory == null) { - sDrawableFactory = IconDrawableFactory.newInstance(AppGlobals.getInitialApplication()); - } - return sDrawableFactory; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewThumbnail.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewThumbnail.java deleted file mode 100644 index 68f85a50a9d6..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewThumbnail.java +++ /dev/null @@ -1,392 +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.systemui.recents.views; - -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.BitmapShader; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.ColorMatrix; -import android.graphics.ColorMatrixColorFilter; -import android.graphics.LightingColorFilter; -import android.graphics.Matrix; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Shader; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewDebug; - -import com.android.systemui.R; -import com.android.systemui.recents.events.EventBus; -import com.android.systemui.recents.events.ui.TaskSnapshotChangedEvent; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.shared.recents.model.ThumbnailData; -import java.io.PrintWriter; - - -/** - * The task thumbnail view. It implements an image view that allows for animating the dim and - * alpha of the thumbnail image. - */ -public class TaskViewThumbnail extends View { - - private static final ColorMatrix TMP_FILTER_COLOR_MATRIX = new ColorMatrix(); - private static final ColorMatrix TMP_BRIGHTNESS_COLOR_MATRIX = new ColorMatrix(); - - private Task mTask; - - private int mDisplayOrientation = Configuration.ORIENTATION_UNDEFINED; - private Rect mDisplayRect = new Rect(); - - // Drawing - @ViewDebug.ExportedProperty(category="recents") - protected Rect mTaskViewRect = new Rect(); - @ViewDebug.ExportedProperty(category="recents") - protected Rect mThumbnailRect = new Rect(); - @ViewDebug.ExportedProperty(category="recents") - protected float mThumbnailScale; - private float mFullscreenThumbnailScale = 1f; - /** The height, in pixels, of the task view's title bar. */ - private int mTitleBarHeight; - private boolean mSizeToFit = false; - private boolean mOverlayHeaderOnThumbnailActionBar = true; - private ThumbnailData mThumbnailData; - - protected int mCornerRadius; - @ViewDebug.ExportedProperty(category="recents") - private float mDimAlpha; - private Matrix mMatrix = new Matrix(); - private Paint mDrawPaint = new Paint(); - protected Paint mLockedPaint = new Paint(); - protected Paint mBgFillPaint = new Paint(); - protected BitmapShader mBitmapShader; - protected boolean mUserLocked = false; - private LightingColorFilter mLightingColorFilter = new LightingColorFilter(0xffffffff, 0); - - // Clip the top of the thumbnail against the opaque header bar that overlaps this view - private View mTaskBar; - - // Visibility optimization, if the thumbnail height is less than the height of the header - // bar for the task view, then just mark this thumbnail view as invisible - @ViewDebug.ExportedProperty(category="recents") - private boolean mInvisible; - - @ViewDebug.ExportedProperty(category="recents") - private boolean mDisabledInSafeMode; - - public TaskViewThumbnail(Context context) { - this(context, null); - } - - public TaskViewThumbnail(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public TaskViewThumbnail(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public TaskViewThumbnail(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - mDrawPaint.setColorFilter(mLightingColorFilter); - mDrawPaint.setFilterBitmap(true); - mDrawPaint.setAntiAlias(true); - Resources res = getResources(); - mCornerRadius = res.getDimensionPixelSize(R.dimen.recents_task_view_rounded_corners_radius); - mBgFillPaint.setColor(Color.WHITE); - mLockedPaint.setColor(Color.WHITE); - mTitleBarHeight = res.getDimensionPixelSize(R.dimen.recents_grid_task_view_header_height); - } - - /** - * Called when the task view frame changes, allowing us to move the contents of the header - * to match the frame changes. - */ - public void onTaskViewSizeChanged(int width, int height) { - // Return early if the bounds have not changed - if (mTaskViewRect.width() == width && mTaskViewRect.height() == height) { - return; - } - - mTaskViewRect.set(0, 0, width, height); - setLeftTopRightBottom(0, 0, width, height); - updateThumbnailMatrix(); - } - - @Override - protected void onDraw(Canvas canvas) { - if (mInvisible) { - return; - } - - int viewWidth = mTaskViewRect.width(); - int viewHeight = mTaskViewRect.height(); - int thumbnailWidth = Math.min(viewWidth, - (int) (mThumbnailRect.width() * mThumbnailScale)); - int thumbnailHeight = Math.min(viewHeight, - (int) (mThumbnailRect.height() * mThumbnailScale)); - - if (mUserLocked) { - canvas.drawRoundRect(0, 0, viewWidth, viewHeight, mCornerRadius, mCornerRadius, - mLockedPaint); - } else if (mBitmapShader != null && thumbnailWidth > 0 && thumbnailHeight > 0) { - int topOffset = 0; - if (mTaskBar != null && mOverlayHeaderOnThumbnailActionBar) { - topOffset = mTaskBar.getHeight() - mCornerRadius; - } - - // Draw the background, there will be some small overdraw with the thumbnail - if (thumbnailWidth < viewWidth) { - // Portrait thumbnail on a landscape task view - canvas.drawRoundRect(Math.max(0, thumbnailWidth - mCornerRadius), topOffset, - viewWidth, viewHeight, - mCornerRadius, mCornerRadius, mBgFillPaint); - } - if (thumbnailHeight < viewHeight) { - // Landscape thumbnail on a portrait task view - canvas.drawRoundRect(0, Math.max(topOffset, thumbnailHeight - mCornerRadius), - viewWidth, viewHeight, - mCornerRadius, mCornerRadius, mBgFillPaint); - } - - // Draw the thumbnail - canvas.drawRoundRect(0, topOffset, thumbnailWidth, thumbnailHeight, - mCornerRadius, mCornerRadius, mDrawPaint); - } else { - canvas.drawRoundRect(0, 0, viewWidth, viewHeight, mCornerRadius, mCornerRadius, - mBgFillPaint); - } - } - - /** Sets the thumbnail to a given bitmap. */ - void setThumbnail(ThumbnailData thumbnailData) { - if (thumbnailData != null && thumbnailData.thumbnail != null) { - Bitmap bm = thumbnailData.thumbnail; - bm.prepareToDraw(); - mFullscreenThumbnailScale = thumbnailData.scale; - mBitmapShader = new BitmapShader(bm, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP); - mDrawPaint.setShader(mBitmapShader); - mThumbnailRect.set(0, 0, - bm.getWidth() - thumbnailData.insets.left - thumbnailData.insets.right, - bm.getHeight() - thumbnailData.insets.top - thumbnailData.insets.bottom); - mThumbnailData = thumbnailData; - updateThumbnailMatrix(); - updateThumbnailPaintFilter(); - } else { - mBitmapShader = null; - mDrawPaint.setShader(null); - mThumbnailRect.setEmpty(); - mThumbnailData = null; - } - } - - /** Updates the paint to draw the thumbnail. */ - void updateThumbnailPaintFilter() { - if (mInvisible) { - return; - } - int mul = (int) ((1.0f - mDimAlpha) * 255); - if (mBitmapShader != null) { - if (mDisabledInSafeMode) { - // Brightness: C-new = C-old*(1-amount) + amount - TMP_FILTER_COLOR_MATRIX.setSaturation(0); - float scale = 1f - mDimAlpha; - float[] mat = TMP_BRIGHTNESS_COLOR_MATRIX.getArray(); - mat[0] = scale; - mat[6] = scale; - mat[12] = scale; - mat[4] = mDimAlpha * 255f; - mat[9] = mDimAlpha * 255f; - mat[14] = mDimAlpha * 255f; - TMP_FILTER_COLOR_MATRIX.preConcat(TMP_BRIGHTNESS_COLOR_MATRIX); - ColorMatrixColorFilter filter = new ColorMatrixColorFilter(TMP_FILTER_COLOR_MATRIX); - mDrawPaint.setColorFilter(filter); - mBgFillPaint.setColorFilter(filter); - mLockedPaint.setColorFilter(filter); - } else { - mLightingColorFilter.setColorMultiply(Color.argb(255, mul, mul, mul)); - mDrawPaint.setColorFilter(mLightingColorFilter); - mDrawPaint.setColor(0xFFffffff); - mBgFillPaint.setColorFilter(mLightingColorFilter); - mLockedPaint.setColorFilter(mLightingColorFilter); - } - } else { - int grey = mul; - mDrawPaint.setColorFilter(null); - mDrawPaint.setColor(Color.argb(255, grey, grey, grey)); - } - if (!mInvisible) { - invalidate(); - } - } - - /** - * Updates the scale of the bitmap relative to this view. - */ - public void updateThumbnailMatrix() { - mThumbnailScale = 1f; - if (mBitmapShader != null && mThumbnailData != null) { - if (mTaskViewRect.isEmpty()) { - // If we haven't measured , skip the thumbnail drawing and only draw the background - // color - mThumbnailScale = 0f; - } else if (mSizeToFit) { - // Make sure we fill the entire space regardless of the orientation. - float viewAspectRatio = (float) mTaskViewRect.width() / - (float) (mTaskViewRect.height() - mTitleBarHeight); - float thumbnailAspectRatio = - (float) mThumbnailRect.width() / (float) mThumbnailRect.height(); - if (viewAspectRatio > thumbnailAspectRatio) { - mThumbnailScale = - (float) mTaskViewRect.width() / (float) mThumbnailRect.width(); - } else { - mThumbnailScale = (float) (mTaskViewRect.height() - mTitleBarHeight) - / (float) mThumbnailRect.height(); - } - } else { - float invThumbnailScale = 1f / mFullscreenThumbnailScale; - if (mDisplayOrientation == Configuration.ORIENTATION_PORTRAIT) { - if (mThumbnailData.orientation == Configuration.ORIENTATION_PORTRAIT) { - // If we are in the same orientation as the screenshot, just scale it to the - // width of the task view - mThumbnailScale = (float) mTaskViewRect.width() / mThumbnailRect.width(); - } else { - // Scale the landscape thumbnail up to app size, then scale that to the task - // view size to match other portrait screenshots - mThumbnailScale = invThumbnailScale * - ((float) mTaskViewRect.width() / mDisplayRect.width()); - } - } else { - // Otherwise, scale the screenshot to fit 1:1 in the current orientation - mThumbnailScale = invThumbnailScale; - } - } - mMatrix.setTranslate(-mThumbnailData.insets.left * mFullscreenThumbnailScale, - -mThumbnailData.insets.top * mFullscreenThumbnailScale); - mMatrix.postScale(mThumbnailScale, mThumbnailScale); - mBitmapShader.setLocalMatrix(mMatrix); - } - if (!mInvisible) { - invalidate(); - } - } - - /** Sets whether the thumbnail should be resized to fit the task view in all orientations. */ - public void setSizeToFit(boolean flag) { - mSizeToFit = flag; - } - - /** - * Sets whether the header should overlap (and hide) the action bar in the thumbnail, or - * be stacked just above it. - */ - public void setOverlayHeaderOnThumbnailActionBar(boolean flag) { - mOverlayHeaderOnThumbnailActionBar = flag; - } - - /** Updates the clip rect based on the given task bar. */ - void updateClipToTaskBar(View taskBar) { - mTaskBar = taskBar; - invalidate(); - } - - /** Updates the visibility of the the thumbnail. */ - void updateThumbnailVisibility(int clipBottom) { - boolean invisible = mTaskBar != null && (getHeight() - clipBottom) <= mTaskBar.getHeight(); - if (invisible != mInvisible) { - mInvisible = invisible; - if (!mInvisible) { - updateThumbnailPaintFilter(); - } - } - } - - /** - * Sets the dim alpha, only used when we are not using hardware layers. - * (see RecentsConfiguration.useHardwareLayers) - */ - public void setDimAlpha(float dimAlpha) { - mDimAlpha = dimAlpha; - updateThumbnailPaintFilter(); - } - - /** - * Returns the {@link Paint} used to draw a task screenshot, or {@link #mLockedPaint} if the - * thumbnail shouldn't be drawn because it belongs to a locked user. - */ - protected Paint getDrawPaint() { - if (mUserLocked) { - return mLockedPaint; - } - return mDrawPaint; - } - - /** - * Binds the thumbnail view to the task. - */ - void bindToTask(Task t, boolean disabledInSafeMode, int displayOrientation, Rect displayRect) { - mTask = t; - mDisabledInSafeMode = disabledInSafeMode; - mDisplayOrientation = displayOrientation; - mDisplayRect.set(displayRect); - if (t.colorBackground != 0) { - mBgFillPaint.setColor(t.colorBackground); - } - if (t.colorPrimary != 0) { - mLockedPaint.setColor(t.colorPrimary); - } - mUserLocked = t.isLocked; - EventBus.getDefault().register(this); - } - - /** - * Called when the bound task's data has loaded and this view should update to reflect the - * changes. - */ - void onTaskDataLoaded(ThumbnailData thumbnailData) { - setThumbnail(thumbnailData); - } - - /** Unbinds the thumbnail view from the task */ - void unbindFromTask() { - mTask = null; - setThumbnail(null); - EventBus.getDefault().unregister(this); - } - - public final void onBusEvent(TaskSnapshotChangedEvent event) { - if (mTask == null || event.taskId != mTask.key.id || event.thumbnailData == null - || event.thumbnailData.thumbnail == null) { - return; - } - setThumbnail(event.thumbnailData); - } - - public void dump(String prefix, PrintWriter writer) { - writer.print(prefix); writer.print("TaskViewThumbnail"); - writer.print(" mTaskViewRect="); writer.print(Utilities.dumpRect(mTaskViewRect)); - writer.print(" mThumbnailRect="); writer.print(Utilities.dumpRect(mThumbnailRect)); - writer.print(" mThumbnailScale="); writer.print(mThumbnailScale); - writer.print(" mDimAlpha="); writer.print(mDimAlpha); - writer.println(); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewTransform.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewTransform.java deleted file mode 100644 index 48a733663fad..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskViewTransform.java +++ /dev/null @@ -1,203 +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.systemui.recents.views; - -import android.animation.Animator; -import android.animation.ObjectAnimator; -import android.animation.PropertyValuesHolder; -import android.graphics.Rect; -import android.graphics.RectF; -import android.util.Property; -import android.view.View; - -import com.android.systemui.recents.utilities.AnimationProps; -import com.android.systemui.recents.utilities.Utilities; - -import java.util.ArrayList; - -/** - * The visual properties for a {@link TaskView}. - */ -public class TaskViewTransform { - - public static final Property<View, Rect> LTRB = - new Property<View, Rect>(Rect.class, "leftTopRightBottom") { - - private Rect mTmpRect = new Rect(); - - @Override - public void set(View v, Rect ltrb) { - v.setLeftTopRightBottom(ltrb.left, ltrb.top, ltrb.right, ltrb.bottom); - } - - @Override - public Rect get(View v) { - mTmpRect.set(v.getLeft(), v.getTop(), v.getRight(), v.getBottom()); - return mTmpRect; - } - }; - - public float translationZ = 0; - public float scale = 1f; - public float alpha = 1f; - public float dimAlpha = 0f; - public float viewOutlineAlpha = 0f; - - public boolean visible = false; - - // This is a window-space rect used for positioning the task in the stack - public RectF rect = new RectF(); - - /** - * Fills int this transform from the state of the given TaskView. - */ - public void fillIn(TaskView tv) { - translationZ = tv.getTranslationZ(); - scale = tv.getScaleX(); - alpha = tv.getAlpha(); - visible = true; - dimAlpha = tv.getDimAlpha(); - viewOutlineAlpha = tv.getViewBounds().getAlpha(); - rect.set(tv.getLeft(), tv.getTop(), tv.getRight(), tv.getBottom()); - } - - /** - * Copies the transform state from another {@link TaskViewTransform}. - */ - public void copyFrom(TaskViewTransform other) { - translationZ = other.translationZ; - scale = other.scale; - alpha = other.alpha; - visible = other.visible; - dimAlpha = other.dimAlpha; - viewOutlineAlpha = other.viewOutlineAlpha; - rect.set(other.rect); - } - - /** - * @return whether {@param other} is the same transform as this - */ - public boolean isSame(TaskViewTransform other) { - return translationZ == other.translationZ - && scale == other.scale - && other.alpha == alpha - && dimAlpha == other.dimAlpha - && visible == other.visible - && rect.equals(other.rect); - } - - /** - * Resets the current transform. - */ - public void reset() { - translationZ = 0; - scale = 1f; - alpha = 1f; - dimAlpha = 0f; - viewOutlineAlpha = 0f; - visible = false; - rect.setEmpty(); - } - - /** Convenience functions to compare against current property values */ - public boolean hasAlphaChangedFrom(float v) { - return (Float.compare(alpha, v) != 0); - } - - public boolean hasScaleChangedFrom(float v) { - return (Float.compare(scale, v) != 0); - } - - public boolean hasTranslationZChangedFrom(float v) { - return (Float.compare(translationZ, v) != 0); - } - - public boolean hasRectChangedFrom(View v) { - return ((int) rect.left != v.getLeft()) || ((int) rect.right != v.getRight()) || - ((int) rect.top != v.getTop()) || ((int) rect.bottom != v.getBottom()); - } - - /** - * Applies this transform to a view. - */ - public void applyToTaskView(TaskView v, ArrayList<Animator> animators, - AnimationProps animation, boolean allowShadows) { - // Return early if not visible - if (!visible) { - return; - } - - if (animation.isImmediate()) { - if (allowShadows && hasTranslationZChangedFrom(v.getTranslationZ())) { - v.setTranslationZ(translationZ); - } - if (hasScaleChangedFrom(v.getScaleX())) { - v.setScaleX(scale); - v.setScaleY(scale); - } - if (hasAlphaChangedFrom(v.getAlpha())) { - v.setAlpha(alpha); - } - if (hasRectChangedFrom(v)) { - v.setLeftTopRightBottom((int) rect.left, (int) rect.top, (int) rect.right, - (int) rect.bottom); - } - } else { - if (allowShadows && hasTranslationZChangedFrom(v.getTranslationZ())) { - ObjectAnimator anim = ObjectAnimator.ofFloat(v, View.TRANSLATION_Z, - v.getTranslationZ(), translationZ); - animators.add(animation.apply(AnimationProps.TRANSLATION_Z, anim)); - } - if (hasScaleChangedFrom(v.getScaleX())) { - ObjectAnimator anim = ObjectAnimator.ofPropertyValuesHolder(v, - PropertyValuesHolder.ofFloat(View.SCALE_X, v.getScaleX(), scale), - PropertyValuesHolder.ofFloat(View.SCALE_Y, v.getScaleX(), scale)); - animators.add(animation.apply(AnimationProps.SCALE, anim)); - } - if (hasAlphaChangedFrom(v.getAlpha())) { - ObjectAnimator anim = ObjectAnimator.ofFloat(v, View.ALPHA, v.getAlpha(), alpha); - animators.add(animation.apply(AnimationProps.ALPHA, anim)); - } - if (hasRectChangedFrom(v)) { - Rect fromViewRect = new Rect(v.getLeft(), v.getTop(), v.getRight(), v.getBottom()); - Rect toViewRect = new Rect(); - rect.round(toViewRect); - ObjectAnimator anim = ObjectAnimator.ofPropertyValuesHolder(v, - PropertyValuesHolder.ofObject(LTRB, Utilities.RECT_EVALUATOR, - fromViewRect, toViewRect)); - animators.add(animation.apply(AnimationProps.BOUNDS, anim)); - } - } - } - - /** Reset the transform on a view. */ - public static void reset(TaskView v) { - v.setTranslationX(0f); - v.setTranslationY(0f); - v.setTranslationZ(0f); - v.setScaleX(1f); - v.setScaleY(1f); - v.setAlpha(1f); - v.getViewBounds().setClipBottom(0); - v.setLeftTopRightBottom(0, 0, 0, 0); - } - - @Override - public String toString() { - return "R: " + rect + " V: " + visible; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/ViewPool.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/ViewPool.java deleted file mode 100644 index a287fe642002..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/ViewPool.java +++ /dev/null @@ -1,86 +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.systemui.recents.views; - -import android.content.Context; - -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - - -/* A view pool to manage more views than we can visibly handle */ -public class ViewPool<V, T> { - - /* An interface to the consumer of a view pool */ - public interface ViewPoolConsumer<V, T> { - public V createView(Context context); - public void onReturnViewToPool(V v); - public void onPickUpViewFromPool(V v, T prepareData, boolean isNewView); - public boolean hasPreferredData(V v, T preferredData); - } - - Context mContext; - ViewPoolConsumer<V, T> mViewCreator; - LinkedList<V> mPool = new LinkedList<V>(); - - /** Initializes the pool with a fixed predetermined pool size */ - public ViewPool(Context context, ViewPoolConsumer<V, T> viewCreator) { - mContext = context; - mViewCreator = viewCreator; - } - - /** Returns a view into the pool */ - void returnViewToPool(V v) { - mViewCreator.onReturnViewToPool(v); - mPool.push(v); - } - - /** Gets a view from the pool and prepares it */ - V pickUpViewFromPool(T preferredData, T prepareData) { - V v = null; - boolean isNewView = false; - if (mPool.isEmpty()) { - v = mViewCreator.createView(mContext); - isNewView = true; - } else { - // Try and find a preferred view - Iterator<V> iter = mPool.iterator(); - while (iter.hasNext()) { - V vpv = iter.next(); - if (mViewCreator.hasPreferredData(vpv, preferredData)) { - v = vpv; - iter.remove(); - break; - } - } - // Otherwise, just grab the first view - if (v == null) { - v = mPool.pop(); - } - } - mViewCreator.onPickUpViewFromPool(v, prepareData, isNewView); - return v; - } - - /** - * Returns the list of views in the pool. - */ - List<V> getViews() { - return mPool; - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/AnimateableGridViewBounds.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/AnimateableGridViewBounds.java deleted file mode 100644 index a029478c2045..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/AnimateableGridViewBounds.java +++ /dev/null @@ -1,32 +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. - */ - -package com.android.systemui.recents.views.grid; - -import android.view.View; -import com.android.systemui.recents.views.AnimateableViewBounds; - -/* An outline provider for grid-based task views. */ -class AnimateableGridViewBounds extends AnimateableViewBounds { - - public AnimateableGridViewBounds(View source, int cornerRadius) { - super(source, cornerRadius); - } - - @Override - protected void updateClipBounds() { - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/GridTaskView.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/GridTaskView.java deleted file mode 100644 index 8b4700c54b00..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/GridTaskView.java +++ /dev/null @@ -1,72 +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. - */ - -package com.android.systemui.recents.views.grid; - -import android.content.Context; -import android.util.AttributeSet; -import com.android.systemui.R; -import com.android.systemui.recents.views.AnimateableViewBounds; -import com.android.systemui.recents.views.TaskView; - -public class GridTaskView extends TaskView { - - /** The height, in pixels, of the header view. */ - private int mHeaderHeight; - - public GridTaskView(Context context) { - this(context, null); - } - - public GridTaskView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public GridTaskView(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public GridTaskView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - mHeaderHeight = context.getResources().getDimensionPixelSize( - R.dimen.recents_grid_task_view_header_height); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - // Show the full thumbnail and don't overlap with the header. - mThumbnailView.setSizeToFit(true); - mThumbnailView.setOverlayHeaderOnThumbnailActionBar(false); - mThumbnailView.updateThumbnailMatrix(); - mThumbnailView.setTranslationY(mHeaderHeight); - mHeaderView.setShouldDarkenBackgroundColor(true); - } - - @Override - protected AnimateableViewBounds createOutlineProvider() { - return new AnimateableGridViewBounds(this, mContext.getResources().getDimensionPixelSize( - R.dimen.recents_task_view_shadow_rounded_corners_radius)); - } - - @Override - protected void onConfigurationChanged() { - super.onConfigurationChanged(); - mHeaderHeight = mContext.getResources().getDimensionPixelSize( - R.dimen.recents_grid_task_view_header_height); - mThumbnailView.setTranslationY(mHeaderHeight); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/GridTaskViewThumbnail.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/GridTaskViewThumbnail.java deleted file mode 100644 index 2d7cfb1ab167..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/GridTaskViewThumbnail.java +++ /dev/null @@ -1,192 +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.recents.views.grid; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Path; -import android.util.AttributeSet; - -import com.android.systemui.R; -import com.android.systemui.recents.views.TaskViewThumbnail; - -public class GridTaskViewThumbnail extends TaskViewThumbnail { - - private final Path mThumbnailOutline = new Path(); - private final Path mRestBackgroundOutline = new Path(); - // True if either this view's size or thumbnail scale has changed and mThumbnailOutline should - // be updated. - private boolean mUpdateThumbnailOutline = true; - - public GridTaskViewThumbnail(Context context) { - this(context, null); - } - - public GridTaskViewThumbnail(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public GridTaskViewThumbnail(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public GridTaskViewThumbnail(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - mCornerRadius = getResources().getDimensionPixelSize( - R.dimen.recents_grid_task_view_rounded_corners_radius); - } - - /** - * Called when the task view frame changes, allowing us to move the contents of the header - * to match the frame changes. - */ - public void onTaskViewSizeChanged(int width, int height) { - mUpdateThumbnailOutline = true; - super.onTaskViewSizeChanged(width, height); - } - - /** - * Updates the scale of the bitmap relative to this view. - */ - public void updateThumbnailMatrix() { - mUpdateThumbnailOutline = true; - super.updateThumbnailMatrix(); - } - - private void updateThumbnailOutline() { - final int titleHeight = getResources().getDimensionPixelSize( - R.dimen.recents_grid_task_view_header_height); - final int viewWidth = mTaskViewRect.width(); - final int viewHeight = mTaskViewRect.height() - titleHeight; - final int thumbnailWidth = Math.min(viewWidth, - (int) (mThumbnailRect.width() * mThumbnailScale)); - final int thumbnailHeight = Math.min(viewHeight, - (int) (mThumbnailRect.height() * mThumbnailScale)); - - if (mBitmapShader != null && thumbnailWidth > 0 && thumbnailHeight > 0) { - // Draw the thumbnail, we only round the bottom corners: - // - // outerLeft outerRight - // <-----------------------> mRestBackgroundOutline - // _________________________ (thumbnailWidth < viewWidth) - // |_______________________| outerTop A ____ B - // | | ↑ | | - // | | | | | - // | | | | | - // | | | | | C - // \_______________________/ ↓ |__/ - // mCornerRadius outerBottom E D - // - // mRestBackgroundOutline (thumbnailHeight < viewHeight) - // A _________________________ B - // | | C - // F \_______________________/ - // E D - final int outerLeft = 0; - final int outerTop = 0; - final int outerRight = outerLeft + thumbnailWidth; - final int outerBottom = outerTop + thumbnailHeight; - createThumbnailPath(outerLeft, outerTop, outerRight, outerBottom, mThumbnailOutline); - - if (thumbnailWidth < viewWidth) { - final int l = Math.max(0, outerRight - mCornerRadius); - final int r = outerRight; - final int t = outerTop; - final int b = outerBottom; - mRestBackgroundOutline.reset(); - mRestBackgroundOutline.moveTo(l, t); // A - mRestBackgroundOutline.lineTo(r, t); // B - mRestBackgroundOutline.lineTo(r, b - mCornerRadius); // C - mRestBackgroundOutline.arcTo(r - 2 * mCornerRadius, b - 2 * mCornerRadius, r, b, - 0, 90, false); // D - mRestBackgroundOutline.lineTo(l, b); // E - mRestBackgroundOutline.lineTo(l, t); // A - mRestBackgroundOutline.close(); - - } - if (thumbnailHeight < viewHeight) { - final int l = outerLeft; - final int r = outerRight; - final int t = Math.max(0, thumbnailHeight - mCornerRadius); - final int b = outerBottom; - mRestBackgroundOutline.reset(); - mRestBackgroundOutline.moveTo(l, t); // A - mRestBackgroundOutline.lineTo(r, t); // B - mRestBackgroundOutline.lineTo(r, b - mCornerRadius); // C - mRestBackgroundOutline.arcTo(r - 2 * mCornerRadius, b - 2 * mCornerRadius, r, b, - 0, 90, false); // D - mRestBackgroundOutline.lineTo(l + mCornerRadius, b); // E - mRestBackgroundOutline.arcTo(l, b - 2 * mCornerRadius, l + 2 * mCornerRadius, b, - 90, 90, false); // F - mRestBackgroundOutline.lineTo(l, t); // A - mRestBackgroundOutline.close(); - } - } else { - createThumbnailPath(0, 0, viewWidth, viewHeight, mThumbnailOutline); - } - } - - private void createThumbnailPath(int outerLeft, int outerTop, int outerRight, int outerBottom, - Path outPath) { - outPath.reset(); - outPath.moveTo(outerLeft, outerTop); - outPath.lineTo(outerRight, outerTop); - outPath.lineTo(outerRight, outerBottom - mCornerRadius); - outPath.arcTo(outerRight - 2 * mCornerRadius, outerBottom - 2 * mCornerRadius, outerRight, - outerBottom, 0, 90, false); - outPath.lineTo(outerLeft + mCornerRadius, outerBottom); - outPath.arcTo(outerLeft, outerBottom - 2 * mCornerRadius, outerLeft + 2 * mCornerRadius, - outerBottom, 90, 90, false); - outPath.lineTo(outerLeft, outerTop); - outPath.close(); - } - - @Override - protected void onDraw(Canvas canvas) { - final int titleHeight = getResources().getDimensionPixelSize( - R.dimen.recents_grid_task_view_header_height); - final int viewWidth = mTaskViewRect.width(); - final int viewHeight = mTaskViewRect.height() - titleHeight; - final int thumbnailWidth = Math.min(viewWidth, - (int) (mThumbnailRect.width() * mThumbnailScale)); - final int thumbnailHeight = Math.min(viewHeight, - (int) (mThumbnailRect.height() * mThumbnailScale)); - - if (mUpdateThumbnailOutline) { - updateThumbnailOutline(); - mUpdateThumbnailOutline = false; - } - - if (mUserLocked) { - canvas.drawPath(mThumbnailOutline, mLockedPaint); - } else if (mBitmapShader != null && thumbnailWidth > 0 && thumbnailHeight > 0) { - // Draw the background, there will be some small overdraw with the thumbnail - if (thumbnailWidth < viewWidth) { - // Portrait thumbnail on a landscape task view - canvas.drawPath(mRestBackgroundOutline, mBgFillPaint); - } - if (thumbnailHeight < viewHeight) { - // Landscape thumbnail on a portrait task view - canvas.drawPath(mRestBackgroundOutline, mBgFillPaint); - } - canvas.drawPath(mThumbnailOutline, getDrawPaint()); - } else { - canvas.drawPath(mThumbnailOutline, mBgFillPaint); - } - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java deleted file mode 100644 index 719eaa71f788..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java +++ /dev/null @@ -1,325 +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. - */ - -package com.android.systemui.recents.views.grid; - -import static com.android.systemui.recents.views.TaskStackLayoutAlgorithm.*; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Point; -import android.graphics.Rect; -import android.view.WindowManager; - -import com.android.systemui.R; -import com.android.systemui.recents.events.ui.focus.NavigateTaskViewEvent.Direction; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.views.TaskStackLayoutAlgorithm; -import com.android.systemui.recents.views.TaskViewTransform; - -import java.util.ArrayList; - -public class TaskGridLayoutAlgorithm { - - private final String TAG = "TaskGridLayoutAlgorithm"; - public static final int MAX_LAYOUT_TASK_COUNT = 8; - - /** The horizontal padding around the whole recents view. */ - private int mPaddingLeftRight; - /** The vertical padding around the whole recents view. */ - private int mPaddingTopBottom; - /** The padding between task views. */ - private int mPaddingTaskView; - - private Rect mWindowRect; - private Point mScreenSize = new Point(); - - private Rect mTaskGridRect; - - /** The height, in pixels, of each task view's title bar. */ - private int mTitleBarHeight; - - /** The aspect ratio of each task thumbnail, without the title bar. */ - private float mAppAspectRatio; - private Rect mSystemInsets = new Rect(); - - /** The thickness of the focused task view frame. */ - private int mFocusedFrameThickness; - - /** - * When the amount of tasks is determined, the size and position of every task view can be - * decided. Each instance of TaskGridRectInfo store the task view information for a certain - * amount of tasks. - */ - class TaskGridRectInfo { - Rect size; - int[] xOffsets; - int[] yOffsets; - int tasksPerLine; - int lines; - - TaskGridRectInfo(int taskCount) { - size = new Rect(); - xOffsets = new int[taskCount]; - yOffsets = new int[taskCount]; - - int layoutTaskCount = Math.min(MAX_LAYOUT_TASK_COUNT, taskCount); - tasksPerLine = getTasksPerLine(layoutTaskCount); - lines = layoutTaskCount < 4 ? 1 : 2; - - // A couple of special cases. - boolean landscapeWindow = mWindowRect.width() > mWindowRect.height(); - boolean landscapeTaskView = mAppAspectRatio > 1; - // If we're in portrait but task views are landscape, show more lines of fewer tasks. - if (!landscapeWindow && landscapeTaskView) { - tasksPerLine = layoutTaskCount < 2 ? 1 : 2; - lines = layoutTaskCount < 3 ? 1 : ( - layoutTaskCount < 5 ? 2 : ( - layoutTaskCount < 7 ? 3 : 4)); - } - // If we're in landscape but task views are portrait, show fewer lines of more tasks. - if (landscapeWindow && !landscapeTaskView) { - tasksPerLine = layoutTaskCount < 7 ? layoutTaskCount : 6; - lines = layoutTaskCount < 7 ? 1 : 2; - } - - int taskWidth, taskHeight; - int maxTaskWidth = (mWindowRect.width() - 2 * mPaddingLeftRight - - (tasksPerLine - 1) * mPaddingTaskView) / tasksPerLine; - int maxTaskHeight = (mWindowRect.height() - 2 * mPaddingTopBottom - - (lines - 1) * mPaddingTaskView) / lines; - - if (maxTaskHeight >= maxTaskWidth / mAppAspectRatio + mTitleBarHeight) { - // Width bound. - taskWidth = maxTaskWidth; - // Here we should round the height to the nearest integer. - taskHeight = (int) (maxTaskWidth / mAppAspectRatio + mTitleBarHeight + 0.5); - } else { - // Height bound. - taskHeight = maxTaskHeight; - // Here we should round the width to the nearest integer. - taskWidth = (int) ((taskHeight - mTitleBarHeight) * mAppAspectRatio + 0.5); - } - size.set(0, 0, taskWidth, taskHeight); - - int emptySpaceX = mWindowRect.width() - 2 * mPaddingLeftRight - - (tasksPerLine * taskWidth) - (tasksPerLine - 1) * mPaddingTaskView; - int emptySpaceY = mWindowRect.height() - 2 * mPaddingTopBottom - - (lines * taskHeight) - (lines - 1) * mPaddingTaskView; - for (int taskIndex = 0; taskIndex < taskCount; taskIndex++) { - // We also need to invert the index in order to display the most recent tasks first. - int taskLayoutIndex = taskCount - taskIndex - 1; - - int xIndex = taskLayoutIndex % tasksPerLine; - int yIndex = taskLayoutIndex / tasksPerLine; - xOffsets[taskIndex] = mWindowRect.left + - emptySpaceX / 2 + mPaddingLeftRight + (taskWidth + mPaddingTaskView) * xIndex; - yOffsets[taskIndex] = mWindowRect.top + - emptySpaceY / 2 + mPaddingTopBottom + (taskHeight + mPaddingTaskView) * yIndex; - } - } - - private int getTasksPerLine(int taskCount) { - switch(taskCount) { - case 0: - return 0; - case 1: - return 1; - case 2: - case 4: - return 2; - case 3: - case 5: - case 6: - return 3; - case 7: - case 8: - return 4; - default: - throw new IllegalArgumentException("Unsupported task count " + taskCount); - } - } - } - - /** - * We can find task view sizes and positions from mTaskGridRectInfoList[k - 1] when there - * are k tasks. - */ - private TaskGridRectInfo[] mTaskGridRectInfoList; - - public TaskGridLayoutAlgorithm(Context context) { - reloadOnConfigurationChange(context); - } - - public void reloadOnConfigurationChange(Context context) { - Resources res = context.getResources(); - mPaddingTaskView = res.getDimensionPixelSize(R.dimen.recents_grid_padding_task_view); - mFocusedFrameThickness = res.getDimensionPixelSize( - R.dimen.recents_grid_task_view_focused_frame_thickness); - - mTaskGridRect = new Rect(); - mTitleBarHeight = res.getDimensionPixelSize(R.dimen.recents_grid_task_view_header_height); - - WindowManager windowManager = (WindowManager) context - .getSystemService(Context.WINDOW_SERVICE); - windowManager.getDefaultDisplay().getRealSize(mScreenSize); - - updateAppAspectRatio(); - } - - /** - * Returns the proper task view transform of a certain task view, according to its index and the - * amount of task views. - * @param taskIndex The index of the task view whose transform we want. It's never greater - * than {@link MAX_LAYOUT_TASK_COUNT}. - * @param taskCount The current amount of task views. - * @param transformOut The result transform that this method returns. - * @param stackLayout The base stack layout algorithm. - * @return The expected transform of the (taskIndex)th task view. - */ - public TaskViewTransform getTransform(int taskIndex, int taskCount, - TaskViewTransform transformOut, TaskStackLayoutAlgorithm stackLayout) { - if (taskCount == 0) { - transformOut.reset(); - return transformOut; - } - - TaskGridRectInfo gridInfo = mTaskGridRectInfoList[taskCount - 1]; - mTaskGridRect.set(gridInfo.size); - - int x = gridInfo.xOffsets[taskIndex]; - int y = gridInfo.yOffsets[taskIndex]; - float z = stackLayout.mMaxTranslationZ; - - // We always set the dim alpha to 0, since we don't want grid task views to dim. - float dimAlpha = 0f; - // We always set the alpha of the view outline to 1, to make sure the shadow is visible. - float viewOutlineAlpha = 1f; - - // We also need to invert the index in order to display the most recent tasks first. - int taskLayoutIndex = taskCount - taskIndex - 1; - boolean isTaskViewVisible = taskLayoutIndex < MAX_LAYOUT_TASK_COUNT; - - // Fill out the transform - transformOut.scale = 1f; - transformOut.alpha = isTaskViewVisible ? 1f : 0f; - transformOut.translationZ = z; - transformOut.dimAlpha = dimAlpha; - transformOut.viewOutlineAlpha = viewOutlineAlpha; - transformOut.rect.set(mTaskGridRect); - transformOut.rect.offset(x, y); - Utilities.scaleRectAboutCenter(transformOut.rect, transformOut.scale); - // We only show the 8 most recent tasks. - transformOut.visible = isTaskViewVisible; - return transformOut; - } - - /** - * Return the proper task index to focus for arrow key navigation. - * @param taskCount The amount of tasks. - * @param currentFocusedIndex The index of the currently focused task. - * @param direction The direction we're navigating. - * @return The index of the task that should get the focus. - */ - public int navigateFocus(int taskCount, int currentFocusedIndex, Direction direction) { - if (taskCount < 1 || taskCount > MAX_LAYOUT_TASK_COUNT) { - return -1; - } - if (currentFocusedIndex == -1) { - return 0; - } - int newIndex = currentFocusedIndex; - final TaskGridRectInfo gridInfo = mTaskGridRectInfoList[taskCount - 1]; - final int currentLine = (taskCount - 1 - currentFocusedIndex) / gridInfo.tasksPerLine; - switch (direction) { - case UP: - newIndex += gridInfo.tasksPerLine; - newIndex = newIndex >= taskCount ? currentFocusedIndex : newIndex; - break; - case DOWN: - newIndex -= gridInfo.tasksPerLine; - newIndex = newIndex < 0 ? currentFocusedIndex : newIndex; - break; - case LEFT: - newIndex++; - final int leftMostIndex = (taskCount - 1) - currentLine * gridInfo.tasksPerLine; - newIndex = newIndex > leftMostIndex ? currentFocusedIndex : newIndex; - break; - case RIGHT: - newIndex--; - int rightMostIndex = - (taskCount - 1) - (currentLine + 1) * gridInfo.tasksPerLine + 1; - rightMostIndex = rightMostIndex < 0 ? 0 : rightMostIndex; - newIndex = newIndex < rightMostIndex ? currentFocusedIndex : newIndex; - break; - } - return newIndex; - } - - public void initialize(Rect windowRect) { - mWindowRect = windowRect; - // Define paddings in terms of percentage of the total area. - mPaddingLeftRight = (int) (0.025f * Math.min(mWindowRect.width(), mWindowRect.height())); - mPaddingTopBottom = (int) (0.1 * mWindowRect.height()); - - // Pre-calculate the positions and offsets of task views so that we can reuse them directly - // in the future. - mTaskGridRectInfoList = new TaskGridRectInfo[MAX_LAYOUT_TASK_COUNT]; - for (int i = 0; i < MAX_LAYOUT_TASK_COUNT; i++) { - mTaskGridRectInfoList[i] = new TaskGridRectInfo(i + 1); - } - } - - public void setSystemInsets(Rect systemInsets) { - mSystemInsets = systemInsets; - updateAppAspectRatio(); - } - - private void updateAppAspectRatio() { - int usableWidth = mScreenSize.x - mSystemInsets.left - mSystemInsets.right; - int usableHeight = mScreenSize.y - mSystemInsets.top - mSystemInsets.bottom; - mAppAspectRatio = (float) usableWidth / (float) usableHeight; - } - - public Rect getStackActionButtonRect() { - Rect buttonRect = new Rect(mWindowRect); - buttonRect.right -= mPaddingLeftRight; - buttonRect.left += mPaddingLeftRight; - buttonRect.bottom = buttonRect.top + mPaddingTopBottom; - return buttonRect; - } - - public void updateTaskGridRect(int taskCount) { - if (taskCount > 0) { - TaskGridRectInfo gridInfo = mTaskGridRectInfoList[taskCount - 1]; - mTaskGridRect.set(gridInfo.size); - } - } - - public Rect getTaskGridRect() { - return mTaskGridRect; - } - - public int getFocusFrameThickness() { - return mFocusedFrameThickness; - } - - public VisibilityReport computeStackVisibilityReport(ArrayList<Task> tasks) { - int visibleCount = Math.min(TaskGridLayoutAlgorithm.MAX_LAYOUT_TASK_COUNT, tasks.size()); - return new VisibilityReport(visibleCount, visibleCount); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/TaskViewFocusFrame.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/TaskViewFocusFrame.java deleted file mode 100644 index 1655f6c83c53..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/grid/TaskViewFocusFrame.java +++ /dev/null @@ -1,141 +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.recents.views.grid; - -import android.content.Context; -import android.graphics.Rect; -import android.util.AttributeSet; -import android.view.View; - -import android.view.ViewTreeObserver.OnGlobalFocusChangeListener; -import com.android.systemui.R; -import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.views.TaskStackView; - -public class TaskViewFocusFrame extends View implements OnGlobalFocusChangeListener { - - private TaskStackView mSv; - private TaskGridLayoutAlgorithm mTaskGridLayoutAlgorithm; - public TaskViewFocusFrame(Context context) { - this(context, null); - } - - public TaskViewFocusFrame(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public TaskViewFocusFrame(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public TaskViewFocusFrame(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - setBackground(mContext.getDrawable( - R.drawable.recents_grid_task_view_focus_frame_background)); - setFocusable(false); - hide(); - } - - public TaskViewFocusFrame(Context context, TaskStackView stackView, - TaskGridLayoutAlgorithm taskGridLayoutAlgorithm) { - this(context); - mSv = stackView; - mTaskGridLayoutAlgorithm = taskGridLayoutAlgorithm; - } - - /** - * Measure the width and height of the focus frame according to the current grid task view size. - */ - public void measure() { - int thickness = mTaskGridLayoutAlgorithm.getFocusFrameThickness(); - Rect rect = mTaskGridLayoutAlgorithm.getTaskGridRect(); - measure( - MeasureSpec.makeMeasureSpec(rect.width() + thickness * 2, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(rect.height() + thickness * 2, MeasureSpec.EXACTLY)); - } - - /** - * Layout the focus frame with its size. - */ - public void layout() { - layout(0, 0, getMeasuredWidth(), getMeasuredHeight()); - } - - /** - * Update the current size of grid task view and the focus frame. - */ - public void resize() { - if (mSv.useGridLayout()) { - mTaskGridLayoutAlgorithm.updateTaskGridRect(mSv.getStack().getTaskCount()); - measure(); - requestLayout(); - } - } - - /** - * Move the task view focus frame to surround the newly focused view. If it's {@code null} or - * it's not an instance of GridTaskView, we hide the focus frame. - * @param newFocus The newly focused view. - */ - public void moveGridTaskViewFocus(View newFocus) { - if (mSv.useGridLayout()) { - // The frame only shows up in the grid layout. It shouldn't show up in the stack - // layout including when we're in the split screen. - if (newFocus instanceof GridTaskView) { - // If the focus goes to a GridTaskView, we show the frame and layout it. - int[] location = new int[2]; - newFocus.getLocationInWindow(location); - int thickness = mTaskGridLayoutAlgorithm.getFocusFrameThickness(); - setTranslationX(location[0] - thickness); - setTranslationY(location[1] - thickness); - show(); - } else { - // If focus goes to other views, we hide the frame. - hide(); - } - } - } - - @Override - public void onGlobalFocusChanged(View oldFocus, View newFocus) { - if (!mSv.useGridLayout()) { - return; - } - if (newFocus == null) { - // We're going to touch mode, unset the focus. - moveGridTaskViewFocus(null); - return; - } - if (oldFocus == null) { - // We're returning from touch mode, set the focus to the previously focused task. - final TaskStack stack = mSv.getStack(); - final int taskCount = stack.getTaskCount(); - final int k = stack.indexOfTask(mSv.getFocusedTask()); - final int taskIndexToFocus = k == -1 ? (taskCount - 1) : (k % taskCount); - mSv.setFocusedTask(taskIndexToFocus, false, true); - } - } - - private void show() { - setAlpha(1f); - } - - private void hide() { - setAlpha(0f); - } -} diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/lowram/TaskStackLowRamLayoutAlgorithm.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/lowram/TaskStackLowRamLayoutAlgorithm.java deleted file mode 100644 index 15c7c87366d2..000000000000 --- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/lowram/TaskStackLowRamLayoutAlgorithm.java +++ /dev/null @@ -1,261 +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.recents.views.lowram; - -import android.content.Context; -import android.graphics.Rect; -import android.view.ViewConfiguration; - -import com.android.systemui.R; -import com.android.systemui.recents.LegacyRecentsImpl; -import com.android.systemui.recents.RecentsActivityLaunchState; -import com.android.systemui.recents.utilities.Utilities; -import com.android.systemui.shared.recents.model.Task; -import com.android.systemui.recents.views.TaskStackLayoutAlgorithm; -import com.android.systemui.recents.views.TaskViewTransform; - -import java.util.ArrayList; - -import static com.android.systemui.recents.views.TaskStackLayoutAlgorithm.VisibilityReport; - -public class TaskStackLowRamLayoutAlgorithm { - - private static final String TAG = "TaskStackLowRamLayoutAlgorithm"; - private static final float MAX_OVERSCROLL = 0.2f / 0.3f; - - public static final int MAX_LAYOUT_TASK_COUNT = 9; - public static final int NUM_TASK_VISIBLE_LAUNCHED_FROM_HOME = 2; - public static final int NUM_TASK_VISIBLE_LAUNCHED_FROM_APP = - NUM_TASK_VISIBLE_LAUNCHED_FROM_HOME + 1; - private Rect mWindowRect; - - private int mFlingThreshold; - private int mPadding; - private int mPaddingLeftRight; - private int mTopOffset; - private int mPaddingEndTopBottom; - private Rect mTaskRect = new Rect(); - private Rect mSystemInsets = new Rect(); - - public TaskStackLowRamLayoutAlgorithm(Context context) { - reloadOnConfigurationChange(context); - } - - public void reloadOnConfigurationChange(Context context) { - mPadding = context.getResources() - .getDimensionPixelSize(R.dimen.recents_layout_side_margin_phone); - mFlingThreshold = ViewConfiguration.get(context).getScaledMinimumFlingVelocity(); - } - - public void initialize(Rect windowRect) { - mWindowRect = windowRect; - if (mWindowRect.height() > 0) { - int windowHeight = mWindowRect.height() - mSystemInsets.bottom; - int windowWidth = mWindowRect.width() - mSystemInsets.right - mSystemInsets.left; - int width = Math.min(windowWidth, windowHeight) - mPadding * 2; - boolean isLandscape = windowWidth > windowHeight; - mTaskRect.set(0, 0, width, isLandscape ? width * 2 / 3 : width); - mPaddingLeftRight = (windowWidth - mTaskRect.width()) / 2; - mPaddingEndTopBottom = (windowHeight - mTaskRect.height()) / 2; - - // Compute the top offset to center tasks in the middle of the screen - mTopOffset = (getTotalHeightOfTasks(MAX_LAYOUT_TASK_COUNT) - windowHeight) / 2; - } - } - - public void setSystemInsets(Rect systemInsets) { - mSystemInsets = systemInsets; - } - - public VisibilityReport computeStackVisibilityReport(ArrayList<Task> tasks) { - RecentsActivityLaunchState launchState = LegacyRecentsImpl.getConfiguration().getLaunchState(); - int maxVisible = launchState.launchedFromHome || launchState.launchedFromPipApp - || launchState.launchedWithNextPipApp - ? NUM_TASK_VISIBLE_LAUNCHED_FROM_HOME - : NUM_TASK_VISIBLE_LAUNCHED_FROM_APP; - int visibleCount = Math.min(maxVisible, tasks.size()); - return new VisibilityReport(visibleCount, visibleCount); - } - - public void getFrontOfStackTransform(TaskViewTransform transformOut, - TaskStackLayoutAlgorithm stackLayout) { - if (mWindowRect == null) { - transformOut.reset(); - return; - } - - // Calculate the static task y position 2 tasks after/below the middle/current task - int windowHeight = mWindowRect.height() - mSystemInsets.bottom; - int bottomOfCurrentTask = (windowHeight + mTaskRect.height()) / 2; - int y = bottomOfCurrentTask + mTaskRect.height() + mPadding * 2; - fillStackTransform(transformOut, y, stackLayout.mMaxTranslationZ, true); - } - - public void getBackOfStackTransform(TaskViewTransform transformOut, - TaskStackLayoutAlgorithm stackLayout) { - if (mWindowRect == null) { - transformOut.reset(); - return; - } - - // Calculate the static task y position 2 tasks before/above the middle/current task - int windowHeight = mWindowRect.height() - mSystemInsets.bottom; - int topOfCurrentTask = (windowHeight - mTaskRect.height()) / 2; - int y = topOfCurrentTask - (mTaskRect.height() + mPadding) * 2; - fillStackTransform(transformOut, y, stackLayout.mMaxTranslationZ, true); - } - - public TaskViewTransform getTransform(int taskIndex, float stackScroll, - TaskViewTransform transformOut, int taskCount, TaskStackLayoutAlgorithm stackLayout) { - if (taskCount == 0) { - transformOut.reset(); - return transformOut; - } - boolean visible = true; - int y; - if (taskCount > 1) { - y = getTaskTopFromIndex(taskIndex) - percentageToScroll(stackScroll); - - // Check visibility from the bottom of the task - visible = y + mPadding + getTaskRect().height() > 0; - } else { - int windowHeight = mWindowRect.height() - mSystemInsets.bottom; - y = (windowHeight - mTaskRect.height()) / 2 - percentageToScroll(stackScroll); - } - fillStackTransform(transformOut, y, stackLayout.mMaxTranslationZ, visible); - return transformOut; - } - - /** - * Finds the closest task to the scroll percentage in the y axis and returns the percentage of - * the task to scroll to. - * @param scrollP percentage to find nearest to - * @param numTasks number of tasks in recents stack - * @param velocity speed of fling - */ - public float getClosestTaskP(float scrollP, int numTasks, int velocity) { - int y = percentageToScroll(scrollP); - - int lastY = getTaskTopFromIndex(0) - mPaddingEndTopBottom; - for (int i = 1; i < numTasks; i++) { - int taskY = getTaskTopFromIndex(i) - mPaddingEndTopBottom; - int diff = taskY - y; - if (diff > 0) { - int diffPrev = Math.abs(y - lastY); - boolean useNext = diff > diffPrev; - if (Math.abs(velocity) > mFlingThreshold) { - useNext = velocity > 0; - } - return useNext - ? scrollToPercentage(lastY) : scrollToPercentage(taskY); - } - lastY = taskY; - } - return scrollToPercentage(lastY); - } - - /** - * Convert a scroll value to a percentage - * @param scroll a scroll value - * @return a percentage that represents the scroll from the total height of tasks - */ - public float scrollToPercentage(int scroll) { - return (float) scroll / (mTaskRect.height() + mPadding); - } - - /** - * Converts a percentage to the scroll value from the total height of tasks - * @param p a percentage that represents the scroll value - * @return a scroll value in pixels - */ - public int percentageToScroll(float p) { - return (int) (p * (mTaskRect.height() + mPadding)); - } - - /** - * Get the min scroll progress for low ram layout. This computes the top position of the - * first task and reduce by the end padding to center the first task - * @return position of max scroll - */ - public float getMinScrollP() { - return getScrollPForTask(0); - } - - /** - * Get the max scroll progress for low ram layout. This computes the top position of the last - * task and reduce by the end padding to center the last task - * @param taskCount the amount of tasks in the recents stack - * @return position of max scroll - */ - public float getMaxScrollP(int taskCount) { - return getScrollPForTask(taskCount - 1); - } - - /** - * Get the initial scroll value whether launched from home or from an app. - * @param taskCount the amount of tasks currently in recents - * @param fromHome if launching recents from home or not - * @return from home it will return max value and from app it will return 2nd last task - */ - public float getInitialScrollP(int taskCount, boolean fromHome) { - if (fromHome) { - return getMaxScrollP(taskCount); - } - if (taskCount < 2) { - return 0; - } - return getScrollPForTask(taskCount - 2); - } - - /** - * Get the scroll progress for any task - * @param taskIndex task index to get the scroll progress of - * @return scroll progress of task - */ - public float getScrollPForTask(int taskIndex) { - return scrollToPercentage(getTaskTopFromIndex(taskIndex) - mPaddingEndTopBottom); - } - - public Rect getTaskRect() { - return mTaskRect; - } - - public float getMaxOverscroll() { - return MAX_OVERSCROLL; - } - - private int getTaskTopFromIndex(int index) { - return getTotalHeightOfTasks(index) - mTopOffset; - } - - private int getTotalHeightOfTasks(int taskCount) { - return taskCount * mTaskRect.height() + (taskCount + 1) * mPadding; - } - - private void fillStackTransform(TaskViewTransform transformOut, int y, int translationZ, - boolean visible) { - transformOut.scale = 1f; - transformOut.alpha = 1f; - transformOut.translationZ = translationZ; - transformOut.dimAlpha = 0f; - transformOut.viewOutlineAlpha = 1f; - transformOut.rect.set(getTaskRect()); - transformOut.rect.offset(mPaddingLeftRight + mSystemInsets.left, y); - Utilities.scaleRectAboutCenter(transformOut.rect, transformOut.scale); - transformOut.visible = visible; - } -} diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml index 0fe7084bb145..485240a8895b 100644 --- a/packages/SystemUI/res-keyguard/values/strings.xml +++ b/packages/SystemUI/res-keyguard/values/strings.xml @@ -62,7 +62,7 @@ <!-- When the lock screen is showing, the phone is plugged in and the battery is fully charged, say that it is charged. --> - <string name="keyguard_charged">Fully charged</string> + <string name="keyguard_charged">Charged</string> <!-- When the lock screen is showing and the phone plugged in, and the battery is not fully charged, say that it's wirelessly charging. [CHAR LIMIT=50] --> <string name="keyguard_plugged_in_wireless"><xliff:g id="percentage" example="20%">%s</xliff:g> • Charging wirelessly</string> diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index 8ba4c9c05ba6..ba6b6956f187 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -24,6 +24,21 @@ android:layout_width="match_parent" android:background="@drawable/system_bar_background"> + <com.android.systemui.CornerHandleView + android:id="@+id/assist_hint_left" + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_gravity="left|bottom" + android:rotation="270" + android:visibility="gone"/> + <com.android.systemui.CornerHandleView + android:id="@+id/assist_hint_right" + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_gravity="right|bottom" + android:rotation="180" + android:visibility="gone"/> + <com.android.systemui.statusbar.phone.NavigationBarInflaterView android:id="@+id/navigation_inflater" android:layout_width="match_parent" diff --git a/packages/SystemUI/res/layout/rounded_corners.xml b/packages/SystemUI/res/layout/rounded_corners.xml index b409c8f2ba5a..1849068d91b8 100644 --- a/packages/SystemUI/res/layout/rounded_corners.xml +++ b/packages/SystemUI/res/layout/rounded_corners.xml @@ -18,18 +18,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <com.android.systemui.CornerHandleView - android:id="@+id/assist_hint_left" - android:layout_width="36dp" - android:layout_height="36dp" - android:layout_gravity="left|top" - android:visibility="gone"/> - <com.android.systemui.CornerHandleView - android:id="@+id/assist_hint_right" - android:layout_width="36dp" - android:layout_height="36dp" - android:layout_gravity="right|bottom" - android:visibility="gone"/> <ImageView android:id="@+id/left" android:layout_width="12dp" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_plugin_frame.xml b/packages/SystemUI/res/layout/status_bar_expanded_plugin_frame.xml index 4849dfb777ed..7d6ff3b16db6 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_plugin_frame.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_plugin_frame.xml @@ -20,10 +20,10 @@ android:id="@+id/plugin_frame" android:theme="@style/qs_theme" android:layout_width="@dimen/qs_panel_width" - android:layout_height="96dp" + android:layout_height="105dp" android:layout_gravity="center_horizontal" - android:layout_marginTop="@*android:dimen/quick_qs_total_height" + android:layout_marginTop="@dimen/notification_side_paddings" android:layout_marginLeft="@dimen/notification_side_paddings" android:layout_marginRight="@dimen/notification_side_paddings" android:visibility="gone" - android:background="@drawable/qs_background_primary"/>
\ No newline at end of file + android:background="@drawable/qs_background_primary"/> diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp index 31a538c65dea..447181813888 100644 --- a/packages/SystemUI/shared/Android.bp +++ b/packages/SystemUI/shared/Android.bp @@ -27,4 +27,6 @@ android_library { // Enforce that the library is built against java 7 so that there are // no compatibility issues with launcher java_version: "1.7", + + min_sdk_version: "26", } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl index 9228b178c76f..1cabee1ae679 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl @@ -109,4 +109,9 @@ interface ISystemUiProxy { * Ends the system screen pinning. */ void stopScreenPinning() = 17; + + /** + * Sets the shelf height and visibility. + */ + void setShelfHeight(boolean visible, int shelfHeight) = 20; } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/PinnedStackListenerForwarder.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/PinnedStackListenerForwarder.java index 2797042ac160..fe5a57a277a4 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/PinnedStackListenerForwarder.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/PinnedStackListenerForwarder.java @@ -69,13 +69,6 @@ public class PinnedStackListenerForwarder extends IPinnedStackListener.Stub { } @Override - public void onShelfVisibilityChanged(boolean shelfVisible, int shelfHeight) { - for (PinnedStackListener listener : mListeners) { - listener.onShelfVisibilityChanged(shelfVisible, shelfHeight); - } - } - - @Override public void onMinimizedStateChanged(boolean isMinimized) { for (PinnedStackListener listener : mListeners) { listener.onMinimizedStateChanged(isMinimized); @@ -143,8 +136,6 @@ public class PinnedStackListenerForwarder extends IPinnedStackListener.Stub { public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {} - public void onShelfVisibilityChanged(boolean shelfVisible, int shelfHeight) {} - public void onMinimizedStateChanged(boolean isMinimized) {} public void onActionsChanged(ParceledListSlice actions) {} diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java index 9f1a1fafeec6..ad182fe57f81 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java @@ -143,14 +143,6 @@ public class WindowManagerWrapper { } } - public void setShelfHeight(boolean visible, int shelfHeight) { - try { - WindowManagerGlobal.getWindowManagerService().setShelfHeight(visible, shelfHeight); - } catch (RemoteException e) { - Log.w(TAG, "Failed to set shelf height"); - } - } - public void setRecentsVisibility(boolean visible) { try { WindowManagerGlobal.getWindowManagerService().setRecentsVisibility(visible); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java index eaaa3ed78654..e3ac0f684e44 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java @@ -86,13 +86,12 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView mSecurityMessageDisplay.setMessage(""); } final boolean wasDisabled = mPasswordEntry.isEnabled(); - // Don't set enabled password entry & showSoftInput when PasswordEntry is invisible or in - // pausing stage. + setPasswordEntryEnabled(true); + setPasswordEntryInputEnabled(true); + // Don't call showSoftInput when PasswordEntry is invisible or in pausing stage. if (!mResumed || !mPasswordEntry.isVisibleToUser()) { return; } - setPasswordEntryEnabled(true); - setPasswordEntryInputEnabled(true); if (wasDisabled) { mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT); } diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index f38b4f259c88..3e068b0a0964 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -25,9 +25,6 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M import static com.android.systemui.tuner.TunablePadding.FLAG_END; import static com.android.systemui.tuner.TunablePadding.FLAG_START; -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; import android.annotation.Dimension; import android.app.ActivityManager; import android.app.Fragment; @@ -52,7 +49,6 @@ import android.os.SystemProperties; import android.provider.Settings.Secure; import android.util.DisplayMetrics; import android.util.Log; -import android.util.MathUtils; import android.view.DisplayCutout; import android.view.DisplayInfo; import android.view.Gravity; @@ -64,9 +60,6 @@ import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.ViewTreeObserver; import android.view.WindowManager; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.Interpolator; -import android.view.animation.PathInterpolator; import android.widget.FrameLayout; import android.widget.ImageView; @@ -78,10 +71,7 @@ import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentHostManager.FragmentListener; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.SecureSetting; -import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.phone.CollapsedStatusBarFragment; -import com.android.systemui.statusbar.phone.NavigationBarTransitions; -import com.android.systemui.statusbar.phone.NavigationModeController; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.tuner.TunablePadding; import com.android.systemui.tuner.TunerService; @@ -95,8 +85,7 @@ import java.util.List; * An overlay that draws screen decorations in software (e.g for rounded corners or display cutout) * for antialiasing and emulation purposes. */ -public class ScreenDecorations extends SystemUI implements Tunable, - NavigationBarTransitions.DarkIntensityListener { +public class ScreenDecorations extends SystemUI implements Tunable { private static final boolean DEBUG = false; private static final String TAG = "ScreenDecorations"; @@ -120,15 +109,11 @@ public class ScreenDecorations extends SystemUI implements Tunable, private float mDensity; private WindowManager mWindowManager; private int mRotation; - private boolean mAssistHintVisible; private DisplayCutoutView mCutoutTop; private DisplayCutoutView mCutoutBottom; private SecureSetting mColorInversionSetting; private boolean mPendingRotationChange; private Handler mHandler; - private boolean mAssistHintBlocked = false; - private boolean mIsReceivingNavBarColor = false; - private boolean mInGesturalMode; /** * Converts a set of {@link Rect}s into a {@link Region} @@ -153,160 +138,6 @@ public class ScreenDecorations extends SystemUI implements Tunable, mHandler.post(this::startOnScreenDecorationsThread); setupStatusBarPaddingIfNeeded(); putComponent(ScreenDecorations.class, this); - mInGesturalMode = QuickStepContract.isGesturalMode( - Dependency.get(NavigationModeController.class) - .addListener(this::handleNavigationModeChange)); - } - - @VisibleForTesting - void handleNavigationModeChange(int navigationMode) { - if (!mHandler.getLooper().isCurrentThread()) { - mHandler.post(() -> handleNavigationModeChange(navigationMode)); - return; - } - boolean inGesturalMode = QuickStepContract.isGesturalMode(navigationMode); - if (mInGesturalMode != inGesturalMode) { - mInGesturalMode = inGesturalMode; - - if (mInGesturalMode && mOverlay == null) { - setupDecorations(); - if (mOverlay != null) { - updateLayoutParams(); - } - } - } - } - - /** - * Returns an animator that animates the given view from start to end over durationMs. Start and - * end represent total animation progress: 0 is the start, 1 is the end, 1.1 would be an - * overshoot. - */ - Animator getHandleAnimator(View view, float start, float end, boolean isLeft, long durationMs, - Interpolator interpolator) { - // Note that lerp does allow overshoot, in cases where start and end are outside of [0,1]. - float scaleStart = MathUtils.lerp(2f, 1f, start); - float scaleEnd = MathUtils.lerp(2f, 1f, end); - Animator scaleX = ObjectAnimator.ofFloat(view, View.SCALE_X, scaleStart, scaleEnd); - Animator scaleY = ObjectAnimator.ofFloat(view, View.SCALE_Y, scaleStart, scaleEnd); - float translationStart = MathUtils.lerp(0.2f, 0f, start); - float translationEnd = MathUtils.lerp(0.2f, 0f, end); - int xDirection = isLeft ? -1 : 1; - Animator translateX = ObjectAnimator.ofFloat(view, View.TRANSLATION_X, - xDirection * translationStart * view.getWidth(), - xDirection * translationEnd * view.getWidth()); - Animator translateY = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, - translationStart * view.getHeight(), translationEnd * view.getHeight()); - - AnimatorSet set = new AnimatorSet(); - set.play(scaleX).with(scaleY); - set.play(scaleX).with(translateX); - set.play(scaleX).with(translateY); - set.setDuration(durationMs); - set.setInterpolator(interpolator); - return set; - } - - private void fade(View view, boolean fadeIn, boolean isLeft) { - if (fadeIn) { - view.animate().cancel(); - view.setAlpha(1f); - view.setVisibility(View.VISIBLE); - - // A piecewise spring-like interpolation. - // End value in one animator call must match the start value in the next, otherwise - // there will be a discontinuity. - AnimatorSet anim = new AnimatorSet(); - Animator first = getHandleAnimator(view, 0, 1.1f, isLeft, 750, - new PathInterpolator(0, 0.45f, .67f, 1f)); - Interpolator secondInterpolator = new PathInterpolator(0.33f, 0, 0.67f, 1f); - Animator second = getHandleAnimator(view, 1.1f, 0.97f, isLeft, 400, - secondInterpolator); - Animator third = getHandleAnimator(view, 0.97f, 1.02f, isLeft, 400, - secondInterpolator); - Animator fourth = getHandleAnimator(view, 1.02f, 1f, isLeft, 400, - secondInterpolator); - anim.play(first).before(second); - anim.play(second).before(third); - anim.play(third).before(fourth); - anim.start(); - } else { - view.animate().cancel(); - view.animate() - .setInterpolator(new AccelerateInterpolator(1.5f)) - .setDuration(250) - .alpha(0f); - } - - } - - /** - * Controls the visibility of the assist gesture handles. - * - * @param visible whether the handles should be shown - */ - public void setAssistHintVisible(boolean visible) { - if (!mHandler.getLooper().isCurrentThread()) { - mHandler.post(() -> setAssistHintVisible(visible)); - return; - } - - if (mAssistHintBlocked && visible) { - if (VERBOSE) { - Log.v(TAG, "Assist hint blocked, cannot make it visible"); - } - return; - } - - if (mOverlay == null || mBottomOverlay == null) { - return; - } - - if (mAssistHintVisible != visible) { - mAssistHintVisible = visible; - - CornerHandleView assistHintTopLeft = mOverlay.findViewById(R.id.assist_hint_left); - CornerHandleView assistHintTopRight = mOverlay.findViewById(R.id.assist_hint_right); - CornerHandleView assistHintBottomLeft = mBottomOverlay.findViewById( - R.id.assist_hint_left); - CornerHandleView assistHintBottomRight = mBottomOverlay.findViewById( - R.id.assist_hint_right); - - switch (mRotation) { - case RotationUtils.ROTATION_NONE: - fade(assistHintBottomLeft, mAssistHintVisible, /* isLeft = */ true); - fade(assistHintBottomRight, mAssistHintVisible, /* isLeft = */ false); - break; - case RotationUtils.ROTATION_LANDSCAPE: - fade(assistHintTopRight, mAssistHintVisible, /* isLeft = */ true); - fade(assistHintBottomRight, mAssistHintVisible, /* isLeft = */ false); - break; - case RotationUtils.ROTATION_SEASCAPE: - fade(assistHintTopLeft, mAssistHintVisible, /* isLeft = */ false); - fade(assistHintBottomLeft, mAssistHintVisible, /* isLeft = */ true); - break; - case RotationUtils.ROTATION_UPSIDE_DOWN: - fade(assistHintTopLeft, mAssistHintVisible, /* isLeft = */ false); - fade(assistHintTopRight, mAssistHintVisible, /* isLeft = */ true); - break; - } - } - updateWindowVisibilities(); - } - - /** - * Prevents the assist hint from becoming visible even if `mAssistHintVisible` is true. - */ - public void setAssistHintBlocked(boolean blocked) { - if (!mHandler.getLooper().isCurrentThread()) { - mHandler.post(() -> setAssistHintBlocked(blocked)); - return; - } - - mAssistHintBlocked = blocked; - if (mAssistHintVisible && mAssistHintBlocked) { - hideAssistHandles(); - } } @VisibleForTesting @@ -316,15 +147,11 @@ public class ScreenDecorations extends SystemUI implements Tunable, return thread.getThreadHandler(); } - private boolean shouldHostHandles() { - return mInGesturalMode; - } - private void startOnScreenDecorationsThread() { mRotation = RotationUtils.getExactRotation(mContext); mWindowManager = mContext.getSystemService(WindowManager.class); updateRoundedCornerRadii(); - if (hasRoundedCorners() || shouldDrawCutout() || shouldHostHandles()) { + if (hasRoundedCorners() || shouldDrawCutout()) { setupDecorations(); } @@ -501,26 +328,10 @@ public class ScreenDecorations extends SystemUI implements Tunable, if (mOverlay != null) { updateLayoutParams(); updateViews(); - if (mAssistHintVisible) { - // If assist handles are visible, hide them without animation and then make them - // show once again (with corrected rotation). - hideAssistHandles(); - setAssistHintVisible(true); - } } } } - private void hideAssistHandles() { - if (mOverlay != null && mBottomOverlay != null) { - mOverlay.findViewById(R.id.assist_hint_left).setVisibility(View.GONE); - mOverlay.findViewById(R.id.assist_hint_right).setVisibility(View.GONE); - mBottomOverlay.findViewById(R.id.assist_hint_left).setVisibility(View.GONE); - mBottomOverlay.findViewById(R.id.assist_hint_right).setVisibility(View.GONE); - mAssistHintVisible = false; - } - } - private void updateRoundedCornerRadii() { final int newRoundedDefault = mContext.getResources().getDimensionPixelSize( com.android.internal.R.dimen.rounded_corner_radius); @@ -569,52 +380,12 @@ public class ScreenDecorations extends SystemUI implements Tunable, updateView(bottomRight, Gravity.TOP | Gravity.LEFT, 0); } - updateAssistantHandleViews(); mCutoutTop.setRotation(mRotation); mCutoutBottom.setRotation(mRotation); updateWindowVisibilities(); } - private void updateAssistantHandleViews() { - View assistHintTopLeft = mOverlay.findViewById(R.id.assist_hint_left); - View assistHintTopRight = mOverlay.findViewById(R.id.assist_hint_right); - View assistHintBottomLeft = mBottomOverlay.findViewById(R.id.assist_hint_left); - View assistHintBottomRight = mBottomOverlay.findViewById(R.id.assist_hint_right); - - final int assistHintVisibility = mAssistHintVisible ? View.VISIBLE : View.INVISIBLE; - - if (mRotation == RotationUtils.ROTATION_NONE) { - assistHintTopLeft.setVisibility(View.GONE); - assistHintTopRight.setVisibility(View.GONE); - assistHintBottomLeft.setVisibility(assistHintVisibility); - assistHintBottomRight.setVisibility(assistHintVisibility); - updateView(assistHintBottomLeft, Gravity.BOTTOM | Gravity.LEFT, 270); - updateView(assistHintBottomRight, Gravity.BOTTOM | Gravity.RIGHT, 180); - } else if (mRotation == RotationUtils.ROTATION_LANDSCAPE) { - assistHintTopLeft.setVisibility(View.GONE); - assistHintTopRight.setVisibility(assistHintVisibility); - assistHintBottomLeft.setVisibility(View.GONE); - assistHintBottomRight.setVisibility(assistHintVisibility); - updateView(assistHintTopRight, Gravity.BOTTOM | Gravity.LEFT, 270); - updateView(assistHintBottomRight, Gravity.BOTTOM | Gravity.RIGHT, 180); - } else if (mRotation == RotationUtils.ROTATION_UPSIDE_DOWN) { - assistHintTopLeft.setVisibility(assistHintVisibility); - assistHintTopRight.setVisibility(assistHintVisibility); - assistHintBottomLeft.setVisibility(View.GONE); - assistHintBottomRight.setVisibility(View.GONE); - updateView(assistHintTopLeft, Gravity.BOTTOM | Gravity.LEFT, 270); - updateView(assistHintTopRight, Gravity.BOTTOM | Gravity.RIGHT, 180); - } else if (mRotation == RotationUtils.ROTATION_SEASCAPE) { - assistHintTopLeft.setVisibility(assistHintVisibility); - assistHintTopRight.setVisibility(View.GONE); - assistHintBottomLeft.setVisibility(assistHintVisibility); - assistHintBottomRight.setVisibility(View.GONE); - updateView(assistHintTopLeft, Gravity.BOTTOM | Gravity.RIGHT, 180); - updateView(assistHintBottomLeft, Gravity.BOTTOM | Gravity.LEFT, 270); - } - } - private void updateView(View v, int gravity, int rotation) { ((FrameLayout.LayoutParams) v.getLayoutParams()).gravity = gravity; v.setRotation(rotation); @@ -629,10 +400,7 @@ public class ScreenDecorations extends SystemUI implements Tunable, boolean visibleForCutout = shouldDrawCutout() && overlay.findViewById(R.id.display_cutout).getVisibility() == View.VISIBLE; boolean visibleForRoundedCorners = hasRoundedCorners(); - boolean visibleForHandles = overlay.findViewById(R.id.assist_hint_left).getVisibility() - == View.VISIBLE || overlay.findViewById(R.id.assist_hint_right).getVisibility() - == View.VISIBLE; - overlay.setVisibility(visibleForCutout || visibleForRoundedCorners || visibleForHandles + overlay.setVisibility(visibleForCutout || visibleForRoundedCorners ? View.VISIBLE : View.GONE); } @@ -766,31 +534,6 @@ public class ScreenDecorations extends SystemUI implements Tunable, view.setLayoutParams(params); } - @Override - public void onDarkIntensity(float darkIntensity) { - if (!mHandler.getLooper().isCurrentThread()) { - mHandler.post(() -> onDarkIntensity(darkIntensity)); - return; - } - if (mOverlay != null) { - CornerHandleView assistHintTopLeft = mOverlay.findViewById(R.id.assist_hint_left); - CornerHandleView assistHintTopRight = mOverlay.findViewById(R.id.assist_hint_right); - - assistHintTopLeft.updateDarkness(darkIntensity); - assistHintTopRight.updateDarkness(darkIntensity); - } - - if (mBottomOverlay != null) { - CornerHandleView assistHintBottomLeft = mBottomOverlay.findViewById( - R.id.assist_hint_left); - CornerHandleView assistHintBottomRight = mBottomOverlay.findViewById( - R.id.assist_hint_right); - - assistHintBottomLeft.updateDarkness(darkIntensity); - assistHintBottomRight.updateDarkness(darkIntensity); - } - } - @VisibleForTesting static class TunablePaddingTagListener implements FragmentListener { diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java index 2c8324cafca0..aa13fa834f56 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java @@ -92,6 +92,12 @@ public class SystemUIAppComponentFactory extends AppComponentFactory { public Activity instantiateActivityCompat(@NonNull ClassLoader cl, @NonNull String className, @Nullable Intent intent) throws InstantiationException, IllegalAccessException, ClassNotFoundException { + if (mComponentHelper == null) { + // This shouldn't happen, but is seen on occasion. + // Bug filed against framework to take a look: http://b/141008541 + SystemUIFactory.getInstance().getRootComponent().inject( + SystemUIAppComponentFactory.this); + } Activity activity = mComponentHelper.resolveActivity(className); if (activity != null) { return activity; diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIBinder.java b/packages/SystemUI/src/com/android/systemui/SystemUIBinder.java index 4531c892a022..0fa80aca97fb 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIBinder.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIBinder.java @@ -17,6 +17,7 @@ package com.android.systemui; import com.android.systemui.keyguard.KeyguardViewMediator; +import com.android.systemui.power.PowerUI; import dagger.Binds; import dagger.Module; @@ -33,4 +34,10 @@ public abstract class SystemUIBinder { @IntoMap @ClassKey(KeyguardViewMediator.class) public abstract SystemUI bindKeyguardViewMediator(KeyguardViewMediator sysui); + + /** Inject into PowerUI. */ + @Binds + @IntoMap + @ClassKey(PowerUI.class) + public abstract SystemUI bindPowerUI(PowerUI sysui); } diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java index 9bdfa03408aa..4516996345b9 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java @@ -32,7 +32,6 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.DumpController; import com.android.systemui.Dumpable; -import com.android.systemui.ScreenDecorations; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.phone.NavigationModeController; @@ -71,7 +70,7 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac private final Handler mHandler; private final Runnable mHideHandles = this::hideHandles; private final Runnable mShowAndGo = this::showAndGoInternal; - private final Provider<ScreenDecorations> mScreenDecorations; + private final Provider<AssistHandleViewController> mAssistHandleViewController; private final PhenotypeHelper mPhenotypeHelper; private final Map<AssistHandleBehavior, BehaviorController> mBehaviorMap; @@ -90,7 +89,7 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac Context context, AssistUtils assistUtils, @Named(ASSIST_HANDLE_THREAD_NAME) Handler handler, - Provider<ScreenDecorations> screenDecorations, + Provider<AssistHandleViewController> assistHandleViewController, PhenotypeHelper phenotypeHelper, Map<AssistHandleBehavior, BehaviorController> behaviorMap, NavigationModeController navigationModeController, @@ -98,7 +97,7 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac mContext = context; mAssistUtils = assistUtils; mHandler = handler; - mScreenDecorations = screenDecorations; + mAssistHandleViewController = assistHandleViewController; mPhenotypeHelper = phenotypeHelper; mBehaviorMap = behaviorMap; @@ -193,7 +192,7 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac try { setBehavior(AssistHandleBehavior.valueOf(behavior)); } catch (IllegalArgumentException | NullPointerException e) { - Log.e(TAG, "Invalid behavior: " + behavior, e); + Log.e(TAG, "Invalid behavior: " + behavior); } } @@ -229,12 +228,13 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac } if (handlesUnblocked(ignoreThreshold)) { - ScreenDecorations screenDecorations = mScreenDecorations.get(); - if (screenDecorations == null) { - Log.w(TAG, "Couldn't show handles, ScreenDecorations unavailable"); + mHandlesShowing = true; + AssistHandleViewController assistHandleViewController = + mAssistHandleViewController.get(); + if (assistHandleViewController == null) { + Log.w(TAG, "Couldn't show handles, AssistHandleViewController unavailable"); } else { - mHandlesShowing = true; - screenDecorations.setAssistHintVisible(true); + assistHandleViewController.setAssistHintVisible(true); } } } @@ -244,13 +244,14 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac return; } - ScreenDecorations screenDecorations = mScreenDecorations.get(); - if (screenDecorations == null) { - Log.w(TAG, "Couldn't hide handles, ScreenDecorations unavailable"); + mHandlesShowing = false; + mHandlesLastHiddenAt = SystemClock.elapsedRealtime(); + AssistHandleViewController assistHandleViewController = + mAssistHandleViewController.get(); + if (assistHandleViewController == null) { + Log.w(TAG, "Couldn't show handles, AssistHandleViewController unavailable"); } else { - mHandlesShowing = false; - mHandlesLastHiddenAt = SystemClock.elapsedRealtime(); - screenDecorations.setAssistHintVisible(false); + assistHandleViewController.setAssistHintVisible(false); } } diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleViewController.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleViewController.java new file mode 100644 index 000000000000..f9ffb804f9f3 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleViewController.java @@ -0,0 +1,172 @@ +/* + * 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.assist; + +import android.animation.Animator; +import android.animation.AnimatorSet; +import android.animation.ObjectAnimator; +import android.os.Handler; +import android.util.Log; +import android.util.MathUtils; +import android.view.View; +import android.view.animation.AccelerateInterpolator; +import android.view.animation.Interpolator; +import android.view.animation.PathInterpolator; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.CornerHandleView; +import com.android.systemui.R; +import com.android.systemui.statusbar.phone.NavigationBarTransitions; + +/** + * A class for managing Assistant handle show, hide and animation. + */ +public class AssistHandleViewController implements NavigationBarTransitions.DarkIntensityListener { + + private static final boolean DEBUG = false; + private static final String TAG = "AssistHandleViewController"; + + private Handler mHandler; + private CornerHandleView mAssistHintLeft; + private CornerHandleView mAssistHintRight; + + @VisibleForTesting + boolean mAssistHintVisible; + @VisibleForTesting + boolean mAssistHintBlocked = false; + + public AssistHandleViewController(Handler handler, View navBar) { + mHandler = handler; + mAssistHintLeft = navBar.findViewById(R.id.assist_hint_left); + mAssistHintRight = navBar.findViewById(R.id.assist_hint_right); + } + + @Override + public void onDarkIntensity(float darkIntensity) { + mAssistHintLeft.updateDarkness(darkIntensity); + mAssistHintRight.updateDarkness(darkIntensity); + } + + /** + * Controls the visibility of the assist gesture handles. + * + * @param visible whether the handles should be shown + */ + public void setAssistHintVisible(boolean visible) { + if (!mHandler.getLooper().isCurrentThread()) { + mHandler.post(() -> setAssistHintVisible(visible)); + return; + } + + if (mAssistHintBlocked && visible) { + if (DEBUG) { + Log.v(TAG, "Assist hint blocked, cannot make it visible"); + } + return; + } + + if (mAssistHintVisible != visible) { + mAssistHintVisible = visible; + fade(mAssistHintLeft, mAssistHintVisible, /* isLeft = */ true); + fade(mAssistHintRight, mAssistHintVisible, /* isLeft = */ false); + } + } + + /** + * Prevents the assist hint from becoming visible even if `mAssistHintVisible` is true. + */ + public void setAssistHintBlocked(boolean blocked) { + if (!mHandler.getLooper().isCurrentThread()) { + mHandler.post(() -> setAssistHintBlocked(blocked)); + return; + } + + mAssistHintBlocked = blocked; + if (mAssistHintVisible && mAssistHintBlocked) { + hideAssistHandles(); + } + } + + private void hideAssistHandles() { + mAssistHintLeft.setVisibility(View.GONE); + mAssistHintRight.setVisibility(View.GONE); + mAssistHintVisible = false; + } + + /** + * Returns an animator that animates the given view from start to end over durationMs. Start and + * end represent total animation progress: 0 is the start, 1 is the end, 1.1 would be an + * overshoot. + */ + Animator getHandleAnimator(View view, float start, float end, boolean isLeft, long durationMs, + Interpolator interpolator) { + // Note that lerp does allow overshoot, in cases where start and end are outside of [0,1]. + float scaleStart = MathUtils.lerp(2f, 1f, start); + float scaleEnd = MathUtils.lerp(2f, 1f, end); + Animator scaleX = ObjectAnimator.ofFloat(view, View.SCALE_X, scaleStart, scaleEnd); + Animator scaleY = ObjectAnimator.ofFloat(view, View.SCALE_Y, scaleStart, scaleEnd); + float translationStart = MathUtils.lerp(0.2f, 0f, start); + float translationEnd = MathUtils.lerp(0.2f, 0f, end); + int xDirection = isLeft ? -1 : 1; + Animator translateX = ObjectAnimator.ofFloat(view, View.TRANSLATION_X, + xDirection * translationStart * view.getWidth(), + xDirection * translationEnd * view.getWidth()); + Animator translateY = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, + translationStart * view.getHeight(), translationEnd * view.getHeight()); + + AnimatorSet set = new AnimatorSet(); + set.play(scaleX).with(scaleY); + set.play(scaleX).with(translateX); + set.play(scaleX).with(translateY); + set.setDuration(durationMs); + set.setInterpolator(interpolator); + return set; + } + + private void fade(View view, boolean fadeIn, boolean isLeft) { + if (fadeIn) { + view.animate().cancel(); + view.setAlpha(1f); + view.setVisibility(View.VISIBLE); + + // A piecewise spring-like interpolation. + // End value in one animator call must match the start value in the next, otherwise + // there will be a discontinuity. + AnimatorSet anim = new AnimatorSet(); + Animator first = getHandleAnimator(view, 0, 1.1f, isLeft, 750, + new PathInterpolator(0, 0.45f, .67f, 1f)); + Interpolator secondInterpolator = new PathInterpolator(0.33f, 0, 0.67f, 1f); + Animator second = getHandleAnimator(view, 1.1f, 0.97f, isLeft, 400, + secondInterpolator); + Animator third = getHandleAnimator(view, 0.97f, 1.02f, isLeft, 400, + secondInterpolator); + Animator fourth = getHandleAnimator(view, 1.02f, 1f, isLeft, 400, + secondInterpolator); + anim.play(first).before(second); + anim.play(second).before(third); + anim.play(third).before(fourth); + anim.start(); + } else { + view.animate().cancel(); + view.animate() + .setInterpolator(new AccelerateInterpolator(1.5f)) + .setDuration(250) + .alpha(0f); + } + + } +} diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistModule.java b/packages/SystemUI/src/com/android/systemui/assist/AssistModule.java index 2a82d215e44a..739eade35ca6 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistModule.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistModule.java @@ -24,8 +24,7 @@ import android.os.SystemClock; import androidx.slice.Clock; import com.android.internal.app.AssistUtils; -import com.android.systemui.ScreenDecorations; -import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.statusbar.NavigationBarController; import java.util.EnumMap; import java.util.Map; @@ -69,8 +68,9 @@ public abstract class AssistModule { } @Provides - static ScreenDecorations provideScreenDecorations(Context context) { - return SysUiServiceProvider.getComponent(context, ScreenDecorations.class); + static AssistHandleViewController provideAssistHandleViewController( + NavigationBarController navigationBarController) { + return navigationBarController.getAssistHandlerViewController(); } @Provides diff --git a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java index b346a6eb2b3c..bf81e1d3b7f1 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java +++ b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java @@ -38,9 +38,9 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.ScreenDecorations; -import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.assist.AssistHandleViewController; import com.android.systemui.assist.AssistManager; +import com.android.systemui.statusbar.NavigationBarController; import java.util.Locale; @@ -163,9 +163,11 @@ public class DefaultUiController implements AssistManager.UiController { } private void updateAssistHandleVisibility() { - ScreenDecorations decorations = SysUiServiceProvider.getComponent(mRoot.getContext(), - ScreenDecorations.class); - decorations.setAssistHintBlocked(mInvocationInProgress); + AssistHandleViewController controller = Dependency.get(NavigationBarController.class) + .getAssistHandlerViewController(); + if (controller != null) { + controller.setAssistHintBlocked(mInvocationInProgress); + } } private void attach() { diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt b/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt index f0e8c16e650a..5e977b4684dc 100644 --- a/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt +++ b/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt @@ -75,7 +75,7 @@ open class BroadcastDispatcher @Inject constructor ( * @param filter A filter to determine what broadcasts should be dispatched to this receiver. * It will only take into account actions and categories for filtering. * @param handler A handler to dispatch [BroadcastReceiver.onReceive]. By default, it is the - * main handler. + * main handler. Pass `null` to use the default. * @param user A user handle to determine which broadcast should be dispatched to this receiver. * By default, it is the current user. */ @@ -83,10 +83,12 @@ open class BroadcastDispatcher @Inject constructor ( fun registerReceiver( receiver: BroadcastReceiver, filter: IntentFilter, - handler: Handler = mainHandler, + handler: Handler? = mainHandler, user: UserHandle = context.user ) { - this.handler.obtainMessage(MSG_ADD_RECEIVER, ReceiverData(receiver, filter, handler, user)) + this.handler + .obtainMessage(MSG_ADD_RECEIVER, + ReceiverData(receiver, filter, handler ?: mainHandler, user)) .sendToTarget() } diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt b/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt index d44b63e813e6..54f9950239c2 100644 --- a/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt +++ b/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean private const val MSG_REGISTER_RECEIVER = 0 private const val MSG_UNREGISTER_RECEIVER = 1 -private const val TAG = "UniversalReceiver" +private const val TAG = "UserBroadcastDispatcher" private const val DEBUG = false /** @@ -97,7 +97,7 @@ class UserBroadcastDispatcher( private val receiverToReceiverData = ArrayMap<BroadcastReceiver, MutableSet<ReceiverData>>() override fun onReceive(context: Context, intent: Intent) { - bgHandler.post(HandleBroadcastRunnable(actionsToReceivers, context, intent)) + bgHandler.post(HandleBroadcastRunnable(actionsToReceivers, context, intent, pendingResult)) } /** @@ -160,7 +160,8 @@ class UserBroadcastDispatcher( private class HandleBroadcastRunnable( val actionsToReceivers: Map<String, Set<ReceiverData>>, val context: Context, - val intent: Intent + val intent: Intent, + val pendingResult: PendingResult ) : Runnable { override fun run() { if (DEBUG) Log.w(TAG, "Dispatching $intent") @@ -171,6 +172,7 @@ class UserBroadcastDispatcher( ?.forEach { it.handler.post { if (DEBUG) Log.w(TAG, "Dispatching to ${it.receiver}") + it.receiver.pendingResult = pendingResult it.receiver.onReceive(context, intent) } } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index 72ada6e90cd0..824034507019 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -126,8 +126,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi static final int DISMISS_GROUP_CANCELLED = 9; static final int DISMISS_INVALID_INTENT = 10; - public static final int MAX_BUBBLES = 5; // TODO: actually enforce this - private final Context mContext; private final NotificationEntryManager mNotificationEntryManager; private final BubbleTaskStackListener mTaskStackListener; diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index 31cf853dce04..340dced1043f 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -181,7 +181,9 @@ public class BubbleStackView extends FrameLayout { */ private float mVerticalPosPercentBeforeRotation = -1; + private int mMaxBubbles; private int mBubbleSize; + private int mBubbleElevation; private int mBubblePaddingTop; private int mBubbleTouchPadding; private int mExpandedViewPadding; @@ -326,7 +328,9 @@ public class BubbleStackView extends FrameLayout { mInflater = LayoutInflater.from(context); Resources res = getResources(); + mMaxBubbles = res.getInteger(R.integer.bubbles_max_rendered); mBubbleSize = res.getDimensionPixelSize(R.dimen.individual_bubble_size); + mBubbleElevation = res.getDimensionPixelSize(R.dimen.bubble_elevation); mBubblePaddingTop = res.getDimensionPixelSize(R.dimen.bubble_padding_top); mBubbleTouchPadding = res.getDimensionPixelSize(R.dimen.bubble_touch_padding); mExpandedAnimateXDistance = @@ -1597,8 +1601,7 @@ public class BubbleStackView extends FrameLayout { for (int i = 0; i < bubbleCount; i++) { BubbleView bv = (BubbleView) mBubbleContainer.getChildAt(i); bv.updateDotVisibility(true /* animate */); - bv.setZ((BubbleController.MAX_BUBBLES - * getResources().getDimensionPixelSize(R.dimen.bubble_elevation)) - i); + bv.setZ((mMaxBubbles * mBubbleElevation) - i); // If the dot is on the left, and so is the stack, we need to change the dot position. if (bv.getDotPositionOnLeft() == mStackOnLeftOrWillBe) { bv.setDotPosition(!mStackOnLeftOrWillBe, animate); diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index dfd83a552bf3..a2014004fe6c 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -148,7 +148,11 @@ public class DozeSensors { mProximitySensor = new ProximitySensor(context, sensorManager); mProximitySensor.register( - proximityEvent -> mProxCallback.accept(!proximityEvent.getNear())); + proximityEvent -> { + if (proximityEvent != null) { + mProxCallback.accept(!proximityEvent.getNear()); + } + }); } /** diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 57a5ae63511c..22846bc02a38 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -90,6 +90,7 @@ import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.MultiListLayout; import com.android.systemui.MultiListLayout.MultiListAdapter; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.GlobalActions.GlobalActionsManager; @@ -187,7 +188,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED); - context.registerReceiver(mBroadcastReceiver, filter); + Dependency.get(BroadcastDispatcher.class).registerReceiver(mBroadcastReceiver, filter); ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); diff --git a/packages/SystemUI/src/com/android/systemui/pip/BasePipManager.java b/packages/SystemUI/src/com/android/systemui/pip/BasePipManager.java index e0fc31bc70b8..05be4259dd3b 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/BasePipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/BasePipManager.java @@ -27,5 +27,6 @@ public interface BasePipManager { default void expandPip() {} default void hidePipMenu(Runnable onStartCallback, Runnable onEndCallback) {} void onConfigurationChanged(Configuration newConfig); + default void setShelfHeight(boolean visible, int height) {} default void dump(PrintWriter pw) {} } diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java index 6795bff6409a..686e7db86c3b 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java @@ -55,6 +55,12 @@ public class PipBoundsHandler { private final Rect mTmpInsets = new Rect(); private final Point mTmpDisplaySize = new Point(); + /** + * Tracks the destination bounds, used for any following + * {@link #onMovementBoundsChanged(Rect, Rect, Rect, DisplayInfo)} calculations. + */ + private final Rect mLastDestinationBounds = new Rect(); + private IPinnedStackController mPinnedStackController; private ComponentName mLastPipComponentName; private float mReentrySnapFraction = INVALID_SNAP_FRACTION; @@ -120,19 +126,26 @@ public class PipBoundsHandler { } /** - * Responds to IPinnedStackListener on IME visibility change. + * Sets both shelf visibility and its height if applicable. + * @return {@code true} if the internal shelf state is changed, {@code false} otherwise. */ - public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) { - mIsImeShowing = imeVisible; - mImeHeight = imeHeight; + public boolean setShelfHeight(boolean shelfVisible, int shelfHeight) { + final boolean shelfShowing = shelfVisible && shelfHeight > 0; + if (shelfShowing == mIsShelfShowing && shelfHeight == mShelfHeight) { + return false; + } + + mIsShelfShowing = shelfVisible; + mShelfHeight = shelfHeight; + return true; } /** - * Responds to IPinnedStackListener on shelf visibility change. + * Responds to IPinnedStackListener on IME visibility change. */ - public void onShelfVisibilityChanged(boolean shelfVisible, int shelfHeight) { - mIsShelfShowing = shelfVisible; - mShelfHeight = shelfHeight; + public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) { + mIsImeShowing = imeVisible; + mImeHeight = imeHeight; } /** @@ -185,6 +198,10 @@ public class PipBoundsHandler { mLastPipComponentName = null; } + public Rect getLastDestinationBounds() { + return mLastDestinationBounds; + } + /** * Responds to IPinnedStackListener on {@link DisplayInfo} change. * It will normally follow up with a @@ -232,6 +249,7 @@ public class PipBoundsHandler { try { mPinnedStackController.startAnimation(destinationBounds, sourceRectHint, -1 /* animationDuration */); + mLastDestinationBounds.set(destinationBounds); } catch (RemoteException e) { Log.e(TAG, "Failed to start PiP animation from SysUI", e); } diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipUI.java b/packages/SystemUI/src/com/android/systemui/pip/PipUI.java index 37c8163702cf..682c76c6136a 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipUI.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipUI.java @@ -85,6 +85,14 @@ public class PipUI extends SystemUI implements CommandQueue.Callbacks { mPipManager.onConfigurationChanged(newConfig); } + public void setShelfHeight(boolean visible, int height) { + if (mPipManager == null) { + return; + } + + mPipManager.setShelfHeight(visible, height); + } + @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (mPipManager == null) { diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index 8dfae32a1939..369073c6564d 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -143,14 +143,6 @@ public class PipManager implements BasePipManager { } @Override - public void onShelfVisibilityChanged(boolean shelfVisible, int shelfHeight) { - mHandler.post(() -> { - mPipBoundsHandler.onShelfVisibilityChanged(shelfVisible, shelfHeight); - mTouchHandler.onShelfVisibilityChanged(shelfVisible, shelfHeight); - }); - } - - @Override public void onMinimizedStateChanged(boolean isMinimized) { mHandler.post(() -> { mPipBoundsHandler.onMinimizedStateChanged(isMinimized); @@ -161,14 +153,8 @@ public class PipManager implements BasePipManager { @Override public void onMovementBoundsChanged(Rect animatingBounds, boolean fromImeAdjustment, boolean fromShelfAdjustment) { - mHandler.post(() -> { - // Populate the inset / normal bounds and DisplayInfo from mPipBoundsHandler first. - mPipBoundsHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds, - animatingBounds, mTmpDisplayInfo); - mTouchHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds, - animatingBounds, fromImeAdjustment, fromShelfAdjustment, - mTmpDisplayInfo.rotation); - }); + mHandler.post(() -> updateMovementBounds(animatingBounds, fromImeAdjustment, + fromShelfAdjustment)); } @Override @@ -280,6 +266,31 @@ public class PipManager implements BasePipManager { } /** + * Sets both shelf visibility and its height. + */ + @Override + public void setShelfHeight(boolean visible, int height) { + mHandler.post(() -> { + final boolean changed = mPipBoundsHandler.setShelfHeight(visible, height); + if (changed) { + mTouchHandler.onShelfVisibilityChanged(visible, height); + updateMovementBounds(mPipBoundsHandler.getLastDestinationBounds(), + false /* fromImeAdjustment */, true /* fromShelfAdjustment */); + } + }); + } + + private void updateMovementBounds(Rect animatingBounds, boolean fromImeAdjustment, + boolean fromShelfAdjustment) { + // Populate inset / normal bounds and DisplayInfo from mPipBoundsHandler first. + mPipBoundsHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds, + animatingBounds, mTmpDisplayInfo); + mTouchHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds, + animatingBounds, fromImeAdjustment, fromShelfAdjustment, + mTmpDisplayInfo.rotation); + } + + /** * Gets an instance of {@link PipManager}. */ public static PipManager getInstance() { diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java index 4f2a6d82a08e..5723afd4ae95 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java @@ -247,6 +247,9 @@ public class PipMenuActivity extends Activity { protected void onStop() { super.onStop(); + // In cases such as device lock, hide and finish it so that it can be recreated on the top + // next time it starts, see also {@link #onUserLeaveHint} + hideMenu(); cancelDelayedFinish(); } diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index 75dc39722bcf..a258f356bf53 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -45,6 +45,7 @@ import com.android.settingslib.utils.ThreadUtils; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.SystemUI; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.statusbar.phone.StatusBar; import java.io.FileDescriptor; @@ -53,6 +54,8 @@ import java.time.Duration; import java.util.Arrays; import java.util.concurrent.Future; +import javax.inject.Inject; + public class PowerUI extends SystemUI { static final String TAG = "PowerUI"; @@ -97,6 +100,12 @@ public class PowerUI extends SystemUI { private IThermalEventListener mSkinThermalEventListener; private IThermalEventListener mUsbThermalEventListener; + private final BroadcastDispatcher mBroadcastDispatcher; + + @Inject + public PowerUI(BroadcastDispatcher broadcastDispatcher) { + mBroadcastDispatcher = broadcastDispatcher; + } public void start() { mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); @@ -211,7 +220,7 @@ public class PowerUI extends SystemUI { filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_SCREEN_ON); filter.addAction(Intent.ACTION_USER_SWITCHED); - mContext.registerReceiver(this, filter, null, mHandler); + mBroadcastDispatcher.registerReceiver(this, filter, mHandler); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java b/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java index 55ae61de5bc6..b9f3a7fcc63b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java @@ -18,11 +18,16 @@ package com.android.systemui.qs; import static com.android.systemui.Dependency.BG_HANDLER; import static com.android.systemui.Dependency.BG_HANDLER_NAME; +import static com.android.systemui.Dependency.MAIN_LOOPER; +import static com.android.systemui.Dependency.MAIN_LOOPER_NAME; import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT; +import android.annotation.MainThread; import android.content.Context; import android.content.Intent; import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.provider.Settings; import android.telephony.SubscriptionManager; import android.util.AttributeSet; @@ -39,6 +44,8 @@ import com.android.systemui.R; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.statusbar.policy.NetworkController; +import java.util.function.Consumer; + import javax.inject.Inject; import javax.inject.Named; @@ -46,7 +53,6 @@ import javax.inject.Named; * Displays Carrier name and network status in QS */ public class QSCarrierGroup extends LinearLayout implements - CarrierTextController.CarrierTextCallback, NetworkController.SignalCallback, View.OnClickListener { private static final String TAG = "QSCarrierGroup"; @@ -56,12 +62,14 @@ public class QSCarrierGroup extends LinearLayout implements private static final int SIM_SLOTS = 3; private final NetworkController mNetworkController; private final Handler mBgHandler; + private final H mMainHandler; private View[] mCarrierDividers = new View[SIM_SLOTS - 1]; private QSCarrier[] mCarrierGroups = new QSCarrier[SIM_SLOTS]; private TextView mNoSimTextView; private final CellSignalState[] mInfos = new CellSignalState[SIM_SLOTS]; private CarrierTextController mCarrierTextController; + private CarrierTextController.CarrierTextCallback mCallback; private ActivityStarter mActivityStarter; private boolean mListening; @@ -69,11 +77,19 @@ public class QSCarrierGroup extends LinearLayout implements @Inject public QSCarrierGroup(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs, NetworkController networkController, ActivityStarter activityStarter, - @Named(BG_HANDLER_NAME) Handler handler) { + @Named(BG_HANDLER_NAME) Handler handler, + @Named(MAIN_LOOPER_NAME) Looper looper) { super(context, attrs); mNetworkController = networkController; mActivityStarter = activityStarter; mBgHandler = handler; + mMainHandler = new H(looper, this::handleUpdateCarrierInfo, this::handleUpdateState); + mCallback = new Callback(mMainHandler); + } + + @VisibleForTesting + protected CarrierTextController.CarrierTextCallback getCallback() { + return mCallback; } @VisibleForTesting @@ -81,7 +97,8 @@ public class QSCarrierGroup extends LinearLayout implements this(context, attrs, Dependency.get(NetworkController.class), Dependency.get(ActivityStarter.class), - Dependency.get(BG_HANDLER)); + Dependency.get(BG_HANDLER), + Dependency.get(MAIN_LOOPER)); } @Override @@ -136,14 +153,20 @@ public class QSCarrierGroup extends LinearLayout implements if (mNetworkController.hasVoiceCallingFeature()) { mNetworkController.addCallback(this); } - mCarrierTextController.setListening(this); + mCarrierTextController.setListening(mCallback); } else { mNetworkController.removeCallback(this); mCarrierTextController.setListening(null); } } + @MainThread private void handleUpdateState() { + if (!mMainHandler.getLooper().isCurrentThread()) { + mMainHandler.obtainMessage(H.MSG_UPDATE_STATE).sendToTarget(); + return; + } + for (int i = 0; i < SIM_SLOTS; i++) { mCarrierGroups[i].updateState(mInfos[i]); } @@ -163,8 +186,13 @@ public class QSCarrierGroup extends LinearLayout implements return SubscriptionManager.getSlotIndex(subscriptionId); } - @Override - public void updateCarrierInfo(CarrierTextController.CarrierTextCallbackInfo info) { + @MainThread + private void handleUpdateCarrierInfo(CarrierTextController.CarrierTextCallbackInfo info) { + if (!mMainHandler.getLooper().isCurrentThread()) { + mMainHandler.obtainMessage(H.MSG_UPDATE_CARRIER_INFO, info).sendToTarget(); + return; + } + mNoSimTextView.setVisibility(View.GONE); if (!info.airplaneMode && info.anySimReady) { boolean[] slotSeen = new boolean[SIM_SLOTS]; @@ -207,7 +235,7 @@ public class QSCarrierGroup extends LinearLayout implements mNoSimTextView.setText(info.carrierText); mNoSimTextView.setVisibility(View.VISIBLE); } - handleUpdateState(); + handleUpdateState(); // handleUpdateCarrierInfo is always called from main thread. } @Override @@ -230,7 +258,7 @@ public class QSCarrierGroup extends LinearLayout implements mInfos[slotIndex].contentDescription = statusIcon.contentDescription; mInfos[slotIndex].typeContentDescription = typeContentDescription; mInfos[slotIndex].roaming = roaming; - handleUpdateState(); + mMainHandler.obtainMessage(H.MSG_UPDATE_STATE).sendToTarget(); } @Override @@ -240,7 +268,7 @@ public class QSCarrierGroup extends LinearLayout implements mInfos[i].visible = false; } } - handleUpdateState(); + mMainHandler.obtainMessage(H.MSG_UPDATE_STATE).sendToTarget(); } static final class CellSignalState { @@ -250,4 +278,47 @@ public class QSCarrierGroup extends LinearLayout implements String typeContentDescription; boolean roaming; } + + private static class H extends Handler { + private Consumer<CarrierTextController.CarrierTextCallbackInfo> mUpdateCarrierInfo; + private Runnable mUpdateState; + static final int MSG_UPDATE_CARRIER_INFO = 0; + static final int MSG_UPDATE_STATE = 1; + + H(Looper looper, + Consumer<CarrierTextController.CarrierTextCallbackInfo> updateCarrierInfo, + Runnable updateState) { + super(looper); + mUpdateCarrierInfo = updateCarrierInfo; + mUpdateState = updateState; + } + + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MSG_UPDATE_CARRIER_INFO: + mUpdateCarrierInfo.accept( + (CarrierTextController.CarrierTextCallbackInfo) msg.obj); + break; + case MSG_UPDATE_STATE: + mUpdateState.run(); + break; + default: + super.handleMessage(msg); + } + } + } + + private static class Callback implements CarrierTextController.CarrierTextCallback { + private H mMainHandler; + + Callback(H handler) { + mMainHandler = handler; + } + + @Override + public void updateCarrierInfo(CarrierTextController.CarrierTextCallbackInfo info) { + mMainHandler.obtainMessage(H.MSG_UPDATE_CARRIER_INFO, info).sendToTarget(); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index d20b22815805..4013586d4197 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -257,10 +257,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements mNextAlarmTextView.setSelected(true); mPermissionsHubEnabled = PrivacyItemControllerKt.isPermissionsHubEnabled(); - // Change the ignored slots when DeviceConfig flag changes - DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_PRIVACY, - mContext.getMainExecutor(), mPropertiesListener); - } private List<String> getIgnoredIconSlots() { @@ -489,6 +485,9 @@ public class QuickStatusBarHeader extends RelativeLayout implements super.onAttachedToWindow(); mStatusBarIconController.addIconGroup(mIconManager); requestApplyInsets(); + // Change the ignored slots when DeviceConfig flag changes + DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_PRIVACY, + mContext.getMainExecutor(), mPropertiesListener); } @Override @@ -527,6 +526,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements public void onDetachedFromWindow() { setListening(false); mStatusBarIconController.removeIconGroup(mIconManager); + DeviceConfig.removeOnPropertiesChangedListener(mPropertiesListener); super.onDetachedFromWindow(); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 9268ee0705a2..e0ae8ed66f41 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -58,6 +58,7 @@ import com.android.internal.policy.ScreenDecorationsUtils; import com.android.systemui.Dumpable; import com.android.systemui.SysUiServiceProvider; import com.android.systemui.model.SysUiState; +import com.android.systemui.pip.PipUI; import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener; import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.recents.ISystemUiProxy; @@ -353,6 +354,20 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } } + @Override + public void setShelfHeight(boolean visible, int shelfHeight) { + if (!verifyCaller("setShelfHeight")) { + return; + } + long token = Binder.clearCallingIdentity(); + try { + final PipUI component = SysUiServiceProvider.getComponent(mContext, PipUI.class); + component.setShelfHeight(visible, shelfHeight); + } finally { + Binder.restoreCallingIdentity(token); + } + } + private boolean verifyCaller(String reason) { final int callerId = Binder.getCallingUserHandle().getIdentifier(); if (callerId != mCurrentBoundedUserId) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java index d0c47345a83a..c1ce16337f8d 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java @@ -61,8 +61,10 @@ import android.view.animation.DecelerateInterpolator; import android.widget.ImageView; import android.widget.TextView; +import com.android.systemui.Dependency; import com.android.systemui.Prefs; import com.android.systemui.R; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; @@ -245,10 +247,15 @@ public class RecentsOnboarding { private final View.OnAttachStateChangeListener mOnAttachStateChangeListener = new View.OnAttachStateChangeListener() { + + private final BroadcastDispatcher mBroadcastDispatcher = Dependency.get( + BroadcastDispatcher.class); + @Override public void onViewAttachedToWindow(View view) { if (view == mLayout) { - mContext.registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF)); + mBroadcastDispatcher.registerReceiver(mReceiver, + new IntentFilter(Intent.ACTION_SCREEN_OFF)); mLayoutAttachedToWindow = true; if (view.getTag().equals(R.string.recents_swipe_up_onboarding)) { mHasDismissedSwipeUpTip = false; @@ -273,7 +280,7 @@ public class RecentsOnboarding { } mOverviewOpenedCountSinceQuickScrubTipDismiss = 0; } - mContext.unregisterReceiver(mReceiver); + mBroadcastDispatcher.unregisterReceiver(mReceiver); } } }; @@ -335,10 +342,11 @@ public class RecentsOnboarding { private void notifyOnTip(int action, int target) { try { IOverviewProxy overviewProxy = mOverviewProxyService.getProxy(); - if(overviewProxy != null) { + if (overviewProxy != null) { overviewProxy.onTip(action, target); } - } catch (RemoteException e) {} + } catch (RemoteException e) { + } } public void onNavigationModeChanged(int mode) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java index c3c0d63f66c4..0f277ca8b2c6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java +++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java @@ -47,6 +47,7 @@ import android.widget.TextView; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.WindowManagerWrapper; import com.android.systemui.statusbar.phone.NavigationBarView; @@ -159,6 +160,8 @@ public class ScreenPinningRequest implements View.OnClickListener, private ValueAnimator mColorAnim; private ViewGroup mLayout; private boolean mShowCancel; + private final BroadcastDispatcher mBroadcastDispatcher = + Dependency.get(BroadcastDispatcher.class); public RequestWindowView(Context context, boolean showCancel) { super(context); @@ -212,7 +215,7 @@ public class ScreenPinningRequest implements View.OnClickListener, IntentFilter filter = new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED); filter.addAction(Intent.ACTION_USER_SWITCHED); filter.addAction(Intent.ACTION_SCREEN_OFF); - mContext.registerReceiver(mReceiver, filter); + mBroadcastDispatcher.registerReceiver(mReceiver, filter); } private void inflateView(int rotation) { @@ -313,7 +316,7 @@ public class ScreenPinningRequest implements View.OnClickListener, @Override public void onDetachedFromWindow() { - mContext.unregisterReceiver(mReceiver); + mBroadcastDispatcher.unregisterReceiver(mReceiver); } protected void onConfigurationChanged() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java index 7bcbd3683130..09f80455a1b0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java @@ -37,6 +37,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.RegisterStatusBarResult; import com.android.systemui.Dependency; +import com.android.systemui.assist.AssistHandleViewController; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.statusbar.CommandQueue.Callbacks; import com.android.systemui.statusbar.phone.AutoHideController; @@ -233,4 +234,9 @@ public class NavigationBarController implements Callbacks { public NavigationBarFragment getDefaultNavigationBarFragment() { return mNavigationBars.get(DEFAULT_DISPLAY); } + + /** @return {@link AssistHandleViewController} (only on the default display). */ + public AssistHandleViewController getAssistHandlerViewController() { + return getDefaultNavigationBarFragment().getAssistHandlerViewController(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java index 14009214bdc5..6c0f90a65ae9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java @@ -21,6 +21,7 @@ import static com.android.systemui.statusbar.notification.NotificationEntryManag import static com.android.systemui.statusbar.phone.StatusBar.DEBUG; import static com.android.systemui.statusbar.phone.StatusBar.ENABLE_CHILD_NOTIFICATIONS; +import android.annotation.Nullable; import android.annotation.SuppressLint; import android.app.NotificationManager; import android.content.ComponentName; @@ -57,8 +58,9 @@ public class NotificationListener extends NotificationListenerWithPlugins { private final NotificationGroupManager mGroupManager = Dependency.get(NotificationGroupManager.class); - private final ArrayList<NotificationSettingsListener> mSettingsListeners = new ArrayList<>(); private final Context mContext; + private final ArrayList<NotificationSettingsListener> mSettingsListeners = new ArrayList<>(); + @Nullable private NotifServiceListener mDownstreamListener; @Inject public NotificationListener(Context context) { @@ -69,6 +71,10 @@ public class NotificationListener extends NotificationListenerWithPlugins { mSettingsListeners.add(listener); } + public void setDownstreamListener(NotifServiceListener downstreamListener) { + mDownstreamListener = downstreamListener; + } + @Override public void onListenerConnected() { if (DEBUG) Log.d(TAG, "onListenerConnected"); @@ -81,6 +87,9 @@ public class NotificationListener extends NotificationListenerWithPlugins { final RankingMap currentRanking = getCurrentRanking(); Dependency.get(Dependency.MAIN_HANDLER).post(() -> { for (StatusBarNotification sbn : notifications) { + if (mDownstreamListener != null) { + mDownstreamListener.onNotificationPosted(sbn, currentRanking); + } mEntryManager.addNotification(sbn, currentRanking); } }); @@ -95,6 +104,11 @@ public class NotificationListener extends NotificationListenerWithPlugins { if (sbn != null && !onPluginNotificationPosted(sbn, rankingMap)) { Dependency.get(Dependency.MAIN_HANDLER).post(() -> { processForRemoteInput(sbn.getNotification(), mContext); + + if (mDownstreamListener != null) { + mDownstreamListener.onNotificationPosted(sbn, rankingMap); + } + String key = sbn.getKey(); boolean isUpdate = mEntryManager.getNotificationData().get(key) != null; @@ -133,6 +147,9 @@ public class NotificationListener extends NotificationListenerWithPlugins { if (sbn != null && !onPluginNotificationRemoved(sbn, rankingMap)) { final String key = sbn.getKey(); Dependency.get(Dependency.MAIN_HANDLER).post(() -> { + if (mDownstreamListener != null) { + mDownstreamListener.onNotificationRemoved(sbn, rankingMap, reason); + } mEntryManager.removeNotification(key, rankingMap, reason); }); } @@ -149,6 +166,9 @@ public class NotificationListener extends NotificationListenerWithPlugins { if (rankingMap != null) { RankingMap r = onPluginRankingUpdate(rankingMap); Dependency.get(Dependency.MAIN_HANDLER).post(() -> { + if (mDownstreamListener != null) { + mDownstreamListener.onNotificationRankingUpdate(rankingMap); + } mEntryManager.updateNotificationRanking(r); }); } @@ -175,4 +195,12 @@ public class NotificationListener extends NotificationListenerWithPlugins { default void onStatusBarIconsBehaviorChanged(boolean hideSilentStatusIcons) { } } + + /** Interface for listening to add/remove events that we receive from NotificationManager. */ + public interface NotifServiceListener { + void onNotificationPosted(StatusBarNotification sbn, RankingMap rankingMap); + void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap); + void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap, int reason); + void onNotificationRankingUpdate(RankingMap rankingMap); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineInitializer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineInitializer.java new file mode 100644 index 000000000000..df70828a46be --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineInitializer.java @@ -0,0 +1,68 @@ +/* + * 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.service.notification.NotificationListenerService; +import android.service.notification.StatusBarNotification; +import android.util.Log; + +import com.android.systemui.statusbar.NotificationListener; + +import javax.inject.Inject; + +/** + * Initialization code for the new notification pipeline. + */ +public class NotifPipelineInitializer { + + @Inject + public NotifPipelineInitializer() { + } + + public void initialize( + NotificationListener notificationService) { + + // TODO Put real code here + notificationService.setDownstreamListener(new NotificationListener.NotifServiceListener() { + @Override + public void onNotificationPosted(StatusBarNotification sbn, + NotificationListenerService.RankingMap rankingMap) { + Log.d(TAG, "onNotificationPosted " + sbn.getKey()); + } + + @Override + public void onNotificationRemoved(StatusBarNotification sbn, + NotificationListenerService.RankingMap rankingMap) { + Log.d(TAG, "onNotificationRemoved " + sbn.getKey()); + } + + @Override + public void onNotificationRemoved(StatusBarNotification sbn, + NotificationListenerService.RankingMap rankingMap, int reason) { + Log.d(TAG, "onNotificationRemoved " + sbn.getKey()); + } + + @Override + public void onNotificationRankingUpdate( + NotificationListenerService.RankingMap rankingMap) { + Log.d(TAG, "onNotificationRankingUpdate"); + } + }); + } + + private static final String TAG = "NotifInitializer"; +} 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 b6b149dd049a..90301c59dc68 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.app.Notification; import android.content.Context; import android.service.notification.NotificationListenerService; +import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.StatusBarNotification; import android.util.ArrayMap; import android.util.Log; @@ -390,7 +391,7 @@ public class NotificationEntryManager implements } mNotificationData.updateRanking(rankingMap); - NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking(); + Ranking ranking = new Ranking(); rankingMap.getRanking(key, ranking); NotificationEntry entry = new NotificationEntry(notification, ranking); @@ -513,10 +514,11 @@ public class NotificationEntryManager implements if (rankingMap == null) { return; } - NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking(); for (NotificationEntry pendingNotification : mPendingNotifications.values()) { - rankingMap.getRanking(pendingNotification.key, ranking); - pendingNotification.setRanking(ranking); + Ranking ranking = new Ranking(); + if (rankingMap.getRanking(pendingNotification.key(), ranking)) { + pendingNotification.setRanking(ranking); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NPVPluginManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NPVPluginManager.kt index 7dcc2fcfe2b2..53601babfd56 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NPVPluginManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NPVPluginManager.kt @@ -18,6 +18,7 @@ package com.android.systemui.statusbar.phone import android.content.Context import android.view.View +import android.view.ViewGroup.MarginLayoutParams import android.widget.FrameLayout import com.android.systemui.plugins.NPVPlugin import com.android.systemui.plugins.PluginListener @@ -36,6 +37,7 @@ class NPVPluginManager( private var plugin: NPVPlugin? = null private var animator = createAnimator() + private var yOffset = 0f private fun createAnimator() = TouchAnimator.Builder() .addFloat(parent, "alpha", 1f, 0f) @@ -76,7 +78,7 @@ class NPVPluginManager( } fun setExpansion(expansion: Float, headerTranslation: Float, heightDiff: Float) { - parent.setTranslationY(expansion * heightDiff + headerTranslation) + parent.setTranslationY(expansion * heightDiff + headerTranslation + yOffset) if (!expansion.isNaN()) animator.setPosition(expansion) } @@ -88,5 +90,13 @@ class NPVPluginManager( animator = createAnimator() } - fun getHeight() = if (plugin != null) parent.height else 0 + fun getHeight() = + if (plugin != null) { + parent.height + (parent.getLayoutParams() as MarginLayoutParams).topMargin + } else 0 + + fun setYOffset(y: Float) { + yOffset = y + parent.setTranslationY(yOffset) + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java index 2b8c86b8c549..6e61d7ceaf6c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -86,9 +86,10 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.LatencyTracker; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.ScreenDecorations; import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.assist.AssistHandleViewController; import com.android.systemui.assist.AssistManager; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentHostManager.FragmentListener; import com.android.systemui.model.SysUiState; @@ -139,6 +140,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback private final MetricsLogger mMetricsLogger; private final DeviceProvisionedController mDeviceProvisionedController; private final StatusBarStateController mStatusBarStateController; + private final NavigationModeController mNavigationModeController; protected NavigationBarView mNavigationBarView = null; @@ -170,11 +172,16 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback private OverviewProxyService mOverviewProxyService; + private final BroadcastDispatcher mBroadcastDispatcher; + @VisibleForTesting public int mDisplayId; private boolean mIsOnDefaultDisplay; public boolean mHomeBlockedThisTouch; - private ScreenDecorations mScreenDecorations; + + /** Only for default display */ + @Nullable + private AssistHandleViewController mAssistHandlerViewController; private Handler mHandler = Dependency.get(Dependency.MAIN_HANDLER); @@ -248,7 +255,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback AssistManager assistManager, OverviewProxyService overviewProxyService, NavigationModeController navigationModeController, StatusBarStateController statusBarStateController, - SysUiState sysUiFlagsContainer) { + SysUiState sysUiFlagsContainer, + BroadcastDispatcher broadcastDispatcher) { mAccessibilityManagerWrapper = accessibilityManagerWrapper; mDeviceProvisionedController = deviceProvisionedController; mStatusBarStateController = statusBarStateController; @@ -257,7 +265,9 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback mSysUiFlagsContainer = sysUiFlagsContainer; mAssistantAvailable = mAssistManager.getAssistInfoForUser(UserHandle.USER_CURRENT) != null; mOverviewProxyService = overviewProxyService; + mNavigationModeController = navigationModeController; mNavBarMode = navigationModeController.addListener(this); + mBroadcastDispatcher = broadcastDispatcher; } // ----- Fragment Lifecycle Callbacks ----- @@ -296,6 +306,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback @Override public void onDestroy() { super.onDestroy(); + mNavigationModeController.removeListener(this); mAccessibilityManagerWrapper.removeCallback(mAccessibilityListener); mContentResolver.unregisterContentObserver(mMagnificationObserver); mContentResolver.unregisterContentObserver(mAssistContentObserver); @@ -334,7 +345,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_SCREEN_ON); filter.addAction(Intent.ACTION_USER_SWITCHED); - getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null); + mBroadcastDispatcher.registerReceiver(mBroadcastReceiver, filter, Handler.getMain(), + UserHandle.ALL); notifyNavigationBarScreenOn(); mOverviewProxyService.addCallback(mOverviewProxyListener); @@ -357,22 +369,27 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback mDisabledFlags2 |= StatusBarManager.DISABLE2_ROTATE_SUGGESTIONS; } setDisabled2Flags(mDisabledFlags2); - - mScreenDecorations = SysUiServiceProvider.getComponent(getContext(), - ScreenDecorations.class); - getBarTransitions().addDarkIntensityListener(mScreenDecorations); + if (mIsOnDefaultDisplay) { + mAssistHandlerViewController = + new AssistHandleViewController(mHandler, mNavigationBarView); + getBarTransitions().addDarkIntensityListener(mAssistHandlerViewController); + } } @Override public void onDestroyView() { super.onDestroyView(); if (mNavigationBarView != null) { - mNavigationBarView.getBarTransitions().removeDarkIntensityListener(mScreenDecorations); + if (mIsOnDefaultDisplay) { + mNavigationBarView.getBarTransitions() + .removeDarkIntensityListener(mAssistHandlerViewController); + mAssistHandlerViewController = null; + } mNavigationBarView.getBarTransitions().destroy(); mNavigationBarView.getLightTransitionsController().destroy(getContext()); } mOverviewProxyService.removeCallback(mOverviewProxyListener); - getContext().unregisterReceiver(mBroadcastReceiver); + mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver); } @Override @@ -1019,6 +1036,11 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback delay + StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE); } + @Nullable + public AssistHandleViewController getAssistHandlerViewController() { + return mAssistHandlerViewController; + } + /** * Performs transitions on navigation bar. * 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 fa4812dc4876..a1a47e1305f5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -829,7 +829,11 @@ public class NavigationBarView extends FrameLayout implements mRecentsOnboarding.onNavigationModeChanged(mNavBarMode); getRotateSuggestionButton().onNavigationModeChanged(mNavBarMode); - mRegionSamplingHelper.start(mSamplingBounds); + if (isGesturalMode(mNavBarMode)) { + mRegionSamplingHelper.start(mSamplingBounds); + } else { + mRegionSamplingHelper.stop(); + } } public void setAccessibilityButtonState(final boolean visible, final boolean longClickable) { 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 86da10a4b970..353a5381aa14 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -652,8 +652,7 @@ public class NotificationPanelView extends PanelView implements mNotificationStackScroller.setLayoutParams(lp); } int sideMargin = res.getDimensionPixelOffset(R.dimen.notification_side_paddings); - int topMargin = - res.getDimensionPixelOffset(com.android.internal.R.dimen.quick_qs_total_height); + int topMargin = sideMargin; lp = (FrameLayout.LayoutParams) mPluginFrame.getLayoutParams(); if (lp.width != qsWidth || lp.gravity != panelGravity || lp.leftMargin != sideMargin || lp.rightMargin != sideMargin || lp.topMargin != topMargin) { @@ -796,6 +795,7 @@ public class NotificationPanelView extends PanelView implements int oldMaxHeight = mQsMaxExpansionHeight; if (mQs != null) { mQsMinExpansionHeight = mKeyguardShowing ? 0 : mQs.getQsMinExpansionHeight(); + mNPVPluginManager.setYOffset(mQsMinExpansionHeight); mQsMinExpansionHeight += mNPVPluginManager.getHeight(); mQsMaxExpansionHeight = mQs.getDesiredHeight(); mNotificationStackScroller.setMaxTopPadding( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RegionSamplingHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RegionSamplingHelper.java index c1ff572bb210..1a6b415f87db 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RegionSamplingHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RegionSamplingHelper.java @@ -127,6 +127,11 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, updateSamplingListener(); } + void stopAndDestroy() { + stop(); + mSamplingListener.destroy(); + } + @Override public void onViewAttachedToWindow(View view) { updateSamplingListener(); @@ -134,9 +139,7 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, @Override public void onViewDetachedFromWindow(View view) { - // isAttachedToWindow is only changed after this call to the listeners, so let's post it - // instead - postUpdateSamplingListener(); + stopAndDestroy(); } @Override 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 f06fbbd80dfc..7bab7f159b7e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -147,6 +147,7 @@ import com.android.systemui.SystemUIFactory; import com.android.systemui.UiOffloadThread; import com.android.systemui.appops.AppOpsController; import com.android.systemui.assist.AssistManager; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.bubbles.BubbleController; import com.android.systemui.charging.WirelessChargingAnimation; import com.android.systemui.classifier.FalsingLog; @@ -197,6 +198,7 @@ import com.android.systemui.statusbar.VibratorHelper; 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.NotifPipelineInitializer; import com.android.systemui.statusbar.notification.NotificationActivityStarter; import com.android.systemui.statusbar.notification.NotificationAlertingManager; import com.android.systemui.statusbar.notification.NotificationClicker; @@ -222,7 +224,6 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceP 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.KeyguardStateControllerImpl; import com.android.systemui.statusbar.policy.KeyguardUserSwitcher; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; @@ -390,6 +391,11 @@ public class StatusBar extends SystemUI implements DemoMode, @Inject @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean mAllowNotificationLongPress; + @Inject + protected NotifPipelineInitializer mNotifPipelineInitializer; + + @VisibleForTesting + BroadcastDispatcher mBroadcastDispatcher; // expanded notifications protected NotificationPanelView mNotificationPanel; // the sliding/resizing panel within the notification window @@ -665,6 +671,7 @@ public class StatusBar extends SystemUI implements DemoMode, mBubbleController = Dependency.get(BubbleController.class); mBubbleController.setExpandListener(mBubbleExpandListener); mActivityIntentHelper = new ActivityIntentHelper(mContext); + mBroadcastDispatcher = Dependency.get(BroadcastDispatcher.class); KeyguardSliceProvider sliceProvider = KeyguardSliceProvider.getAttachedInstance(); if (sliceProvider != null) { sliceProvider.initDependencies(mMediaManager, mStatusBarStateController, @@ -1046,11 +1053,7 @@ public class StatusBar extends SystemUI implements DemoMode, } // receive broadcasts - IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); - filter.addAction(Intent.ACTION_SCREEN_OFF); - filter.addAction(DevicePolicyManager.ACTION_SHOW_DEVICE_MONITORING_DIALOG); - context.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null); + registerBroadcastReceiver(); IntentFilter demoFilter = new IntentFilter(); if (DEBUG_MEDIA_FAKE_ARTWORK) { @@ -1071,6 +1074,15 @@ public class StatusBar extends SystemUI implements DemoMode, ThreadedRenderer.overrideProperty("ambientRatio", String.valueOf(1.5f)); } + @VisibleForTesting + protected void registerBroadcastReceiver() { + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + filter.addAction(Intent.ACTION_SCREEN_OFF); + filter.addAction(DevicePolicyManager.ACTION_SHOW_DEVICE_MONITORING_DIALOG); + mBroadcastDispatcher.registerReceiver(mBroadcastReceiver, filter, null, UserHandle.ALL); + } + protected QS createDefaultQSFragment() { return FragmentHostManager.get(mStatusBarWindow).create(QSFragment.class); } @@ -1128,6 +1140,8 @@ public class StatusBar extends SystemUI implements DemoMode, mGroupAlertTransferHelper.bind(mEntryManager, mGroupManager); mNotificationListController.bind(); + + mNotifPipelineInitializer.initialize(mNotificationListener); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java index 5bda34d64b73..ce929b7c621b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java @@ -28,6 +28,7 @@ import android.view.WindowManager.LayoutParams; import com.android.systemui.Dependency; import com.android.systemui.R; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -138,20 +139,21 @@ public class SystemUIDialog extends AlertDialog { private final Dialog mDialog; private boolean mRegistered; + private final BroadcastDispatcher mBroadcastDispatcher; DismissReceiver(Dialog dialog) { mDialog = dialog; + mBroadcastDispatcher = Dependency.get(BroadcastDispatcher.class); } void register() { - mDialog.getContext() - .registerReceiverAsUser(this, UserHandle.CURRENT, INTENT_FILTER, null, null); + mBroadcastDispatcher.registerReceiver(this, INTENT_FILTER, null, UserHandle.CURRENT); mRegistered = true; } void unregister() { if (mRegistered) { - mDialog.getContext().unregisterReceiver(this); + mBroadcastDispatcher.unregisterReceiver(this); mRegistered = false; } } 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 c2c3f81527e8..b331fc3bf0ce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.policy; +import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT; + import android.app.StatusBarManager; import android.content.BroadcastReceiver; import android.content.Context; @@ -44,6 +46,7 @@ import com.android.systemui.Dependency; import com.android.systemui.FontSizeUtils; import com.android.systemui.R; import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; import com.android.systemui.settings.CurrentUserTracker; @@ -60,6 +63,9 @@ import java.util.Calendar; import java.util.Locale; import java.util.TimeZone; +import javax.inject.Inject; +import javax.inject.Named; + /** * Digital clock for the status bar. */ @@ -107,15 +113,20 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C */ private int mNonAdaptedColor; - public Clock(Context context) { - this(context, null); - } + private final BroadcastDispatcher mBroadcastDispatcher; public Clock(Context context, AttributeSet attrs) { - this(context, attrs, 0); + this(context, attrs, null); + } + + @Inject + public Clock(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs, + BroadcastDispatcher broadcastDispatcher) { + this(context, attrs, 0, broadcastDispatcher); } - public Clock(Context context, AttributeSet attrs, int defStyle) { + public Clock(Context context, AttributeSet attrs, int defStyle, + BroadcastDispatcher broadcastDispatcher) { super(context, attrs, defStyle); TypedArray a = context.getTheme().obtainStyledAttributes( attrs, @@ -134,6 +145,7 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C mCurrentUserId = newUserId; } }; + mBroadcastDispatcher = broadcastDispatcher; } @Override @@ -358,11 +370,11 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C } IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_SCREEN_ON); - mContext.registerReceiver(mScreenReceiver, filter); + mBroadcastDispatcher.registerReceiver(mScreenReceiver, filter); } } else { if (mSecondsHandler != null) { - mContext.unregisterReceiver(mScreenReceiver); + mBroadcastDispatcher.unregisterReceiver(mScreenReceiver); mSecondsHandler.removeCallbacks(mSecondTick); mSecondsHandler = null; updateClock(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java index f8c7532ec281..cc91bc082871 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java @@ -101,7 +101,9 @@ public class KeyguardStateControllerImpl extends KeyguardUpdateMonitorCallback @Override public void addCallback(@NonNull Callback callback) { Preconditions.checkNotNull(callback, "Callback must not be null. b/128895449"); - mCallbacks.add(callback); + if (!mCallbacks.contains(callback)) { + mCallbacks.add(callback); + } if (mCallbacks.size() != 0 && !mListening) { mListening = true; mKeyguardUpdateMonitor.registerCallback(this); diff --git a/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java b/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java index e44e58a84dc8..7e801da9cd1b 100644 --- a/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java +++ b/packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java @@ -37,6 +37,7 @@ import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; import com.android.systemui.statusbar.phone.LockIcon; import com.android.systemui.statusbar.phone.NotificationPanelView; +import com.android.systemui.statusbar.policy.Clock; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -178,6 +179,11 @@ public class InjectionInflationController { * Creates the QSCustomizer. */ QSCustomizer createQSCustomizer(); + + /** + * Creates a Clock. + */ + Clock createClock(); } /** diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java index a6b5b38fd728..edea92f5952a 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java @@ -59,6 +59,7 @@ import com.android.settingslib.volume.MediaSessions; import com.android.systemui.Dumpable; import com.android.systemui.R; import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.plugins.VolumeDialogController; import com.android.systemui.qs.tiles.DndTile; @@ -137,9 +138,10 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa private UserActivityListener mUserActivityListener; protected final VC mVolumeController = new VC(); + protected final BroadcastDispatcher mBroadcastDispatcher; @Inject - public VolumeDialogControllerImpl(Context context) { + public VolumeDialogControllerImpl(Context context, BroadcastDispatcher broadcastDispatcher) { mContext = context.getApplicationContext(); mNotificationManager = (NotificationManager) mContext.getSystemService( Context.NOTIFICATION_SERVICE); @@ -152,6 +154,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa mAudio = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); mNoMan = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE); mObserver = new SettingObserver(mWorker); + mBroadcastDispatcher = broadcastDispatcher; mObserver.init(); mReceiver.init(); mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE); @@ -1004,11 +1007,11 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); - mContext.registerReceiver(this, filter, null, mWorker); + mBroadcastDispatcher.registerReceiver(this, filter, mWorker); } public void destroy() { - mContext.unregisterReceiver(this); + mBroadcastDispatcher.unregisterReceiver(this); } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java index 3b5e12c4ef96..64ab060e14a2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java @@ -45,7 +45,6 @@ import android.testing.TestableLooper.RunWithLooper; import android.view.Display; import android.view.View; import android.view.WindowManager; -import android.view.WindowManagerPolicyConstants; import androidx.test.filters.SmallTest; @@ -53,7 +52,6 @@ import com.android.systemui.R.dimen; import com.android.systemui.ScreenDecorations.TunablePaddingTagListener; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentService; -import com.android.systemui.statusbar.phone.NavigationModeController; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarWindowView; import com.android.systemui.tuner.TunablePadding; @@ -80,7 +78,6 @@ public class ScreenDecorationsTest extends SysuiTestCase { private TunerService mTunerService; private StatusBarWindowView mView; private TunablePaddingService mTunablePaddingService; - private NavigationModeController mNavigationModeController; @Before public void setup() { @@ -90,8 +87,6 @@ public class ScreenDecorationsTest extends SysuiTestCase { mTunablePaddingService = mDependency.injectMockDependency(TunablePaddingService.class); mTunerService = mDependency.injectMockDependency(TunerService.class); mFragmentService = mDependency.injectMockDependency(FragmentService.class); - mNavigationModeController = mDependency.injectMockDependency( - NavigationModeController.class); mStatusBar = mock(StatusBar.class); mWindowManager = mock(WindowManager.class); @@ -213,54 +208,6 @@ public class ScreenDecorationsTest extends SysuiTestCase { } @Test - public void testAssistHandles() { - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.dimen.rounded_corner_radius, 0); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.dimen.rounded_corner_radius_top, 0); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.dimen.rounded_corner_radius_bottom, 0); - mContext.getOrCreateTestableResources() - .addOverride(dimen.rounded_corner_content_padding, 0); - when(mNavigationModeController.addListener(any())).thenReturn( - WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL); - - mScreenDecorations.start(); - - // Add 2 windows for rounded corners (top and bottom). - verify(mWindowManager, times(2)).addView(any(), any()); - } - - @Test - public void testDelayedAssistHandles() { - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.dimen.rounded_corner_radius, 0); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.dimen.rounded_corner_radius_top, 0); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.dimen.rounded_corner_radius_bottom, 0); - mContext.getOrCreateTestableResources() - .addOverride(dimen.rounded_corner_content_padding, 0); - when(mNavigationModeController.addListener(any())).thenReturn( - WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON); - - mScreenDecorations.start(); - - // No handles and no corners - verify(mWindowManager, never()).addView(any(), any()); - - mScreenDecorations.handleNavigationModeChange( - WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL); - - // Add 2 windows for rounded corners (top and bottom). - verify(mWindowManager, times(2)).addView(any(), any()); - } - - @Test public void hasRoundedCornerOverlayFlagSet() { assertThat(mScreenDecorations.getWindowLayoutParams().privateFlags & PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY, 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 9c920f52d56a..fbb8e0c171cd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleBehaviorControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleBehaviorControllerTest.java @@ -38,7 +38,6 @@ import androidx.test.filters.SmallTest; import com.android.internal.app.AssistUtils; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.systemui.DumpController; -import com.android.systemui.ScreenDecorations; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.OverviewProxyService; @@ -64,7 +63,6 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { private AssistHandleBehaviorController mAssistHandleBehaviorController; - @Mock private ScreenDecorations mMockScreenDecorations; @Mock private AssistUtils mMockAssistUtils; @Mock private Handler mMockHandler; @Mock private PhenotypeHelper mMockPhenotypeHelper; @@ -74,6 +72,7 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { @Mock private AssistHandleBehaviorController.BehaviorController mMockTestBehavior; @Mock private NavigationModeController mMockNavigationModeController; @Mock private DumpController mMockDumpController; + @Mock private AssistHandleViewController mMockAssistHandleViewController; @Before public void setup() { @@ -97,7 +96,7 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { mContext, mMockAssistUtils, mMockHandler, - () -> mMockScreenDecorations, + () -> mMockAssistHandleViewController, mMockPhenotypeHelper, behaviorMap, mMockNavigationModeController, @@ -114,14 +113,14 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.showAndStay(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.hide(); // Assert - verify(mMockScreenDecorations).setAssistHintVisible(false); - verifyNoMoreInteractions(mMockScreenDecorations); + verify(mMockAssistHandleViewController).setAssistHintVisible(false); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -129,13 +128,13 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.hide(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.hide(); // Assert - verifyNoMoreInteractions(mMockScreenDecorations); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -143,14 +142,14 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.hide(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndStay(); // Assert - verify(mMockScreenDecorations).setAssistHintVisible(true); - verifyNoMoreInteractions(mMockScreenDecorations); + verify(mMockAssistHandleViewController).setAssistHintVisible(true); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -158,13 +157,13 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.showAndStay(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndStay(); // Assert - verifyNoMoreInteractions(mMockScreenDecorations); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -172,13 +171,13 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(null); mAssistHandleBehaviorController.hide(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndStay(); // Assert - verifyNoMoreInteractions(mMockScreenDecorations); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -186,15 +185,15 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.hide(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGo(); // Assert - InOrder inOrder = inOrder(mMockScreenDecorations); - inOrder.verify(mMockScreenDecorations).setAssistHintVisible(true); - inOrder.verify(mMockScreenDecorations).setAssistHintVisible(false); + InOrder inOrder = inOrder(mMockAssistHandleViewController); + inOrder.verify(mMockAssistHandleViewController).setAssistHintVisible(true); + inOrder.verify(mMockAssistHandleViewController).setAssistHintVisible(false); inOrder.verifyNoMoreInteractions(); } @@ -203,14 +202,14 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.showAndStay(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGo(); // Assert - verify(mMockScreenDecorations).setAssistHintVisible(false); - verifyNoMoreInteractions(mMockScreenDecorations); + verify(mMockAssistHandleViewController).setAssistHintVisible(false); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -221,13 +220,13 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS), anyLong())).thenReturn(10000L); mAssistHandleBehaviorController.showAndGo(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGo(); // Assert - verifyNoMoreInteractions(mMockScreenDecorations); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -235,13 +234,13 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(null); mAssistHandleBehaviorController.hide(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGo(); // Assert - verifyNoMoreInteractions(mMockScreenDecorations); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -249,15 +248,15 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.hide(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGoDelayed(1000, false); // Assert - InOrder inOrder = inOrder(mMockScreenDecorations); - inOrder.verify(mMockScreenDecorations).setAssistHintVisible(true); - inOrder.verify(mMockScreenDecorations).setAssistHintVisible(false); + InOrder inOrder = inOrder(mMockAssistHandleViewController); + inOrder.verify(mMockAssistHandleViewController).setAssistHintVisible(true); + inOrder.verify(mMockAssistHandleViewController).setAssistHintVisible(false); inOrder.verifyNoMoreInteractions(); } @@ -266,14 +265,14 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.showAndStay(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGoDelayed(1000, false); // Assert - verify(mMockScreenDecorations).setAssistHintVisible(false); - verifyNoMoreInteractions(mMockScreenDecorations); + verify(mMockAssistHandleViewController).setAssistHintVisible(false); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -281,16 +280,16 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); mAssistHandleBehaviorController.showAndStay(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGoDelayed(1000, true); // Assert - InOrder inOrder = inOrder(mMockScreenDecorations); - inOrder.verify(mMockScreenDecorations).setAssistHintVisible(false); - inOrder.verify(mMockScreenDecorations).setAssistHintVisible(true); - inOrder.verify(mMockScreenDecorations).setAssistHintVisible(false); + InOrder inOrder = inOrder(mMockAssistHandleViewController); + inOrder.verify(mMockAssistHandleViewController).setAssistHintVisible(false); + inOrder.verify(mMockAssistHandleViewController).setAssistHintVisible(true); + inOrder.verify(mMockAssistHandleViewController).setAssistHintVisible(false); inOrder.verifyNoMoreInteractions(); } @@ -302,13 +301,13 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS), anyLong())).thenReturn(10000L); mAssistHandleBehaviorController.showAndGo(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGoDelayed(1000, false); // Assert - verifyNoMoreInteractions(mMockScreenDecorations); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test @@ -316,13 +315,13 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase { // Arrange when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(null); mAssistHandleBehaviorController.hide(); - reset(mMockScreenDecorations); + reset(mMockAssistHandleViewController); // Act mAssistHandleBehaviorController.showAndGoDelayed(1000, false); // Assert - verifyNoMoreInteractions(mMockScreenDecorations); + verifyNoMoreInteractions(mMockAssistHandleViewController); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleViewControllerTest.java new file mode 100644 index 000000000000..6e21ae218621 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleViewControllerTest.java @@ -0,0 +1,104 @@ +/* + * 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.assist; + +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.when; + +import android.os.Handler; +import android.os.Looper; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper.RunWithLooper; +import android.view.View; +import android.view.ViewPropertyAnimator; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.CornerHandleView; +import com.android.systemui.SysuiTestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +@RunWithLooper +public class AssistHandleViewControllerTest extends SysuiTestCase { + + private AssistHandleViewController mAssistHandleViewController; + + @Mock private Handler mMockHandler; + @Mock private Looper mMockLooper; + @Mock private View mMockBarView; + @Mock private CornerHandleView mMockAssistHint; + @Mock private ViewPropertyAnimator mMockAnimator; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(mMockBarView.findViewById(anyInt())).thenReturn(mMockAssistHint); + when(mMockAssistHint.animate()).thenReturn(mMockAnimator); + when(mMockAnimator.setInterpolator(any())).thenReturn(mMockAnimator); + when(mMockAnimator.setDuration(anyLong())).thenReturn(mMockAnimator); + doNothing().when(mMockAnimator).cancel(); + when(mMockHandler.getLooper()).thenReturn(mMockLooper); + when(mMockLooper.isCurrentThread()).thenReturn(true); + + mAssistHandleViewController = new AssistHandleViewController(mMockHandler, mMockBarView); + } + + @Test + public void testSetVisibleWithoutBlocked() { + // Act + mAssistHandleViewController.setAssistHintVisible(true); + + // Assert + assertTrue(mAssistHandleViewController.mAssistHintVisible); + } + + @Test + public void testSetInvisibleWithoutBlocked() { + // Arrange + mAssistHandleViewController.setAssistHintVisible(true); + + // Act + mAssistHandleViewController.setAssistHintVisible(false); + + // Assert + assertFalse(mAssistHandleViewController.mAssistHintVisible); + } + + @Test + public void testSetVisibleWithBlocked() { + // Act + mAssistHandleViewController.setAssistHintBlocked(true); + mAssistHandleViewController.setAssistHintVisible(true); + + // Assert + assertFalse(mAssistHandleViewController.mAssistHintVisible); + assertTrue(mAssistHandleViewController.mAssistHintBlocked); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt b/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt index 011c2cd57588..e838d9e94a31 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt @@ -70,6 +70,8 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { private lateinit var mockContext: Context @Mock private lateinit var mockHandler: Handler + @Mock + private lateinit var mPendingResult: BroadcastReceiver.PendingResult @Captor private lateinit var argumentCaptor: ArgumentCaptor<IntentFilter> @@ -88,6 +90,7 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { universalBroadcastReceiver = UserBroadcastDispatcher( mockContext, USER_ID, handler, testableLooper.looper) + universalBroadcastReceiver.pendingResult = mPendingResult } @Test @@ -227,4 +230,19 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { verify(broadcastReceiver).onReceive(mockContext, intent) verify(broadcastReceiverOther).onReceive(mockContext, intent) } + + @Test + fun testPendingResult() { + intentFilter = IntentFilter(ACTION_1) + universalBroadcastReceiver.registerReceiver( + ReceiverData(broadcastReceiver, intentFilter, handler, USER_HANDLE)) + + val intent = Intent(ACTION_1) + universalBroadcastReceiver.onReceive(mockContext, intent) + + testableLooper.processAllMessages() + + verify(broadcastReceiver).onReceive(mockContext, intent) + verify(broadcastReceiver).pendingResult = mPendingResult + } } 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 4d95f3f474b5..4958c649d532 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java @@ -19,6 +19,7 @@ import static android.provider.Settings.Global.SHOW_USB_TEMPERATURE_ALARM; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.mock; @@ -27,8 +28,11 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.IntentFilter; import android.os.BatteryManager; +import android.os.Handler; import android.os.IThermalEventListener; import android.os.IThermalService; import android.os.PowerManager; @@ -43,6 +47,7 @@ import android.testing.TestableResources; import com.android.settingslib.fuelgauge.Estimate; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.power.PowerUI.WarningsUI; import com.android.systemui.statusbar.phone.StatusBar; @@ -80,6 +85,7 @@ public class PowerUITest extends SysuiTestCase { @Mock private IThermalService mThermalServiceMock; private IThermalEventListener mUsbThermalEventListener; private IThermalEventListener mSkinThermalEventListener; + @Mock private BroadcastDispatcher mBroadcastDispatcher; @Before public void setup() { @@ -96,6 +102,15 @@ public class PowerUITest extends SysuiTestCase { } @Test + public void testReceiverIsRegisteredToDispatcherOnStart() { + mPowerUI.start(); + verify(mBroadcastDispatcher).registerReceiver( + any(BroadcastReceiver.class), + any(IntentFilter.class), + any(Handler.class)); //PowerUI does not call with User + } + + @Test public void testSkinWarning_throttlingCritical() throws Exception { mPowerUI.start(); @@ -667,7 +682,7 @@ public class PowerUITest extends SysuiTestCase { } private void createPowerUi() { - mPowerUI = new PowerUI(); + mPowerUI = new PowerUI(mBroadcastDispatcher); mPowerUI.mContext = mContext; mPowerUI.mComponents = mContext.getComponents(); mPowerUI.mThermalService = mThermalServiceMock; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSCarrierGroupTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSCarrierGroupTest.java index f29392b2c5d6..a2a20a9538fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSCarrierGroupTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSCarrierGroupTest.java @@ -20,6 +20,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.os.Handler; import android.telephony.SubscriptionManager; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -28,6 +29,7 @@ import android.view.LayoutInflater; import androidx.test.filters.SmallTest; import com.android.keyguard.CarrierTextController; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.utils.leaks.LeakCheckedTest; @@ -45,13 +47,20 @@ import org.mockito.stubbing.Answer; public class QSCarrierGroupTest extends LeakCheckedTest { private QSCarrierGroup mCarrierGroup; + private CarrierTextController.CarrierTextCallback mCallback; + private TestableLooper mTestableLooper; @Before public void setup() throws Exception { injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES); - TestableLooper.get(this).runWithLooper( + mTestableLooper = TestableLooper.get(this); + mDependency.injectTestDependency( + Dependency.BG_HANDLER, new Handler(mTestableLooper.getLooper())); + mDependency.injectTestDependency(Dependency.MAIN_LOOPER, mTestableLooper.getLooper()); + mTestableLooper.runWithLooper( () -> mCarrierGroup = (QSCarrierGroup) LayoutInflater.from(mContext).inflate( R.layout.qs_carrier_group, null)); + mCallback = mCarrierGroup.getCallback(); } @Test // throws no Exception @@ -72,7 +81,7 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{""}, false, new int[]{0}); - spiedCarrierGroup.updateCarrierInfo(c1); + mCallback.updateCarrierInfo(c1); // listOfCarriers length 1, subscriptionIds length 1, anySims true CarrierTextController.CarrierTextCallbackInfo @@ -81,7 +90,7 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{""}, true, new int[]{0}); - spiedCarrierGroup.updateCarrierInfo(c2); + mCallback.updateCarrierInfo(c2); // listOfCarriers length 2, subscriptionIds length 2, anySims false CarrierTextController.CarrierTextCallbackInfo @@ -90,7 +99,7 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{"", ""}, false, new int[]{0, 1}); - spiedCarrierGroup.updateCarrierInfo(c3); + mCallback.updateCarrierInfo(c3); // listOfCarriers length 2, subscriptionIds length 2, anySims true CarrierTextController.CarrierTextCallbackInfo @@ -99,7 +108,9 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{"", ""}, true, new int[]{0, 1}); - spiedCarrierGroup.updateCarrierInfo(c4); + mCallback.updateCarrierInfo(c4); + + mTestableLooper.processAllMessages(); } @Test // throws no Exception @@ -120,7 +131,7 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{"", ""}, false, new int[]{0}); - spiedCarrierGroup.updateCarrierInfo(c1); + mCallback.updateCarrierInfo(c1); // listOfCarriers length 2, subscriptionIds length 1, anySims true CarrierTextController.CarrierTextCallbackInfo @@ -129,7 +140,7 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{"", ""}, true, new int[]{0}); - spiedCarrierGroup.updateCarrierInfo(c2); + mCallback.updateCarrierInfo(c2); // listOfCarriers length 1, subscriptionIds length 2, anySims false CarrierTextController.CarrierTextCallbackInfo @@ -138,7 +149,7 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{""}, false, new int[]{0, 1}); - spiedCarrierGroup.updateCarrierInfo(c3); + mCallback.updateCarrierInfo(c3); // listOfCarriers length 1, subscriptionIds length 2, anySims true CarrierTextController.CarrierTextCallbackInfo @@ -147,7 +158,8 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{""}, true, new int[]{0, 1}); - spiedCarrierGroup.updateCarrierInfo(c4); + mCallback.updateCarrierInfo(c4); + mTestableLooper.processAllMessages(); } @Test // throws no Exception @@ -161,7 +173,8 @@ public class QSCarrierGroupTest extends LeakCheckedTest { new CharSequence[]{"", ""}, true, new int[]{0, 1}); - spiedCarrierGroup.updateCarrierInfo(c4); + mCallback.updateCarrierInfo(c4); + mTestableLooper.processAllMessages(); } @Test // throws no Exception diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java index 33d3ac848f0f..0bff5aa9e991 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java @@ -24,9 +24,11 @@ import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.annotation.LayoutRes; @@ -34,11 +36,14 @@ import android.annotation.Nullable; import android.app.Fragment; import android.app.FragmentController; import android.app.FragmentHostCallback; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.IntentFilter; import android.hardware.display.DisplayManagerGlobal; import android.os.Bundle; import android.os.Handler; import android.os.Looper; +import android.os.UserHandle; import android.testing.AndroidTestingRunner; import android.testing.LeakCheck.Tracker; import android.testing.TestableLooper; @@ -58,6 +63,7 @@ import com.android.systemui.Dependency; import com.android.systemui.SysuiBaseFragmentTest; import com.android.systemui.SysuiTestableContext; import com.android.systemui.assist.AssistManager; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.model.SysUiState; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.OverviewProxyService; @@ -70,6 +76,8 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; @RunWith(AndroidTestingRunner.class) @RunWithLooper() @@ -85,6 +93,8 @@ public class NavigationBarFragmentTest extends SysuiBaseFragmentTest { private OverviewProxyService mOverviewProxyService; private CommandQueue mCommandQueue; private SysUiState mMockSysUiState; + @Mock + private BroadcastDispatcher mBroadcastDispatcher; private AccessibilityManagerWrapper mAccessibilityWrapper = new AccessibilityManagerWrapper(mContext) { @@ -112,6 +122,8 @@ public class NavigationBarFragmentTest extends SysuiBaseFragmentTest { @Before public void setupFragment() throws Exception { + MockitoAnnotations.initMocks(this); + setupSysuiDependency(); createRootView(); mOverviewProxyService = @@ -177,6 +189,18 @@ public class NavigationBarFragmentTest extends SysuiBaseFragmentTest { } @Test + public void testRegisteredWithDispatcher() { + mFragments.dispatchResume(); + processAllMessages(); + + verify(mBroadcastDispatcher).registerReceiver( + any(BroadcastReceiver.class), + any(IntentFilter.class), + any(Handler.class), + any(UserHandle.class)); + } + + @Test public void testSetImeWindowStatusWhenImeSwitchOnDisplay() { // Create default & external NavBar fragment. NavigationBarFragment defaultNavBar = (NavigationBarFragment) mFragment; @@ -227,7 +251,8 @@ public class NavigationBarFragmentTest extends SysuiBaseFragmentTest { mOverviewProxyService, mock(NavigationModeController.class), mock(StatusBarStateController.class), - mMockSysUiState); + mMockSysUiState, + mBroadcastDispatcher); } private class HostCallbacksForExternalDisplay extends 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 3be71c07009d..b75cb8cf487c 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 @@ -41,7 +41,9 @@ import static org.mockito.Mockito.when; import android.app.Notification; import android.app.StatusBarManager; import android.app.trust.TrustManager; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.IntentFilter; import android.hardware.display.AmbientDisplayConfiguration; import android.hardware.fingerprint.FingerprintManager; import android.metrics.LogMaker; @@ -51,6 +53,7 @@ import android.os.IPowerManager; import android.os.Looper; import android.os.PowerManager; import android.os.RemoteException; +import android.os.UserHandle; import android.service.dreams.IDreamManager; import android.support.test.metricshelper.MetricsAsserts; import android.testing.AndroidTestingRunner; @@ -75,6 +78,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.UiOffloadThread; import com.android.systemui.appops.AppOpsController; import com.android.systemui.assist.AssistManager; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.bubbles.BubbleController; import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; @@ -171,6 +175,8 @@ public class StatusBarTest extends SysuiTestCase { private AmbientDisplayConfiguration mAmbientDisplayConfiguration; @Mock private StatusBarWindowView mStatusBarWindowView; + @Mock + private BroadcastDispatcher mBroadcastDispatcher; private TestableStatusBar mStatusBar; private FakeMetricsLogger mMetricsLogger; @@ -199,6 +205,7 @@ public class StatusBarTest extends SysuiTestCase { mDependency.injectTestDependency(NotificationFilter.class, mNotificationFilter); mDependency.injectTestDependency(NotificationAlertingManager.class, mNotificationAlertingManager); + mDependency.injectTestDependency(BroadcastDispatcher.class, mBroadcastDispatcher); IPowerManager powerManagerService = mock(IPowerManager.class); mPowerManager = new PowerManager(mContext, powerManagerService, @@ -263,7 +270,8 @@ public class StatusBarTest extends SysuiTestCase { mDozeScrimController, mock(NotificationShelf.class), mLockscreenUserManager, mCommandQueue, mNotificationPresenter, mock(BubbleController.class), mock(NavigationBarController.class), - mock(AutoHideController.class), mKeyguardUpdateMonitor, mStatusBarWindowView); + mock(AutoHideController.class), mKeyguardUpdateMonitor, mStatusBarWindowView, + mBroadcastDispatcher); mStatusBar.mContext = mContext; mStatusBar.mComponents = mContext.getComponents(); SystemUIFactory.getInstance().getRootComponent() @@ -774,6 +782,16 @@ public class StatusBarTest extends SysuiTestCase { verify(mNotificationPanelView, never()).expand(anyBoolean()); } + @Test + public void testRegisterBroadcastsonDispatcher() { + mStatusBar.registerBroadcastReceiver(); + verify(mBroadcastDispatcher).registerReceiver( + any(BroadcastReceiver.class), + any(IntentFilter.class), + eq(null), + any(UserHandle.class)); + } + static class TestableStatusBar extends StatusBar { public TestableStatusBar(StatusBarKeyguardViewManager man, KeyguardIndicationController key, @@ -801,7 +819,8 @@ public class StatusBarTest extends SysuiTestCase { NavigationBarController navBarController, AutoHideController autoHideController, KeyguardUpdateMonitor keyguardUpdateMonitor, - StatusBarWindowView statusBarWindow) { + StatusBarWindowView statusBarWindow, + BroadcastDispatcher broadcastDispatcher) { mStatusBarKeyguardViewManager = man; mKeyguardIndicationController = key; mStackScroller = stack; @@ -835,6 +854,7 @@ public class StatusBarTest extends SysuiTestCase { mKeyguardUpdateMonitor = keyguardUpdateMonitor; mStatusBarWindow = statusBarWindow; mDozeServiceHost.mWakeLockScreenPerformsAuth = false; + mBroadcastDispatcher = broadcastDispatcher; } private WakefulnessLifecycle createAwakeWakefulnessLifecycle() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java index a9a1392fb80b..589aa0353870 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java @@ -18,11 +18,9 @@ import static junit.framework.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.content.BroadcastReceiver; -import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.testing.AndroidTestingRunner; @@ -31,11 +29,14 @@ import android.testing.TestableLooper.RunWithLooper; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.broadcast.BroadcastDispatcher; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; @RunWith(AndroidTestingRunner.class) @RunWithLooper @@ -43,13 +44,16 @@ import org.mockito.ArgumentCaptor; public class SystemUIDialogTest extends SysuiTestCase { private SystemUIDialog mDialog; - - Context mContextSpy; + @Mock + private BroadcastDispatcher mBroadcastDispatcher; @Before public void setup() { - mContextSpy = spy(mContext); - mDialog = new SystemUIDialog(mContextSpy); + MockitoAnnotations.initMocks(this); + + mDependency.injectTestDependency(BroadcastDispatcher.class, mBroadcastDispatcher); + + mDialog = new SystemUIDialog(mContext); } @Test @@ -60,12 +64,12 @@ public class SystemUIDialogTest extends SysuiTestCase { ArgumentCaptor.forClass(IntentFilter.class); mDialog.show(); - verify(mContextSpy).registerReceiverAsUser(broadcastReceiverCaptor.capture(), any(), - intentFilterCaptor.capture(), any(), any()); + verify(mBroadcastDispatcher).registerReceiver(broadcastReceiverCaptor.capture(), + intentFilterCaptor.capture(), eq(null), any()); assertTrue(intentFilterCaptor.getValue().hasAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); mDialog.dismiss(); - verify(mContextSpy).unregisterReceiver(eq(broadcastReceiverCaptor.getValue())); + verify(mBroadcastDispatcher).unregisterReceiver(eq(broadcastReceiverCaptor.getValue())); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java index f4d0854b2c9f..2e945f2481d2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java @@ -16,41 +16,64 @@ package com.android.systemui.volume; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.IntentFilter; import android.media.AudioManager; import android.media.session.MediaSession; +import android.os.Handler; +import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.statusbar.phone.StatusBar; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +@RunWith(AndroidTestingRunner.class) @SmallTest public class VolumeDialogControllerImplTest extends SysuiTestCase { TestableVolumeDialogControllerImpl mVolumeController; VolumeDialogControllerImpl.C mCallback; StatusBar mStatusBar; + @Mock + private BroadcastDispatcher mBroadcastDispatcher; @Before public void setup() throws Exception { + MockitoAnnotations.initMocks(this); + mCallback = mock(VolumeDialogControllerImpl.C.class); mStatusBar = mock(StatusBar.class); - mVolumeController = new TestableVolumeDialogControllerImpl(mContext, mCallback, mStatusBar); + mVolumeController = new TestableVolumeDialogControllerImpl(mContext, mCallback, mStatusBar, + mBroadcastDispatcher); mVolumeController.setEnableDialogs(true, true); } @Test + public void testRegisteredWithDispatcher() { + verify(mBroadcastDispatcher).registerReceiver( + any(BroadcastReceiver.class), + any(IntentFilter.class), + any(Handler.class)); // VolumeDialogControllerImpl does not call with user + } + + @Test public void testVolumeChangeW_deviceNotInteractiveAOD() { when(mStatusBar.isDeviceInteractive()).thenReturn(false); when(mStatusBar.getWakefulnessState()).thenReturn(WakefulnessLifecycle.WAKEFULNESS_AWAKE); @@ -81,7 +104,7 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { public void testVolumeChangeW_nullStatusBar() { VolumeDialogControllerImpl.C callback = mock(VolumeDialogControllerImpl.C.class); TestableVolumeDialogControllerImpl nullStatusBarTestableDialog = new - TestableVolumeDialogControllerImpl(mContext, callback, null); + TestableVolumeDialogControllerImpl(mContext, callback, null, mBroadcastDispatcher); nullStatusBarTestableDialog.setEnableDialogs(true, true); nullStatusBarTestableDialog.onVolumeChangedW(0, AudioManager.FLAG_SHOW_UI); verify(callback, times(1)).onShowRequested(Events.SHOW_REASON_VOLUME_CHANGED); @@ -100,8 +123,9 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { } static class TestableVolumeDialogControllerImpl extends VolumeDialogControllerImpl { - public TestableVolumeDialogControllerImpl(Context context, C callback, StatusBar s) { - super(context); + TestableVolumeDialogControllerImpl(Context context, C callback, StatusBar s, + BroadcastDispatcher broadcastDispatcher) { + super(context, broadcastDispatcher); mCallbacks = callback; mStatusBar = s; } diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index ffbf1ae38635..5d6d1c993cd3 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -230,6 +230,10 @@ message SystemMessage { // Package: android NOTE_TEST_HARNESS_MODE_ENABLED = 54; + // Inform the user that Serial Console is active. + // Package: android + NOTE_SERIAL_CONSOLE_ENABLED = 55; + // ADD_NEW_IDS_ABOVE_THIS_LINE // Legacy IDs with arbitrary values appear below // Legacy IDs existed as stable non-conflicting constants prior to the O release diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index 8e200196050c..b35300ceb399 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java @@ -78,6 +78,8 @@ final class SaveUi { private static final int THEME_ID_DARK = com.android.internal.R.style.Theme_DeviceDefault_Autofill_Save; + private static final int SCROLL_BAR_DEFAULT_DELAY_BEFORE_FADE_MS = 500; + public interface OnSaveListener { void onSave(); void onCancel(IntentSender listener); @@ -252,6 +254,8 @@ final class SaveUi { new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); subtitleContainer.setVisibility(View.VISIBLE); + subtitleContainer.setScrollBarDefaultDelayBeforeFade( + SCROLL_BAR_DEFAULT_DELAY_BEFORE_FADE_MS); } if (sDebug) Slog.d(TAG, "on constructor: title=" + mTitle + ", subTitle=" + mSubTitle); } @@ -429,6 +433,9 @@ final class SaveUi { saveUiView.findViewById(R.id.autofill_save_custom_subtitle); subtitleContainer.addView(customSubtitleView); subtitleContainer.setVisibility(View.VISIBLE); + subtitleContainer.setScrollBarDefaultDelayBeforeFade( + SCROLL_BAR_DEFAULT_DELAY_BEFORE_FADE_MS); + return true; } catch (Exception e) { Slog.e(TAG, "Error applying custom description. ", e); diff --git a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java index 30ce4cf2fd3f..de48f4b13d7b 100644 --- a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java +++ b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java @@ -93,7 +93,8 @@ public class TransportManager { mTransportWhitelist = Preconditions.checkNotNull(whitelist); mCurrentTransportName = selectedTransport; mTransportStats = new TransportStats(); - mTransportClientManager = new TransportClientManager(mUserId, context, mTransportStats); + mTransportClientManager = TransportClientManager.createEncryptingClientManager(mUserId, + context, mTransportStats); } @VisibleForTesting diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportClientManager.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportClientManager.java index a4e9b1091bed..72b1ee741d95 100644 --- a/services/backup/backuplib/java/com/android/server/backup/transport/TransportClientManager.java +++ b/services/backup/backuplib/java/com/android/server/backup/transport/TransportClientManager.java @@ -19,18 +19,21 @@ package com.android.server.backup.transport; import static com.android.server.backup.TransportManager.SERVICE_ACTION_TRANSPORT_HOST; import static com.android.server.backup.transport.TransportUtils.formatMessage; +import android.annotation.Nullable; import android.annotation.UserIdInt; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.android.internal.backup.IBackupTransport; import com.android.server.backup.TransportManager; import com.android.server.backup.transport.TransportUtils.Priority; import java.io.PrintWriter; import java.util.Map; import java.util.WeakHashMap; +import java.util.function.Function; /** * Manages the creation and disposal of {@link TransportClient}s. The only class that should use @@ -38,6 +41,12 @@ import java.util.WeakHashMap; */ public class TransportClientManager { private static final String TAG = "TransportClientManager"; + private static final String SERVICE_ACTION_ENCRYPTING_TRANSPORT = + "android.encryption.BACKUP_ENCRYPTION"; + private static final ComponentName ENCRYPTING_TRANSPORT = new ComponentName( + "com.android.server.backup.encryption", + "com.android.server.backup.encryption.BackupEncryptionService"); + private static final String ENCRYPTING_TRANSPORT_REAL_TRANSPORT_KEY = "transport"; private final @UserIdInt int mUserId; private final Context mContext; @@ -45,12 +54,64 @@ public class TransportClientManager { private final Object mTransportClientsLock = new Object(); private int mTransportClientsCreated = 0; private Map<TransportClient, String> mTransportClientsCallerMap = new WeakHashMap<>(); + private final Function<ComponentName, Intent> mIntentFunction; + + /** + * Return an {@link Intent} which resolves to an intermediate {@link IBackupTransport} that + * encrypts (or decrypts) the data when sending it (or receiving it) from the {@link + * IBackupTransport} for the given {@link ComponentName}. + */ + public static Intent getEncryptingTransportIntent(ComponentName tranportComponent) { + return new Intent(SERVICE_ACTION_ENCRYPTING_TRANSPORT) + .setComponent(ENCRYPTING_TRANSPORT) + .putExtra(ENCRYPTING_TRANSPORT_REAL_TRANSPORT_KEY, tranportComponent); + } + + /** + * Return an {@link Intent} which resolves to the {@link IBackupTransport} for the {@link + * ComponentName}. + */ + private static Intent getRealTransportIntent(ComponentName transportComponent) { + return new Intent(SERVICE_ACTION_TRANSPORT_HOST).setComponent(transportComponent); + } + + /** + * Given a {@link Intent} originally created by {@link + * #getEncryptingTransportIntent(ComponentName)}, returns the {@link Intent} which resolves to + * the {@link IBackupTransport} for that {@link ComponentName}. + */ + public static Intent getRealTransportIntent(Intent encryptingTransportIntent) { + ComponentName transportComponent = encryptingTransportIntent.getParcelableExtra( + ENCRYPTING_TRANSPORT_REAL_TRANSPORT_KEY); + Intent intent = getRealTransportIntent(transportComponent) + .putExtras(encryptingTransportIntent.getExtras()); + intent.removeExtra(ENCRYPTING_TRANSPORT_REAL_TRANSPORT_KEY); + return intent; + } + + /** + * Create a {@link TransportClientManager} such that {@link #getTransportClient(ComponentName, + * Bundle, String)} returns a {@link TransportClient} which connects to an intermediate {@link + * IBackupTransport} that encrypts (or decrypts) the data when sending it (or receiving it) from + * the {@link IBackupTransport} for the given {@link ComponentName}. + */ + public static TransportClientManager createEncryptingClientManager(@UserIdInt int userId, + Context context, TransportStats transportStats) { + return new TransportClientManager(userId, context, transportStats, + TransportClientManager::getEncryptingTransportIntent); + } public TransportClientManager(@UserIdInt int userId, Context context, TransportStats transportStats) { + this(userId, context, transportStats, TransportClientManager::getRealTransportIntent); + } + + private TransportClientManager(@UserIdInt int userId, Context context, + TransportStats transportStats, Function<ComponentName, Intent> intentFunction) { mUserId = userId; mContext = context; mTransportStats = transportStats; + mIntentFunction = intentFunction; } /** @@ -64,10 +125,7 @@ public class TransportClientManager { * @return A {@link TransportClient}. */ public TransportClient getTransportClient(ComponentName transportComponent, String caller) { - Intent bindIntent = - new Intent(SERVICE_ACTION_TRANSPORT_HOST).setComponent(transportComponent); - - return getTransportClient(transportComponent, caller, bindIntent); + return getTransportClient(transportComponent, null, caller); } /** @@ -82,11 +140,11 @@ public class TransportClientManager { * @return A {@link TransportClient}. */ public TransportClient getTransportClient( - ComponentName transportComponent, Bundle extras, String caller) { - Intent bindIntent = - new Intent(SERVICE_ACTION_TRANSPORT_HOST).setComponent(transportComponent); - bindIntent.putExtras(extras); - + ComponentName transportComponent, @Nullable Bundle extras, String caller) { + Intent bindIntent = mIntentFunction.apply(transportComponent); + if (extras != null) { + bindIntent.putExtras(extras); + } return getTransportClient(transportComponent, caller, bindIntent); } diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 8367e89058cf..34111a92b66e 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -196,6 +196,9 @@ class StorageManagerService extends IStorageManager.Stub 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(); /** @@ -346,6 +349,9 @@ class StorageManagerService extends IStorageManager.Stub @GuardedBy("mLock") private String mMoveTargetUuid; + @Nullable + private volatile String mMediaStoreAuthorityPackageName = null; + private volatile int mCurrentUserId = UserHandle.USER_SYSTEM; /** Holding lock for AppFuse business */ @@ -1520,6 +1526,9 @@ class StorageManagerService extends IStorageManager.Stub 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))); + mContext = context; mResolver = mContext.getContentResolver(); @@ -1661,6 +1670,15 @@ class StorageManagerService extends IStorageManager.Stub ServiceManager.getService("package")); mIAppOpsService = IAppOpsService.Stub.asInterface( ServiceManager.getService(Context.APP_OPS_SERVICE)); + + ProviderInfo provider = mPmInternal.resolveContentProvider( + MediaStore.AUTHORITY, PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, + UserHandle.getUserId(UserHandle.USER_SYSTEM)); + if (provider != null) { + mMediaStoreAuthorityPackageName = provider.packageName; + } + try { mIAppOpsService.startWatchingMode(OP_REQUEST_INSTALL_PACKAGES, null, mAppOpsCallback); mIAppOpsService.startWatchingMode(OP_LEGACY_STORAGE, null, mAppOpsCallback); @@ -1843,7 +1861,7 @@ class StorageManagerService extends IStorageManager.Stub // 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("persist.sys.fuse", false) + int userId = SystemProperties.getBoolean(StorageManager.PROP_FUSE_SNAPSHOT, false) ? mCurrentUserId : vol.mountUserId; return mVold.mount(vol.id, vol.mountFlags, userId); } catch (Exception e) { @@ -3672,6 +3690,11 @@ class StorageManagerService extends IStorageManager.Stub return Zygote.MOUNT_EXTERNAL_NONE; } + if (IS_FUSE_ENABLED && packageName.equals(mMediaStoreAuthorityPackageName)) { + // Determine if caller requires pass_through mount + return Zygote.MOUNT_EXTERNAL_PASS_THROUGH; + } + // Determine if caller is holding runtime permission final boolean hasRead = StorageManager.checkPermissionAndCheckOp(mContext, false, 0, uid, packageName, READ_EXTERNAL_STORAGE, OP_READ_EXTERNAL_STORAGE); diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index caa4f63d387d..5947c3599ca8 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -284,11 +284,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } case MSG_UPDATE_DEFAULT_SUB: { int newDefaultPhoneId = msg.arg1; - int newDefaultSubId = (Integer)(msg.obj); + int newDefaultSubId = msg.arg2; if (VDBG) { log("MSG_UPDATE_DEFAULT_SUB:current mDefaultSubId=" + mDefaultSubId - + " current mDefaultPhoneId=" + mDefaultPhoneId + " newDefaultSubId= " - + newDefaultSubId + " newDefaultPhoneId=" + newDefaultPhoneId); + + " current mDefaultPhoneId=" + mDefaultPhoneId + + " newDefaultSubId=" + newDefaultSubId + + " newDefaultPhoneId=" + newDefaultPhoneId); } //Due to possible risk condition,(notify call back using the new @@ -305,7 +306,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mDefaultSubId = newDefaultSubId; mDefaultPhoneId = newDefaultPhoneId; mLocalLog.log("Default subscription updated: mDefaultPhoneId=" - + mDefaultPhoneId + ", mDefaultSubId" + mDefaultSubId); + + mDefaultPhoneId + ", mDefaultSubId=" + mDefaultSubId); } } } @@ -335,22 +336,25 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0); if (DBG) log("onReceive: userHandle=" + userHandle); mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCHED, userHandle, 0)); - } else if (action.equals(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) { - Integer newDefaultSubIdObj = new Integer(intent.getIntExtra( - PhoneConstants.SUBSCRIPTION_KEY, - SubscriptionManager.getDefaultSubscriptionId())); - int newDefaultPhoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY, - SubscriptionManager.getPhoneId(mDefaultSubId)); + } else if (action.equals(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) { + int newDefaultSubId = intent.getIntExtra( + SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, + SubscriptionManager.getDefaultSubscriptionId()); + int newDefaultPhoneId = intent.getIntExtra( + PhoneConstants.PHONE_KEY, + SubscriptionManager.getPhoneId(newDefaultSubId)); if (DBG) { log("onReceive:current mDefaultSubId=" + mDefaultSubId - + " current mDefaultPhoneId=" + mDefaultPhoneId + " newDefaultSubId= " - + newDefaultSubIdObj + " newDefaultPhoneId=" + newDefaultPhoneId); + + " current mDefaultPhoneId=" + mDefaultPhoneId + + " newDefaultSubId=" + newDefaultSubId + + " newDefaultPhoneId=" + newDefaultPhoneId); } - if(validatePhoneId(newDefaultPhoneId) && (!newDefaultSubIdObj.equals(mDefaultSubId) - || (newDefaultPhoneId != mDefaultPhoneId))) { + if (validatePhoneId(newDefaultPhoneId) + && (newDefaultSubId != mDefaultSubId + || newDefaultPhoneId != mDefaultPhoneId)) { mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB, - newDefaultPhoneId, 0, newDefaultSubIdObj)); + newDefaultPhoneId, newDefaultSubId)); } } } @@ -449,7 +453,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { final IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_USER_SWITCHED); filter.addAction(Intent.ACTION_USER_REMOVED); - filter.addAction(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED); + filter.addAction(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED); log("systemRunning register for intents"); mContext.registerReceiver(mBroadcastReceiver, filter); } @@ -1189,7 +1193,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { public void notifyCarrierNetworkChange(boolean active) { // only CarrierService with carrier privilege rule should have the permission int[] subIds = Arrays.stream(SubscriptionManager.from(mContext) - .getActiveSubscriptionIdList()) + .getActiveSubscriptionIdList(false)) .filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i)).toArray(); if (ArrayUtils.isEmpty(subIds)) { loge("notifyCarrierNetworkChange without carrier privilege"); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index c07f67b902ac..7b69bea6014b 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5320,10 +5320,42 @@ public class ActivityManagerService extends IActivityManager.Stub }); mUserController.scheduleStartProfiles(); } + // UART is on if init's console service is running, send a warning notification. + showConsoleNotificationIfActive(); t.traceEnd(); } + private void showConsoleNotificationIfActive() { + if (!SystemProperties.get("init.svc.console").equals("running")) { + return; + } + String title = mContext + .getString(com.android.internal.R.string.console_running_notification_title); + String message = mContext + .getString(com.android.internal.R.string.console_running_notification_message); + Notification notification = + new Notification.Builder(mContext, SystemNotificationChannels.DEVELOPER) + .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb) + .setWhen(0) + .setOngoing(true) + .setTicker(title) + .setDefaults(0) // please be quiet + .setColor(mContext.getColor( + com.android.internal.R.color + .system_notification_accent_color)) + .setContentTitle(title) + .setContentText(message) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .build(); + + NotificationManager notificationManager = + mContext.getSystemService(NotificationManager.class); + notificationManager.notifyAsUser( + null, SystemMessage.NOTE_SERIAL_CONSOLE_ENABLED, notification, UserHandle.ALL); + + } + @Override public void bootAnimationComplete() { final boolean callFinishBooting; @@ -8279,6 +8311,8 @@ public class ActivityManagerService extends IActivityManager.Stub triggerShellBugreport.setAction(INTENT_BUGREPORT_REQUESTED); triggerShellBugreport.setPackage(SHELL_APP_PACKAGE); triggerShellBugreport.putExtra(EXTRA_BUGREPORT_TYPE, bugreportType); + triggerShellBugreport.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + triggerShellBugreport.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); if (shareTitle != null) { triggerShellBugreport.putExtra(EXTRA_TITLE, shareTitle); } @@ -15267,7 +15301,7 @@ public class ActivityManagerService extends IActivityManager.Stub mBatteryStatsService.removeUid(uid); if (intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { mAppOpsService.resetAllModes(UserHandle.getUserId(uid), - intent.getData().getSchemeSpecificPart()); + intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME)); } else { mAppOpsService.uidRemoved(uid); } diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 56208a9565e1..59c2326124f0 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -446,7 +446,9 @@ public final class BroadcastQueue { mHandler.removeCallbacksAndMessages(msgToken); // ...then schedule the removal of the token after the extended timeout mHandler.postAtTime(() -> { - app.removeAllowBackgroundActivityStartsToken(r); + synchronized (mService) { + app.removeAllowBackgroundActivityStartsToken(r); + } }, msgToken, (r.receiverTime + mConstants.ALLOW_BG_ACTIVITY_START_TIMEOUT)); } diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index 81e507cd24cf..8e09d0e5958e 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -18,6 +18,7 @@ package com.android.server.compat; import android.content.Context; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.util.Slog; import android.util.StatsLog; @@ -40,7 +41,8 @@ public class PlatformCompat extends IPlatformCompat.Stub { public PlatformCompat(Context context) { mContext = context; - mChangeReporter = new ChangeReporter(); + mChangeReporter = new ChangeReporter( + StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__SOURCE__SYSTEM_SERVER); } @Override @@ -49,6 +51,15 @@ public class PlatformCompat extends IPlatformCompat.Stub { } @Override + public void reportChangeByPackageName(long changeId, String packageName) { + ApplicationInfo appInfo = getApplicationInfo(packageName); + if (appInfo == null) { + return; + } + reportChange(changeId, appInfo); + } + + @Override public boolean isChangeEnabled(long changeId, ApplicationInfo appInfo) { if (CompatConfig.get().isChangeEnabled(changeId, appInfo)) { reportChange(changeId, appInfo, @@ -61,17 +72,31 @@ public class PlatformCompat extends IPlatformCompat.Stub { } @Override + public boolean isChangeEnabledByPackageName(long changeId, String packageName) { + ApplicationInfo appInfo = getApplicationInfo(packageName); + if (appInfo == null) { + return true; + } + return isChangeEnabled(changeId, appInfo); + } + + @Override protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpAndUsageStatsPermission(mContext, "platform_compat", pw)) return; CompatConfig.get().dumpConfig(pw); } + private ApplicationInfo getApplicationInfo(String packageName) { + try { + return mContext.getPackageManager().getApplicationInfo(packageName, 0); + } catch (PackageManager.NameNotFoundException e) { + Slog.e(TAG, "No installed package " + packageName); + } + return null; + } + private void reportChange(long changeId, ApplicationInfo appInfo, int state) { int uid = appInfo.uid; - //TODO(b/138374585): Implement rate limiting for the logs. - Slog.d(TAG, ChangeReporter.createLogString(uid, changeId, state)); - mChangeReporter.reportChange(uid, changeId, - state, /* source */ - StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__SOURCE__SYSTEM_SERVER); + mChangeReporter.reportChange(uid, changeId, state); } } diff --git a/services/core/java/com/android/server/display/DisplayModeDirector.java b/services/core/java/com/android/server/display/DisplayModeDirector.java index 1fc0db3ff7cb..d24bd1aad1b1 100644 --- a/services/core/java/com/android/server/display/DisplayModeDirector.java +++ b/services/core/java/com/android/server/display/DisplayModeDirector.java @@ -49,8 +49,9 @@ import android.view.DisplayInfo; import com.android.internal.os.BackgroundThread; import com.android.internal.R; +import com.android.server.display.utils.AmbientFilter; +import com.android.server.display.utils.AmbientFilterFactory; import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory; -import com.android.server.display.whitebalance.AmbientFilter; import java.io.PrintWriter; import java.util.ArrayList; @@ -970,7 +971,7 @@ public class DisplayModeDirector { if (lightSensor != null) { final Resources res = mContext.getResources(); - mAmbientFilter = DisplayWhiteBalanceFactory.createBrightnessFilter(res); + mAmbientFilter = AmbientFilterFactory.createBrightnessFilter(TAG, res); mLightSensor = lightSensor; onScreenOn(isDefaultDisplayOn()); diff --git a/services/core/java/com/android/server/display/whitebalance/AmbientFilter.java b/services/core/java/com/android/server/display/utils/AmbientFilter.java index 35808974b9e4..1a8412180c27 100644 --- a/services/core/java/com/android/server/display/whitebalance/AmbientFilter.java +++ b/services/core/java/com/android/server/display/utils/AmbientFilter.java @@ -14,13 +14,10 @@ * limitations under the License. */ -package com.android.server.display.whitebalance; +package com.android.server.display.utils; import android.util.Slog; -import com.android.internal.annotations.VisibleForTesting; -import com.android.server.display.utils.RollingBuffer; - import java.io.PrintWriter; import java.util.Arrays; diff --git a/services/core/java/com/android/server/display/utils/AmbientFilterFactory.java b/services/core/java/com/android/server/display/utils/AmbientFilterFactory.java new file mode 100644 index 000000000000..dfa1ddc67528 --- /dev/null +++ b/services/core/java/com/android/server/display/utils/AmbientFilterFactory.java @@ -0,0 +1,105 @@ +/* + * 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.display.utils; + +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.util.TypedValue; + +public class AmbientFilterFactory { + /** + * Creates a temporal filter which functions as a weighted moving average buffer for recent + * sensor values. + * @param tag + * The tag used for dumping and logging. + * @param horizon + * How long ambient value changes are kept and taken into consideration. + * @param intercept + * Recent changes are prioritised by integrating their duration over y = x + intercept + * (the higher it is, the less prioritised recent changes are). + * + * @return + * An AmbientFiler. + * + * @throws IllegalArgumentException + * - Horizon is not positive. + * - Intercept not configured. + */ + public static AmbientFilter createAmbientFilter(String tag, int horizon, float intercept) { + if (!Float.isNaN(intercept)) { + return new AmbientFilter.WeightedMovingAverageAmbientFilter(tag, horizon, intercept); + } + throw new IllegalArgumentException("missing configurations: " + + "expected config_displayWhiteBalanceBrightnessFilterIntercept"); + } + + /** + * Helper to create a default BrightnessFilter which has configuration in the resource file. + * @param tag + * The tag used for dumping and logging. + * @param resources + * The resources used to configure the various components. + * + * @return + * An AmbientFilter. + */ + public static AmbientFilter createBrightnessFilter(String tag, Resources resources) { + final int horizon = resources.getInteger( + com.android.internal.R.integer.config_displayWhiteBalanceBrightnessFilterHorizon); + final float intercept = getFloat(resources, + com.android.internal.R.dimen.config_displayWhiteBalanceBrightnessFilterIntercept); + + return createAmbientFilter(tag, horizon, intercept); + } + + /** + * Helper to creates a default ColorTemperatureFilter which has configuration in the resource + * file. + * @param tag + * The tag used for dumping and logging. + * @param resources + * The resources used to configure the various components. + * + * @return + * An AmbientFilter. + */ + public static AmbientFilter createColorTemperatureFilter(String tag, Resources resources) { + final int horizon = resources.getInteger( + com.android.internal.R.integer + .config_displayWhiteBalanceColorTemperatureFilterHorizon); + final float intercept = getFloat(resources, + com.android.internal.R.dimen + .config_displayWhiteBalanceColorTemperatureFilterIntercept); + + return createAmbientFilter(tag, horizon, intercept); + } + + // Instantiation is disabled. + private AmbientFilterFactory() { } + + private static float getFloat(Resources resources, int id) { + TypedValue value = new TypedValue(); + + resources.getValue(id, value, true /* resolveRefs */); + if (value.type != TypedValue.TYPE_FLOAT) { + return Float.NaN; + } + + return value.getFloat(); + } +} + diff --git a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java index 7b1f4c3222f3..88a7077ac37a 100644 --- a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java +++ b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java @@ -24,6 +24,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; import com.android.server.LocalServices; import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal; +import com.android.server.display.utils.AmbientFilter; import com.android.server.display.utils.History; import java.io.PrintWriter; @@ -63,7 +64,13 @@ public class DisplayWhiteBalanceController implements AmbientFilter mColorTemperatureFilter; private DisplayWhiteBalanceThrottler mThrottler; + // In low brightness conditions the ALS readings are more noisy and produce + // high errors. This default is introduced to provide a fixed display color + // temperature when sensor readings become unreliable. private final float mLowLightAmbientColorTemperature; + // In high brightness conditions certain color temperatures can cause peak display + // brightness to drop. This fixed color temperature can be used to compensate for + // this effect. private final float mHighLightAmbientColorTemperature; private float mAmbientColorTemperature; @@ -84,12 +91,14 @@ public class DisplayWhiteBalanceController implements // A piecewise linear relationship between ambient and display color temperatures. private Spline.LinearSpline mAmbientToDisplayColorTemperatureSpline; - // In very low or very high brightness conditions ambient EQ should to set to a default - // instead of using mAmbientToDisplayColorTemperatureSpline. However, setting ambient EQ - // based on thresholds can cause the display to rapidly change color temperature. To solve - // this, mLowLightAmbientBrightnessToBiasSpline and mHighLightAmbientBrightnessToBiasSpline - // are used to smoothly interpolate from ambient color temperature to the defaults. - // A piecewise linear relationship between low light brightness and low light bias. + // In very low or very high brightness conditions Display White Balance should + // be to set to a default instead of using mAmbientToDisplayColorTemperatureSpline. + // However, setting Display White Balance based on thresholds can cause the + // display to rapidly change color temperature. To solve this, + // mLowLightAmbientBrightnessToBiasSpline and + // mHighLightAmbientBrightnessToBiasSpline are used to smoothly interpolate from + // ambient color temperature to the defaults. A piecewise linear relationship + // between low light brightness and low light bias. private Spline.LinearSpline mLowLightAmbientBrightnessToBiasSpline; // A piecewise linear relationship between high light brightness and high light bias. diff --git a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceFactory.java b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceFactory.java index bf0a1d16219d..a72b1ed8f3ec 100644 --- a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceFactory.java +++ b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceFactory.java @@ -23,6 +23,8 @@ import android.os.Handler; import android.util.TypedValue; import com.android.internal.annotations.VisibleForTesting; +import com.android.server.display.utils.AmbientFilter; +import com.android.server.display.utils.AmbientFilterFactory; /** * The DisplayWhiteBalanceFactory creates and configures an DisplayWhiteBalanceController. @@ -58,10 +60,12 @@ public class DisplayWhiteBalanceFactory { SensorManager sensorManager, Resources resources) { final AmbientSensor.AmbientBrightnessSensor brightnessSensor = createBrightnessSensor(handler, sensorManager, resources); - final AmbientFilter brightnessFilter = createBrightnessFilter(resources); + final AmbientFilter brightnessFilter = + AmbientFilterFactory.createBrightnessFilter(BRIGHTNESS_FILTER_TAG, resources); final AmbientSensor.AmbientColorTemperatureSensor colorTemperatureSensor = createColorTemperatureSensor(handler, sensorManager, resources); - final AmbientFilter colorTemperatureFilter = createColorTemperatureFilter(resources); + final AmbientFilter colorTemperatureFilter = AmbientFilterFactory + .createColorTemperatureFilter(COLOR_TEMPERATURE_FILTER_TAG, resources); final DisplayWhiteBalanceThrottler throttler = createThrottler(resources); final float[] displayWhiteBalanceLowLightAmbientBrightnesses = getFloatArray(resources, com.android.internal.R.array @@ -112,23 +116,6 @@ public class DisplayWhiteBalanceFactory { } /** - * Creates a BrightnessFilter which functions as a weighted moving average buffer for recent - * brightness values. - */ - public static AmbientFilter createBrightnessFilter(Resources resources) { - final int horizon = resources.getInteger( - com.android.internal.R.integer.config_displayWhiteBalanceBrightnessFilterHorizon); - final float intercept = getFloat(resources, - com.android.internal.R.dimen.config_displayWhiteBalanceBrightnessFilterIntercept); - if (!Float.isNaN(intercept)) { - return new AmbientFilter.WeightedMovingAverageAmbientFilter( - BRIGHTNESS_FILTER_TAG, horizon, intercept); - } - throw new IllegalArgumentException("missing configurations: " - + "expected config_displayWhiteBalanceBrightnessFilterIntercept"); - } - - /** * Creates an ambient color sensor instance to redirect sensor data to callbacks. */ @VisibleForTesting @@ -143,21 +130,6 @@ public class DisplayWhiteBalanceFactory { return new AmbientSensor.AmbientColorTemperatureSensor(handler, sensorManager, name, rate); } - private static AmbientFilter createColorTemperatureFilter(Resources resources) { - final int horizon = resources.getInteger( - com.android.internal.R.integer - .config_displayWhiteBalanceColorTemperatureFilterHorizon); - final float intercept = getFloat(resources, - com.android.internal.R.dimen - .config_displayWhiteBalanceColorTemperatureFilterIntercept); - if (!Float.isNaN(intercept)) { - return new AmbientFilter.WeightedMovingAverageAmbientFilter( - COLOR_TEMPERATURE_FILTER_TAG, horizon, intercept); - } - throw new IllegalArgumentException("missing configurations: " - + "expected config_displayWhiteBalanceColorTemperatureFilterIntercept"); - } - private static DisplayWhiteBalanceThrottler createThrottler(Resources resources) { final int increaseDebounce = resources.getInteger( com.android.internal.R.integer.config_displayWhiteBalanceDecreaseDebounce); diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index 248351ca3d2f..0aee8507d5af 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -456,6 +456,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } mDestroyed = true; + mPlaybackState = null; mHandler.post(MessageHandler.MSG_DESTROYED); } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 123e65e5b9ac..d07e2d232ea6 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -137,7 +137,6 @@ import android.content.IntentSender; import android.content.IntentSender.SendIntentException; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; -import android.content.pm.AppsQueryHelper; import android.content.pm.AuxiliaryResolveInfo; import android.content.pm.ChangedPackages; import android.content.pm.ComponentInfo; @@ -2473,54 +2472,21 @@ public class PackageManagerService extends IPackageManager.Stub PackageManagerService m = new PackageManagerService(injector, factoryTest, onlyCore); t.traceEnd(); // "create package manager" - m.enableSystemUserPackages(); + m.installWhitelistedSystemPackages(); ServiceManager.addService("package", m); final PackageManagerNative pmn = m.new PackageManagerNative(); ServiceManager.addService("package_native", pmn); return m; } - private void enableSystemUserPackages() { - if (!UserManager.isSplitSystemUser()) { - return; - } - // For system user, enable apps based on the following conditions: - // - app is whitelisted or belong to one of these groups: - // -- system app which has no launcher icons - // -- system app which has INTERACT_ACROSS_USERS permission - // -- system IME app - // - app is not in the blacklist - AppsQueryHelper queryHelper = new AppsQueryHelper(this); - Set<String> enableApps = new ArraySet<>(); - enableApps.addAll(queryHelper.queryApps(AppsQueryHelper.GET_NON_LAUNCHABLE_APPS - | AppsQueryHelper.GET_APPS_WITH_INTERACT_ACROSS_USERS_PERM - | AppsQueryHelper.GET_IMES, /* systemAppsOnly */ true, UserHandle.SYSTEM)); - ArraySet<String> wlApps = SystemConfig.getInstance().getSystemUserWhitelistedApps(); - enableApps.addAll(wlApps); - enableApps.addAll(queryHelper.queryApps(AppsQueryHelper.GET_REQUIRED_FOR_SYSTEM_USER, - /* systemAppsOnly */ false, UserHandle.SYSTEM)); - ArraySet<String> blApps = SystemConfig.getInstance().getSystemUserBlacklistedApps(); - enableApps.removeAll(blApps); - Log.i(TAG, "Applications installed for system user: " + enableApps); - List<String> allAps = queryHelper.queryApps(0, /* systemAppsOnly */ false, - UserHandle.SYSTEM); - final int allAppsSize = allAps.size(); + /** Install/uninstall system packages for all users based on their user-type, as applicable. */ + private void installWhitelistedSystemPackages() { synchronized (mLock) { - for (int i = 0; i < allAppsSize; i++) { - String pName = allAps.get(i); - PackageSetting pkgSetting = mSettings.mPackages.get(pName); - // Should not happen, but we shouldn't be failing if it does - if (pkgSetting == null) { - continue; - } - boolean install = enableApps.contains(pName); - if (pkgSetting.getInstalled(UserHandle.USER_SYSTEM) != install) { - Log.i(TAG, (install ? "Installing " : "Uninstalling ") + pName - + " for system user"); - pkgSetting.setInstalled(install, UserHandle.USER_SYSTEM); - } + final boolean scheduleWrite = mUserManager.installWhitelistedSystemPackages( + isFirstBoot(), isDeviceUpgrading()); + if (scheduleWrite) { + scheduleWritePackageRestrictionsLocked(UserHandle.USER_ALL); } - scheduleWritePackageRestrictionsLocked(UserHandle.USER_SYSTEM); } } @@ -17746,8 +17712,14 @@ public class PackageManagerService extends IPackageManager.Stub } } if (removedAppId >= 0) { + // If a system app's updates are uninstalled the UID is not actually removed. Some + // services need to know the package name affected. + if (extras.getBoolean(Intent.EXTRA_REPLACING, false)) { + extras.putString(Intent.EXTRA_PACKAGE_NAME, removedPackage); + } + packageSender.sendPackageBroadcast(Intent.ACTION_UID_REMOVED, - removedPackage, extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND, + null, extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND, null, null, broadcastUsers, instantUserIds); } } @@ -22312,10 +22284,19 @@ public class PackageManagerService extends IPackageManager.Stub } } - /** Called by UserManagerService */ - void createNewUser(int userId, String[] disallowedPackages) { + /** + * Called by UserManagerService. + * + * @param installablePackages system packages that should be initially installed for this user, + * or {@code null} if all system packages should be installed + * @param disallowedPackages packages that should not be initially installed. Takes precedence + * over installablePackages. + */ + void createNewUser(int userId, @Nullable Set<String> installablePackages, + String[] disallowedPackages) { synchronized (mInstallLock) { - mSettings.createNewUserLI(this, mInstaller, userId, disallowedPackages); + mSettings.createNewUserLI(this, mInstaller, userId, + installablePackages, disallowedPackages); } synchronized (mLock) { scheduleWritePackageRestrictionsLocked(userId); @@ -23124,6 +23105,19 @@ public class PackageManagerService extends IPackageManager.Stub } @Override + public boolean setInstalled(PackageParser.Package pkg, @UserIdInt int userId, + boolean installed) { + synchronized (mLock) { + final PackageSetting ps = mSettings.mPackages.get(pkg.packageName); + if (ps.getInstalled(userId) != installed) { + ps.setInstalled(installed, userId); + return true; + } + return false; + } + } + + @Override public void requestInstantAppResolutionPhaseTwo(AuxiliaryResolveInfo responseObj, Intent origIntent, String resolvedType, String callingPackage, Bundle verificationBundle, int userId) { diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index fe529a152364..3f32f3dde3ae 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -496,6 +496,10 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: no package specified"); return 1; } + userId = translateUserId(userId, true /*allowAll*/, "runPath"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } return displayPackageFilePath(pkg, userId); } @@ -718,6 +722,10 @@ class PackageManagerShellCommand extends ShellCommand { final String filter = getNextArg(); + userId = translateUserId(userId, true /*allowAll*/, "runListPackages"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } @SuppressWarnings("unchecked") final ParceledListSlice<PackageInfo> slice = mInterface.getInstalledPackages(getFlags, userId); @@ -1285,7 +1293,7 @@ class PackageManagerShellCommand extends ShellCommand { private int runInstallExisting() throws RemoteException { final PrintWriter pw = getOutPrintWriter(); - int userId = UserHandle.USER_SYSTEM; + int userId = UserHandle.USER_CURRENT; int installFlags = PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS; String opt; boolean waitTillComplete = false; @@ -1320,6 +1328,10 @@ class PackageManagerShellCommand extends ShellCommand { pw.println("Error: package name not specified"); return 1; } + userId = translateUserId(userId, true /*allowAll*/, "runInstallExisting"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } int installReason = PackageManager.INSTALL_REASON_UNKNOWN; try { @@ -1945,6 +1957,10 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: no package or component specified"); return 1; } + userId = translateUserId(userId, true /*allowAll*/, "runSetEnabledSetting"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } ComponentName cn = ComponentName.unflattenFromString(pkg); if (cn == null) { mInterface.setApplicationEnabledSetting(pkg, state, 0, userId, @@ -1974,6 +1990,10 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: no package or component specified"); return 1; } + userId = translateUserId(userId, true /*allowAll*/, "runSetHiddenSetting"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } mInterface.setApplicationHiddenSettingAsUser(pkg, state, userId); getOutPrintWriter().println("Package " + pkg + " new hidden state: " + mInterface.getApplicationHiddenSettingAsUser(pkg, userId)); @@ -2043,6 +2063,10 @@ class PackageManagerShellCommand extends ShellCommand { info = null; } try { + userId = translateUserId(userId, true /*allowAll*/, "runSuspend"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } mInterface.setPackagesSuspendedAsUser(new String[]{packageName}, suspendedState, appExtras, launcherExtras, info, callingPackage, userId); pw.println("Package " + packageName + " new suspended state: " @@ -2074,7 +2098,7 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: no permission specified"); return 1; } - + userId = translateUserId(userId, true /*allowAll*/, "runGrantRevokePermission"); if (grant) { mPermissionManager.grantRuntimePermission(pkg, perm, userId); } else { @@ -2262,6 +2286,10 @@ class PackageManagerShellCommand extends ShellCommand { return 1; } + userId = translateUserId(userId, true /*allowAll*/, "runSetAppLink"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } final PackageInfo info = mInterface.getPackageInfo(pkg, 0, userId); if (info == null) { getErrPrintWriter().println("Error: package " + pkg + " not found."); @@ -2302,6 +2330,10 @@ class PackageManagerShellCommand extends ShellCommand { return 1; } + userId = translateUserId(userId, true /*allowAll*/, "runGetAppLink"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } final PackageInfo info = mInterface.getPackageInfo(pkg, 0, userId); if (info == null) { getErrPrintWriter().println("Error: package " + pkg + " not found."); @@ -2666,8 +2698,7 @@ class PackageManagerShellCommand extends ShellCommand { } pkgName = componentName.getPackageName(); } - - + userId = translateUserId(userId, true /*allowAll*/, "runInstallCreate"); final CompletableFuture<Boolean> future = new CompletableFuture<>(); final RemoteCallback callback = new RemoteCallback(res -> future.complete(res != null)); try { @@ -2763,8 +2794,10 @@ class PackageManagerShellCommand extends ShellCommand { } } - userId = translateUserId(userId, false /*allowAll*/, "runSetHarmfulAppWarning"); - + userId = translateUserId(userId, true /*allowAll*/, "runSetHarmfulAppWarning"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } final String packageName = getNextArgRequired(); final String warning = getNextArg(); @@ -2786,8 +2819,10 @@ class PackageManagerShellCommand extends ShellCommand { } } - userId = translateUserId(userId, false /*allowAll*/, "runGetHarmfulAppWarning"); - + userId = translateUserId(userId, true /*allowAll*/, "runGetHarmfulAppWarning"); + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + } final String packageName = getNextArgRequired(); final CharSequence warning = mInterface.getHarmfulAppWarning(packageName, userId); if (!TextUtils.isEmpty(warning)) { @@ -2824,7 +2859,7 @@ class PackageManagerShellCommand extends ShellCommand { private int doCreateSession(SessionParams params, String installerPackageName, int userId) throws RemoteException { - userId = translateUserId(userId, true /*allowAll*/, "runInstallCreate"); + userId = translateUserId(userId, true /*allowAll*/, "doCreateSession"); if (userId == UserHandle.USER_ALL) { userId = UserHandle.USER_SYSTEM; params.installFlags |= PackageManager.INSTALL_ALL_USERS; @@ -3115,13 +3150,13 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" dump PACKAGE"); pw.println(" Print various system state associated with the given PACKAGE."); pw.println(""); - pw.println(" list features"); - pw.println(" Prints all features of the system."); - pw.println(""); pw.println(" has-feature FEATURE_NAME [version]"); pw.println(" Prints true and returns exit status 0 when system has a FEATURE_NAME,"); pw.println(" otherwise prints false and returns exit status 1"); pw.println(""); + pw.println(" list features"); + pw.println(" Prints all features of the system."); + pw.println(""); pw.println(" list instrumentation [-f] [TARGET-PACKAGE]"); pw.println(" Prints all test packages; optionally only those targeting TARGET-PACKAGE"); pw.println(" Options:"); @@ -3161,11 +3196,14 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" -u: list only the permissions users will see"); pw.println(""); pw.println(" list staged-sessions [--only-ready] [--only-sessionid] [--only-parent]"); - pw.println(" Displays list of all staged sessions on device."); + pw.println(" Prints all staged sessions."); pw.println(" --only-ready: show only staged sessions that are ready"); pw.println(" --only-sessionid: show only sessionId of each session"); pw.println(" --only-parent: hide all children sessions"); pw.println(""); + pw.println(" list users"); + pw.println(" Prints all users."); + pw.println(""); pw.println(" resolve-activity [--brief] [--components] [--query-flags FLAGS]"); pw.println(" [--user USER_ID] INTENT"); pw.println(" Prints the activity that resolves to the given INTENT."); @@ -3186,7 +3224,7 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" [-p INHERIT_PACKAGE] [--install-location 0/1/2]"); pw.println(" [--install-reason 0/1/2/3/4] [--originating-uri URI]"); pw.println(" [--referrer URI] [--abi ABI_NAME] [--force-sdk]"); - pw.println(" [--preload] [--instantapp] [--full] [--dont-kill]"); + pw.println(" [--preload] [--instant] [--full] [--dont-kill]"); pw.println(" [--enable-rollback]"); pw.println(" [--force-uuid internal|UUID] [--pkg PACKAGE] [-S BYTES]"); pw.println(" [--apex] [--wait TIMEOUT]"); @@ -3209,7 +3247,7 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" --referrer: set URI that instigated the install of the app"); pw.println(" --pkg: specify expected package name of app being installed"); pw.println(" --abi: override the default ABI of the platform"); - pw.println(" --instantapp: cause the app to be installed as an ephemeral install app"); + pw.println(" --instant: cause the app to be installed as an ephemeral install app"); pw.println(" --full: cause the app to be installed as a non-ephemeral full app"); pw.println(" --install-location: force the install location:"); pw.println(" 0=auto, 1=internal only, 2=prefer external"); @@ -3222,11 +3260,20 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" for pre-reboot verification to complete. If TIMEOUT is not"); pw.println(" specified it will wait for " + DEFAULT_WAIT_MS + " milliseconds."); pw.println(""); + pw.println(" install-existing [--user USER_ID|all|current]"); + pw.println(" [--instant] [--full] [--wait] [--restrict-permissions] PACKAGE"); + pw.println(" Installs an existing application for a new user. Options are:"); + pw.println(" --user: install for the given user."); + pw.println(" --instant: install as an instant app"); + pw.println(" --full: install as a full app"); + pw.println(" --wait: wait until the package is installed"); + pw.println(" --restrict-permissions: don't whitelist restricted permissions"); + pw.println(""); pw.println(" install-create [-lrtsfdg] [-i PACKAGE] [--user USER_ID|all|current]"); pw.println(" [-p INHERIT_PACKAGE] [--install-location 0/1/2]"); pw.println(" [--install-reason 0/1/2/3/4] [--originating-uri URI]"); pw.println(" [--referrer URI] [--abi ABI_NAME] [--force-sdk]"); - pw.println(" [--preload] [--instantapp] [--full] [--dont-kill]"); + pw.println(" [--preload] [--instant] [--full] [--dont-kill]"); pw.println(" [--force-uuid internal|UUID] [--pkg PACKAGE] [--apex] [-S BYTES]"); pw.println(" [--multi-package] [--staged]"); pw.println(" Like \"install\", but starts an install session. Use \"install-write\""); diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 1873a4ec98d9..4349ea75809c 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -4014,8 +4014,9 @@ public final class Settings { } } - void createNewUserLI(@NonNull PackageManagerService service, - @NonNull Installer installer, int userHandle, String[] disallowedPackages) { + void createNewUserLI(@NonNull PackageManagerService service, @NonNull Installer installer, + @UserIdInt int userHandle, @Nullable Set<String> installablePackages, + String[] disallowedPackages) { final TimingsTraceAndSlog t = new TimingsTraceAndSlog(TAG + "Timing", Trace.TRACE_TAG_PACKAGE_MANAGER); t.traceBegin("createNewUser-" + userHandle); @@ -4025,6 +4026,7 @@ public final class Settings { String[] seinfos; int[] targetSdkVersions; int packagesCount; + final boolean skipPackageWhitelist = installablePackages == null; synchronized (mLock) { Collection<PackageSetting> packages = mPackages.values(); packagesCount = packages.size(); @@ -4040,6 +4042,7 @@ public final class Settings { continue; } final boolean shouldInstall = ps.isSystem() && + (skipPackageWhitelist || installablePackages.contains(ps.name)) && !ArrayUtils.contains(disallowedPackages, ps.name) && !ps.pkg.applicationInfo.hiddenUntilInstalled; // Only system apps are initially installed. diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 9371c4473bb3..5f8670809bfb 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -250,6 +250,9 @@ public class UserManagerService extends IUserManager.Stub { private static final IBinder mUserRestriconToken = new Binder(); + /** Installs system packages based on user-type. */ + private final UserSystemPackageInstaller mSystemPackageInstaller; + /** * Internal non-parcelable wrapper for UserInfo that is not exposed to other system apps. */ @@ -550,6 +553,7 @@ public class UserManagerService extends IUserManager.Stub { readUserListLP(); sInstance = this; } + mSystemPackageInstaller = new UserSystemPackageInstaller(this); mLocalService = new LocalService(); LocalServices.addService(UserManagerInternal.class, mLocalService); mLockPatternUtils = new LockPatternUtils(mContext); @@ -2842,8 +2846,10 @@ public class UserManagerService extends IUserManager.Stub { StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE); t.traceEnd(); + final Set<String> installablePackages = + mSystemPackageInstaller.getInstallablePackagesForUserType(flags); t.traceBegin("PM.createNewUser"); - mPm.createNewUser(userId, disallowedPackages); + mPm.createNewUser(userId, installablePackages, disallowedPackages); t.traceEnd(); userInfo.partial = false; @@ -2877,6 +2883,11 @@ public class UserManagerService extends IUserManager.Stub { return userInfo; } + /** 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); + } + @VisibleForTesting UserData putUserInfo(UserInfo userInfo) { final UserData userData = new UserData(); @@ -3863,6 +3874,10 @@ public class UserManagerService extends IUserManager.Stub { pw.println(" Is split-system user: " + UserManager.isSplitSystemUser()); pw.println(" Is headless-system mode: " + UserManager.isHeadlessSystemUserMode()); pw.println(" User version: " + mUserVersion); + + // Dump package whitelist + pw.println(); + mSystemPackageInstaller.dump(pw); } private static void dumpTimeAgo(PrintWriter pw, StringBuilder sb, long nowTime, long time) { diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java new file mode 100644 index 000000000000..036d1e807f97 --- /dev/null +++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java @@ -0,0 +1,459 @@ +/* + * 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.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.UserIdInt; +import android.content.pm.PackageManagerInternal; +import android.content.pm.PackageParser; +import android.content.pm.UserInfo; +import android.content.res.Resources; +import android.os.SystemProperties; +import android.os.UserHandle; +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.Slog; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.server.LocalServices; +import com.android.server.SystemConfig; + +import java.io.PrintWriter; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.Set; + +/** + * Responsible for un/installing system packages based on user type. + * + * <p>Uses the SystemConfig's install-in-user-type whitelist; + * see {@link SystemConfig#getAndClearPackageToUserTypeWhitelist} and + * {@link SystemConfig#getAndClearPackageToUserTypeBlacklist}. + * + * <p>If {@link #isEnforceMode()} is false, then all system packages are always installed for all + * users. The following applies when it is true. + * + * Any package can be in one of three states in the SystemConfig whitelist + * <ol> + * <li>Explicitly blacklisted for a particular user type</li> + * <li>Explicitly whitelisted for a particular user type</li> + * <li>Not mentioned at all, for any user type (neither whitelisted nor blacklisted)</li> + * </ol> + * Blacklisting always takes precedence - if a package is blacklisted for a particular user, + * it won't be installed on that type of user (even if it is also whitelisted for that user). + * Next comes whitelisting - if it is whitelisted for a particular user, it will be installed on + * that type of user (as long as it isn't blacklisted). + * Finally, if the package is not mentioned at all (i.e. neither whitelisted nor blacklisted for + * any user types) in the SystemConfig 'install-in-user-type' lists + * then: + * <ul> + * <li>If {@link #isImplicitWhitelistMode()}, the package is implicitly treated as whitelisted + * for all users</li> + * <li>Otherwise, the package is implicitly treated as blacklisted for all non-SYSTEM users</li> + * <li>Either way, for {@link UserHandle#USER_SYSTEM}, the package will be implicitly + * whitelisted so that it can be used for local development purposes.</li> + * </ul> + */ +class UserSystemPackageInstaller { + private static final String TAG = "UserManagerService"; + + /** + * System Property whether to only install system packages on a user if they're whitelisted for + * that user type. These are flags and can be freely combined. + * <ul> + * <li> 0 (0b000) - disable whitelist (install all system packages; no logging)</li> + * <li> 1 (0b001) - enforce (only install system packages if they are whitelisted)</li> + * <li> 2 (0b010) - log (log when a non-whitelisted package is run)</li> + * <li> 4 (0b100) - implicitly whitelist any package not mentioned in the whitelist</li> + * <li>-1 - use device default (as defined in res/res/values/config.xml)</li> + * </ul> + * Note: This list must be kept current with config_userTypePackageWhitelistMode in + * frameworks/base/core/res/res/values/config.xml + */ + static final String PACKAGE_WHITELIST_MODE_PROP = "persist.debug.user.package_whitelist_mode"; + static final int USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE = 0; + static final int USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE = 0b001; + static final int USER_TYPE_PACKAGE_WHITELIST_MODE_LOG = 0b010; + static final int USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST = 0b100; + static final int USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT = -1; + + @IntDef(flag = true, prefix = "USER_TYPE_PACKAGE_WHITELIST_MODE_", value = { + USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE, + USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE, + USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE, + USER_TYPE_PACKAGE_WHITELIST_MODE_LOG, + USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface PackageWhitelistMode {} + + /** + * Maps system package manifest names to the user flags on which they should be initially + * installed. + * <p>Packages that are whitelisted, but then blacklisted so that they aren't to be installed on + * any user, are purposefully still present in this list. + */ + private final ArrayMap<String, Integer> mWhitelitsedPackagesForUserTypes; + + private final UserManagerService mUm; + + UserSystemPackageInstaller(UserManagerService ums) { + mUm = ums; + mWhitelitsedPackagesForUserTypes = + determineWhitelistedPackagesForUserTypes(SystemConfig.getInstance()); + } + + /** Constructor for testing purposes. */ + @VisibleForTesting + UserSystemPackageInstaller(UserManagerService ums, ArrayMap<String, Integer> whitelist) { + mUm = ums; + mWhitelitsedPackagesForUserTypes = whitelist; + } + + /** + * During OTAs and first boot, install/uninstall all system packages for all users based on the + * user's UserInfo flags and the SystemConfig whitelist. + * We do NOT uninstall packages during an OTA though. + * + * This is responsible for enforcing the whitelist for pre-existing users (i.e. USER_SYSTEM); + * enforcement for new users is done when they are created in UserManagerService.createUser(). + */ + boolean installWhitelistedSystemPackages(boolean isFirstBoot, boolean isUpgrade) { + final int mode = getWhitelistMode(); + checkWhitelistedSystemPackages(mode); + if (!isUpgrade && !isFirstBoot) { + return false; + } + Slog.i(TAG, "Reviewing whitelisted packages due to " + + (isFirstBoot ? "[firstBoot]" : "") + (isUpgrade ? "[upgrade]" : "")); + final PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); + // Install/uninstall system packages per user. + for (int userId : mUm.getUserIds()) { + final Set<String> userWhitelist = getInstallablePackagesForUserId(userId); + pmInt.forEachPackage(pkg -> { + if (!pkg.isSystem()) { + return; + } + final boolean install = + (userWhitelist == null || userWhitelist.contains(pkg.packageName)) + && !pkg.applicationInfo.hiddenUntilInstalled; + if (isUpgrade && !isFirstBoot && !install) { + return; // To be careful, we don’t uninstall apps during OTAs + } + final boolean changed = pmInt.setInstalled(pkg, userId, install); + if (changed) { + Slog.i(TAG, (install ? "Installed " : "Uninstalled ") + + pkg.packageName + " for user " + userId); + } + }); + } + return true; + } + + /** + * Checks whether the system packages and the mWhitelistedPackagesForUserTypes whitelist are + * in 1-to-1 correspondence. + */ + private void checkWhitelistedSystemPackages(@PackageWhitelistMode int mode) { + if (!isLogMode(mode) && !isEnforceMode(mode)) { + return; + } + Slog.v(TAG, "Checking that all system packages are whitelisted."); + final Set<String> allWhitelistedPackages = getWhitelistedSystemPackages(); + PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); + + // Check whether all whitelisted packages are indeed on the system. + for (String pkgName : allWhitelistedPackages) { + PackageParser.Package pkg = pmInt.getPackage(pkgName); + if (pkg == null) { + Slog.w(TAG, pkgName + " is whitelisted but not present."); + } else if (!pkg.isSystem()) { + Slog.w(TAG, pkgName + " is whitelisted and present but not a system package."); + } + } + + // Check whether all system packages are indeed whitelisted. + if (isImplicitWhitelistMode(mode) && !isLogMode(mode)) { + return; + } + final boolean doWtf = isEnforceMode(mode); + pmInt.forEachPackage(pkg -> { + if (pkg.isSystem() && !allWhitelistedPackages.contains(pkg.manifestPackageName)) { + final String msg = "System package " + pkg.manifestPackageName + + " is not whitelisted using 'install-in-user-type' in SystemConfig " + + "for any user types!"; + if (doWtf) { + Slog.wtf(TAG, msg); + } else { + Slog.e(TAG, msg); + } + } + }); + } + + /** Whether to only install system packages in new users for which they are whitelisted. */ + boolean isEnforceMode() { + return isEnforceMode(getWhitelistMode()); + } + + /** + * Whether to log a warning concerning potential problems with the user-type package whitelist. + */ + boolean isLogMode() { + return isLogMode(getWhitelistMode()); + } + + /** + * Whether to treat all packages that are not mentioned at all in the whitelist to be implicitly + * whitelisted for all users. + */ + boolean isImplicitWhitelistMode() { + return isImplicitWhitelistMode(getWhitelistMode()); + } + + /** See {@link #isEnforceMode()}. */ + private static boolean isEnforceMode(int whitelistMode) { + return (whitelistMode & USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE) != 0; + } + + /** See {@link #isLogMode()}. */ + private static boolean isLogMode(int whitelistMode) { + return (whitelistMode & USER_TYPE_PACKAGE_WHITELIST_MODE_LOG) != 0; + } + + /** See {@link #isImplicitWhitelistMode()}. */ + private static boolean isImplicitWhitelistMode(int whitelistMode) { + return (whitelistMode & USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST) != 0; + } + + /** Gets the PackageWhitelistMode for use of {@link #mWhitelitsedPackagesForUserTypes}. */ + private @PackageWhitelistMode int getWhitelistMode() { + final int runtimeMode = SystemProperties.getInt( + PACKAGE_WHITELIST_MODE_PROP, USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT); + if (runtimeMode != USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT) { + return runtimeMode; + } + return Resources.getSystem() + .getInteger(com.android.internal.R.integer.config_userTypePackageWhitelistMode); + } + + /** + * Gets the system packages names that should be installed on the given user. + * See {@link #getInstallablePackagesForUserType(int)}. + */ + private @Nullable Set<String> getInstallablePackagesForUserId(@UserIdInt int userId) { + return getInstallablePackagesForUserType(mUm.getUserInfo(userId).flags); + } + + /** + * Gets the system package names that should be installed on a user with the given flags, as + * determined by SystemConfig, the whitelist mode, and the apps actually on the device. + * Names are the {@link PackageParser.Package#packageName}, not necessarily the manifest names. + * + * Returns null if all system packages should be installed (due enforce-mode being off). + */ + @Nullable Set<String> getInstallablePackagesForUserType(int flags) { + final int mode = getWhitelistMode(); + if (!isEnforceMode(mode)) { + return null; + } + final boolean isSystemUser = (flags & UserInfo.FLAG_SYSTEM) != 0; + final boolean isImplicitWhitelistMode = isImplicitWhitelistMode(mode); + final Set<String> whitelistedPackages = getWhitelistedPackagesForUserType(flags); + + final Set<String> installPackages = new ArraySet<>(); + final PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); + pmInt.forEachPackage(pkg -> { + if (!pkg.isSystem()) { + return; + } + if (shouldInstallPackage(pkg, mWhitelitsedPackagesForUserTypes, + whitelistedPackages, isImplicitWhitelistMode, isSystemUser)) { + // Although the whitelist uses manifest names, this function returns packageNames. + installPackages.add(pkg.packageName); + } + }); + return installPackages; + } + + /** + * Returns whether the given system package should be installed on the given user, based on the + * the given whitelist of system packages. + * + * @param sysPkg the system package. Must be a system package; no verification for this is done. + * @param userTypeWhitelist map of package manifest names to user flags on which they should be + * installed + * @param userWhitelist set of package manifest names that should be installed on this + * particular user. This must be consistent with userTypeWhitelist, but is + * passed in separately to avoid repeatedly calculating it from + * userTypeWhitelist. + * @param isImplicitWhitelistMode whether non-mentioned packages are implicitly whitelisted. + * @param isSystemUser whether the user is USER_SYSTEM (which gets special treatment). + */ + @VisibleForTesting + static boolean shouldInstallPackage(PackageParser.Package sysPkg, + @NonNull ArrayMap<String, Integer> userTypeWhitelist, + @NonNull Set<String> userWhitelist, boolean isImplicitWhitelistMode, + boolean isSystemUser) { + + final String pkgName = sysPkg.manifestPackageName; + boolean install = (isImplicitWhitelistMode && !userTypeWhitelist.containsKey(pkgName)) + || userWhitelist.contains(pkgName); + + // For the purposes of local development, any package that isn't even mentioned in the + // whitelist at all is implicitly treated as whitelisted for the SYSTEM user. + if (!install && isSystemUser && !userTypeWhitelist.containsKey(pkgName)) { + install = true; + Slog.e(TAG, "System package " + pkgName + " is not mentioned " + + "in SystemConfig's 'install-in-user-type' but we are " + + "implicitly treating it as whitelisted for the SYSTEM user."); + } + return install; + } + + /** + * Gets the package manifest names that are whitelisted for a user with the given flags, + * as determined by SystemConfig. + */ + @VisibleForTesting + @NonNull Set<String> getWhitelistedPackagesForUserType(int flags) { + Set<String> installablePkgs = new ArraySet<>(mWhitelitsedPackagesForUserTypes.size()); + for (int i = 0; i < mWhitelitsedPackagesForUserTypes.size(); i++) { + String pkgName = mWhitelitsedPackagesForUserTypes.keyAt(i); + int whitelistedUserTypes = mWhitelitsedPackagesForUserTypes.valueAt(i); + if ((flags & whitelistedUserTypes) != 0) { + installablePkgs.add(pkgName); + } + } + return installablePkgs; + } + + /** + * Set of package manifest names that are included anywhere in the package-to-user-type + * whitelist, as determined by SystemConfig. + * + * Packages that are whitelisted, but then blacklisted so that they aren't to be installed on + * any user, are still present in this list, since that is a valid scenario (e.g. if an OEM + * completely blacklists an AOSP app). + */ + private Set<String> getWhitelistedSystemPackages() { + return mWhitelitsedPackagesForUserTypes.keySet(); + } + + /** + * Returns a map of package manifest names to the user flags on which it is to be installed. + * Also, clears this data from SystemConfig where it was stored inefficiently (and therefore + * should be called exactly once, even if the data isn't useful). + * + * Any system packages not present in this map should not even be on the device at all. + * To enforce this: + * <ul> + * <li>Illegal user types are ignored.</li> + * <li>Packages that never whitelisted at all (even if they are explicitly blacklisted) are + * ignored.</li> + * <li>Packages that are blacklisted whenever they are whitelisted will be stored with the + * flag 0 (since this is a valid scenario, e.g. if an OEM completely blacklists an AOSP + * app).</li> + * </ul> + */ + @VisibleForTesting + static ArrayMap<String, Integer> determineWhitelistedPackagesForUserTypes( + SystemConfig sysConfig) { + + final ArrayMap<String, Set<String>> whitelist = + sysConfig.getAndClearPackageToUserTypeWhitelist(); + // result maps packageName -> userTypes on which the package should be installed. + 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 int flags = getFlagsFromUserTypes(whitelist.valueAt(i)); + if (flags != 0) { + result.put(pkgName, flags); + } + } + // Then, un-whitelist any blacklisted user types. + // TODO(b/141370854): Right now, the blacklist is actually just an 'unwhitelist'. Which + // direction we go depends on how we design user subtypes, which is still + // being designed. For now, unwhitelisting works for current use-cases. + final ArrayMap<String, Set<String>> blacklist = + sysConfig.getAndClearPackageToUserTypeBlacklist(); + for (int i = 0; i < blacklist.size(); i++) { + final String pkgName = blacklist.keyAt(i); + final int nonFlags = getFlagsFromUserTypes(blacklist.valueAt(i)); + final Integer flags = result.get(pkgName); + if (flags != null) { + result.put(pkgName, flags & ~nonFlags); + } + } + // Regardless of the whitelists/blacklists, ensure mandatory packages. + result.put("android", + UserInfo.FLAG_SYSTEM | UserInfo.FLAG_FULL | UserInfo.PROFILE_FLAGS_MASK); + return result; + } + + /** Converts a user types, as used in SystemConfig, to a UserInfo flag. */ + private static int getFlagsFromUserTypes(Iterable<String> userTypes) { + int flags = 0; + for (String type : userTypes) { + switch (type) { + case "GUEST": + flags |= UserInfo.FLAG_GUEST; + break; + case "RESTRICTED": + flags |= UserInfo.FLAG_RESTRICTED; + break; + case "MANAGED_PROFILE": + flags |= UserInfo.FLAG_MANAGED_PROFILE; + break; + case "EPHEMERAL": + flags |= UserInfo.FLAG_EPHEMERAL; + break; + case "DEMO": + flags |= UserInfo.FLAG_DEMO; + break; + case "FULL": + flags |= UserInfo.FLAG_FULL; + break; + case "SYSTEM": + flags |= UserInfo.FLAG_SYSTEM; + break; + case "PROFILE": + flags |= UserInfo.PROFILE_FLAGS_MASK; + break; + default: + Slog.w(TAG, "SystemConfig contained an invalid user type: " + type); + break; + // Other UserInfo flags are forbidden. + // In particular, FLAG_INITIALIZED, FLAG_DISABLED, FLAG_QUIET_MODE are inapplicable. + // The following are invalid now, but are reconsiderable: FLAG_PRIMARY, FLAG_ADMIN. + } + } + return flags; + } + + void dump(PrintWriter pw) { + for (int i = 0; i < mWhitelitsedPackagesForUserTypes.size(); i++) { + final String pkgName = mWhitelitsedPackagesForUserTypes.keyAt(i); + final String whitelistedUserTypes = + UserInfo.flagsToString(mWhitelitsedPackagesForUserTypes.valueAt(i)); + pw.println(" " + pkgName + ": " + whitelistedUserTypes); + } + } +} diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index b831374cec45..c491da047927 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -1697,10 +1697,11 @@ public class PermissionManagerService extends IPermissionManager.Stub { if (mPackageManagerInt.getInstantAppPackageName(callingUid) != null) { return null; } + DefaultBrowserProvider provider; synchronized (mLock) { - return mDefaultBrowserProvider == null - ? null : mDefaultBrowserProvider.getDefaultBrowser(userId); + provider = mDefaultBrowserProvider; } + return provider != null ? provider.getDefaultBrowser(userId) : null; } @Override @@ -1716,23 +1717,27 @@ public class PermissionManagerService extends IPermissionManager.Stub { private boolean setDefaultBrowserInternal(String packageName, boolean async, boolean doGrant, int userId) { + if (userId == UserHandle.USER_ALL) { + return false; + } + DefaultBrowserProvider provider; synchronized (mLock) { - if (userId == UserHandle.USER_ALL) { - return false; - } - if (mDefaultBrowserProvider == null) { + provider = mDefaultBrowserProvider; + } + if (provider == null) { + return false; + } + if (async) { + provider.setDefaultBrowserAsync(packageName, userId); + } else { + if (!provider.setDefaultBrowser(packageName, userId)) { return false; } - if (async) { - mDefaultBrowserProvider.setDefaultBrowserAsync(packageName, userId); - } else { - if (!mDefaultBrowserProvider.setDefaultBrowser(packageName, userId)) { - return false; - } - } - if (doGrant && packageName != null) { - mDefaultPermissionGrantPolicy - .grantDefaultPermissionsToDefaultBrowser(packageName, userId); + } + if (doGrant && packageName != null) { + synchronized (mLock) { + mDefaultPermissionGrantPolicy.grantDefaultPermissionsToDefaultBrowser(packageName, + userId); } } return true; @@ -4334,15 +4339,17 @@ public class PermissionManagerService extends IPermissionManager.Stub { @Override public void setDefaultHome(String packageName, int userId, Consumer<Boolean> callback) { + if (userId == UserHandle.USER_ALL) { + return; + } + DefaultHomeProvider provider; synchronized (mLock) { - if (userId == UserHandle.USER_ALL) { - return; - } - if (mDefaultHomeProvider == null) { - return; - } - mDefaultHomeProvider.setDefaultHomeAsync(packageName, userId, callback); + provider = mDefaultHomeProvider; + } + if (provider == null) { + return; } + provider.setDefaultHomeAsync(packageName, userId, callback); } @Override @@ -4403,26 +4410,29 @@ public class PermissionManagerService extends IPermissionManager.Stub { @Override public String getDefaultBrowser(int userId) { + DefaultBrowserProvider provider; synchronized (mLock) { - return mDefaultBrowserProvider == null - ? null : mDefaultBrowserProvider.getDefaultBrowser(userId); + provider = mDefaultBrowserProvider; } + return provider != null ? provider.getDefaultBrowser(userId) : null; } @Override public String getDefaultDialer(int userId) { + DefaultDialerProvider provider; synchronized (mLock) { - return mDefaultDialerProvider == null - ? null : mDefaultDialerProvider.getDefaultDialer(userId); + provider = mDefaultDialerProvider; } + return provider != null ? provider.getDefaultDialer(userId) : null; } @Override public String getDefaultHome(int userId) { + DefaultHomeProvider provider; synchronized (mLock) { - return mDefaultHomeProvider == null - ? null : mDefaultHomeProvider.getDefaultHome(userId); + provider = mDefaultHomeProvider; } + return provider != null ? provider.getDefaultHome(userId) : null; } @Override diff --git a/services/core/java/com/android/server/protolog/ProtoLogImpl.java b/services/core/java/com/android/server/protolog/ProtoLogImpl.java index 239a4259438b..20bab55f39b1 100644 --- a/services/core/java/com/android/server/protolog/ProtoLogImpl.java +++ b/services/core/java/com/android/server/protolog/ProtoLogImpl.java @@ -110,6 +110,12 @@ public class ProtoLogImpl { getSingleInstance().log(LogLevel.WTF, group, messageHash, paramsMask, messageString, args); } + /** Returns true iff logging is enabled for the given {@code IProtoLogGroup}. */ + public static boolean isEnabled(IProtoLogGroup group) { + return group.isLogToProto() + || (group.isLogToProto() && getSingleInstance().isProtoEnabled()); + } + private static final int BUFFER_CAPACITY = 1024 * 1024; private static final String LOG_FILENAME = "/data/misc/wmtrace/wm_log.pb"; private static final String VIEWER_CONFIG_FILENAME = "/system/etc/protolog.conf.json.gz"; @@ -222,48 +228,50 @@ public class ProtoLogImpl { os.write(MESSAGE_HASH, messageHash); os.write(ELAPSED_REALTIME_NANOS, SystemClock.elapsedRealtimeNanos()); - int argIndex = 0; - ArrayList<Long> longParams = new ArrayList<>(); - ArrayList<Double> doubleParams = new ArrayList<>(); - ArrayList<Boolean> booleanParams = new ArrayList<>(); - for (Object o : args) { - int type = LogDataType.bitmaskToLogDataType(paramsMask, argIndex); - try { - switch (type) { - case LogDataType.STRING: - os.write(STR_PARAMS, o.toString()); - break; - case LogDataType.LONG: - longParams.add(((Number) o).longValue()); - break; - case LogDataType.DOUBLE: - doubleParams.add(((Number) o).doubleValue()); - break; - case LogDataType.BOOLEAN: - booleanParams.add((boolean) o); - break; + if (args != null) { + int argIndex = 0; + ArrayList<Long> longParams = new ArrayList<>(); + ArrayList<Double> doubleParams = new ArrayList<>(); + ArrayList<Boolean> booleanParams = new ArrayList<>(); + for (Object o : args) { + int type = LogDataType.bitmaskToLogDataType(paramsMask, argIndex); + try { + switch (type) { + case LogDataType.STRING: + os.write(STR_PARAMS, o.toString()); + break; + case LogDataType.LONG: + longParams.add(((Number) o).longValue()); + break; + case LogDataType.DOUBLE: + doubleParams.add(((Number) o).doubleValue()); + break; + case LogDataType.BOOLEAN: + booleanParams.add((boolean) o); + break; + } + } catch (ClassCastException ex) { + // Should not happen unless there is an error in the ProtoLogTool. + os.write(STR_PARAMS, "(INVALID PARAMS_MASK) " + o.toString()); + Slog.e(TAG, "Invalid ProtoLog paramsMask", ex); } - } catch (ClassCastException ex) { - // Should not happen unless there is an error in the ProtoLogTool. - os.write(STR_PARAMS, "(INVALID PARAMS_MASK) " + o.toString()); - Slog.e(TAG, "Invalid ProtoLog paramsMask", ex); + argIndex++; } - argIndex++; - } - if (longParams.size() > 0) { - os.writePackedSInt64(SINT64_PARAMS, - longParams.stream().mapToLong(i -> i).toArray()); - } - if (doubleParams.size() > 0) { - os.writePackedDouble(DOUBLE_PARAMS, - doubleParams.stream().mapToDouble(i -> i).toArray()); - } - if (booleanParams.size() > 0) { - boolean[] arr = new boolean[booleanParams.size()]; - for (int i = 0; i < booleanParams.size(); i++) { - arr[i] = booleanParams.get(i); + if (longParams.size() > 0) { + os.writePackedSInt64(SINT64_PARAMS, + longParams.stream().mapToLong(i -> i).toArray()); + } + if (doubleParams.size() > 0) { + os.writePackedDouble(DOUBLE_PARAMS, + doubleParams.stream().mapToDouble(i -> i).toArray()); + } + if (booleanParams.size() > 0) { + boolean[] arr = new boolean[booleanParams.size()]; + for (int i = 0; i < booleanParams.size(); i++) { + arr[i] = booleanParams.get(i); + } + os.writePackedBool(BOOLEAN_PARAMS, arr); } - os.writePackedBool(BOOLEAN_PARAMS, arr); } os.end(token); mBuffer.add(os); diff --git a/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java b/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java index d49b9589cb15..2b25b8921540 100644 --- a/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java +++ b/services/core/java/com/android/server/stats/ProcfsMemoryUtil.java @@ -15,6 +15,7 @@ */ package com.android.server.stats; +import android.annotation.Nullable; import android.os.FileUtils; import android.util.Slog; @@ -22,61 +23,53 @@ import com.android.internal.annotations.VisibleForTesting; import java.io.File; import java.io.IOException; -import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; final class ProcfsMemoryUtil { private static final String TAG = "ProcfsMemoryUtil"; - /** Path to procfs status file: /proc/pid/status. */ - private static final String STATUS_FILE_FMT = "/proc/%d/status"; - - private static final Pattern RSS_HIGH_WATER_MARK_IN_KILOBYTES = - Pattern.compile("VmHWM:\\s*(\\d+)\\s*kB"); - private static final Pattern RSS_IN_KILOBYTES = - Pattern.compile("VmRSS:\\s*(\\d+)\\s*kB"); - private static final Pattern ANON_RSS_IN_KILOBYTES = - Pattern.compile("RssAnon:\\s*(\\d+)\\s*kB"); - private static final Pattern SWAP_IN_KILOBYTES = - Pattern.compile("VmSwap:\\s*(\\d+)\\s*kB"); + 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 ProcfsMemoryUtil() {} /** - * Reads RSS high-water mark of a process from procfs. Returns value of the VmHWM field in - * /proc/PID/status in kilobytes or 0 if not available. - */ - static int readRssHighWaterMarkFromProcfs(int pid) { - final String statusPath = String.format(Locale.US, STATUS_FILE_FMT, pid); - return parseVmHWMFromStatus(readFile(statusPath)); - } - - /** - * Parses RSS high-water mark out from the contents of the /proc/pid/status file in procfs. The - * returned value is in kilobytes. - */ - @VisibleForTesting - static int parseVmHWMFromStatus(String contents) { - return tryParseInt(contents, RSS_HIGH_WATER_MARK_IN_KILOBYTES); - } - - /** - * Reads memory stat of a process from procfs. Returns values of the VmRss, AnonRSS, VmSwap - * fields in /proc/pid/status in kilobytes or 0 if not available. + * Reads memory stats of a process from procfs. Returns values of the VmHWM, VmRss, AnonRSS, + * VmSwap fields in /proc/pid/status in kilobytes or null if not available. */ + @Nullable static MemorySnapshot readMemorySnapshotFromProcfs(int pid) { - final String statusPath = String.format(Locale.US, STATUS_FILE_FMT, pid); - return parseMemorySnapshotFromStatus(readFile(statusPath)); + return parseMemorySnapshotFromStatus(readFile("/proc/" + pid + "/status")); } @VisibleForTesting + @Nullable static MemorySnapshot parseMemorySnapshotFromStatus(String contents) { - final MemorySnapshot snapshot = new MemorySnapshot(); - snapshot.rssInKilobytes = tryParseInt(contents, RSS_IN_KILOBYTES); - snapshot.anonRssInKilobytes = tryParseInt(contents, ANON_RSS_IN_KILOBYTES); - snapshot.swapInKilobytes = tryParseInt(contents, SWAP_IN_KILOBYTES); - return snapshot; + if (contents.isEmpty()) { + 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; } private static String readFile(String path) { @@ -88,26 +81,11 @@ final class ProcfsMemoryUtil { } } - private static int tryParseInt(String contents, Pattern pattern) { - if (contents.isEmpty()) { - return 0; - } - final Matcher matcher = pattern.matcher(contents); - try { - return matcher.find() ? Integer.parseInt(matcher.group(1)) : 0; - } catch (NumberFormatException e) { - Slog.e(TAG, "Failed to parse value", e); - return 0; - } - } - static final class MemorySnapshot { + public int uid; + public int rssHighWaterMarkInKilobytes; public int rssInKilobytes; public int anonRssInKilobytes; public int swapInKilobytes; - - boolean isEmpty() { - return (anonRssInKilobytes + swapInKilobytes) == 0; - } } } diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java index e1a48ed3b550..67830a930caf 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/services/core/java/com/android/server/stats/StatsCompanionService.java @@ -30,7 +30,6 @@ import static com.android.server.am.MemoryStatUtil.readMemoryStatFromProcfs; import static com.android.server.stats.IonMemoryUtil.readProcessSystemIonHeapSizesFromDebugfs; import static com.android.server.stats.IonMemoryUtil.readSystemIonHeapSizeFromDebugfs; import static com.android.server.stats.ProcfsMemoryUtil.readMemorySnapshotFromProcfs; -import static com.android.server.stats.ProcfsMemoryUtil.readRssHighWaterMarkFromProcfs; import android.annotation.NonNull; import android.annotation.Nullable; @@ -245,6 +244,13 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { "zygote", "zygote64", }; + /** + * Lowest available uid for apps. + * + * <p>Used to quickly discard memory snapshots of the zygote forks from native process + * measurements. + */ + private static final int MIN_APP_UID = 10_000; private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8; @@ -1197,20 +1203,18 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { private void pullNativeProcessMemoryState( int tagId, long elapsedNanos, long wallClockNanos, List<StatsLogEventWrapper> pulledData) { - final List<String> processNames = Arrays.asList(MEMORY_INTERESTING_NATIVE_PROCESSES); int[] pids = getPidsForCommands(MEMORY_INTERESTING_NATIVE_PROCESSES); - for (int i = 0; i < pids.length; i++) { - int pid = pids[i]; + for (int pid : pids) { + String processName = readCmdlineFromProcfs(pid); MemoryStat memoryStat = readMemoryStatFromProcfs(pid); if (memoryStat == null) { continue; } int uid = getUidForPid(pid); - String processName = readCmdlineFromProcfs(pid); - // Sometimes we get here processName that is not included in the whitelist. It comes + // 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 (!processNames.contains(processName)) { + if (isAppUid(uid)) { continue; } StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); @@ -1238,34 +1242,37 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { LocalServices.getService( ActivityManagerInternal.class).getMemoryStateForProcesses(); for (ProcessMemoryState managedProcess : managedProcessList) { - final int rssHighWaterMarkInKilobytes = - readRssHighWaterMarkFromProcfs(managedProcess.pid); - if (rssHighWaterMarkInKilobytes == 0) { + final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(managedProcess.pid); + if (snapshot == null) { continue; } StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); e.writeInt(managedProcess.uid); e.writeString(managedProcess.processName); // RSS high-water mark in bytes. - e.writeLong((long) rssHighWaterMarkInKilobytes * 1024L); - e.writeInt(rssHighWaterMarkInKilobytes); + e.writeLong((long) snapshot.rssHighWaterMarkInKilobytes * 1024L); + e.writeInt(snapshot.rssHighWaterMarkInKilobytes); pulledData.add(e); } int[] pids = getPidsForCommands(MEMORY_INTERESTING_NATIVE_PROCESSES); - for (int i = 0; i < pids.length; i++) { - final int pid = pids[i]; - final int uid = getUidForPid(pid); + for (int pid : pids) { final String processName = readCmdlineFromProcfs(pid); - final int rssHighWaterMarkInKilobytes = readRssHighWaterMarkFromProcfs(pid); - if (rssHighWaterMarkInKilobytes == 0) { + final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid); + if (snapshot == null) { + continue; + } + // 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; } StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); - e.writeInt(uid); + e.writeInt(snapshot.uid); e.writeString(processName); // RSS high-water mark in bytes. - e.writeLong((long) rssHighWaterMarkInKilobytes * 1024L); - e.writeInt(rssHighWaterMarkInKilobytes); + 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. @@ -1279,15 +1286,15 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { LocalServices.getService( ActivityManagerInternal.class).getMemoryStateForProcesses(); for (ProcessMemoryState managedProcess : managedProcessList) { + final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(managedProcess.pid); + if (snapshot == null) { + continue; + } StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); e.writeInt(managedProcess.uid); e.writeString(managedProcess.processName); e.writeInt(managedProcess.pid); e.writeInt(managedProcess.oomScore); - final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(managedProcess.pid); - if (snapshot.isEmpty()) { - continue; - } e.writeInt(snapshot.rssInKilobytes); e.writeInt(snapshot.anonRssInKilobytes); e.writeInt(snapshot.swapInKilobytes); @@ -1296,15 +1303,22 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } int[] pids = getPidsForCommands(MEMORY_INTERESTING_NATIVE_PROCESSES); for (int pid : pids) { - StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); - e.writeInt(getUidForPid(pid)); - e.writeString(readCmdlineFromProcfs(pid)); - e.writeInt(pid); - e.writeInt(-1001); // Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1. + final String processName = readCmdlineFromProcfs(pid); final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid); - if (snapshot.isEmpty()) { + if (snapshot == null) { continue; } + // 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; + } + StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); + e.writeInt(snapshot.uid); + e.writeString(processName); + e.writeInt(pid); + e.writeInt(-1001); // Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1. e.writeInt(snapshot.rssInKilobytes); e.writeInt(snapshot.anonRssInKilobytes); e.writeInt(snapshot.swapInKilobytes); @@ -1313,6 +1327,10 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } } + private static boolean isAppUid(int uid) { + return uid >= MIN_APP_UID; + } + private void pullSystemIonHeapSize( int tagId, long elapsedNanos, long wallClockNanos, List<StatsLogEventWrapper> pulledData) { diff --git a/services/core/java/com/android/server/tv/TvRemoteProviderProxy.java b/services/core/java/com/android/server/tv/TvRemoteProviderProxy.java index f8ffb7c1c0e2..b7bc77dc97ee 100644 --- a/services/core/java/com/android/server/tv/TvRemoteProviderProxy.java +++ b/services/core/java/com/android/server/tv/TvRemoteProviderProxy.java @@ -21,8 +21,6 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.media.tv.ITvRemoteProvider; -import android.media.tv.ITvRemoteServiceInput; -import android.os.Binder; import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; @@ -30,44 +28,33 @@ import android.util.Log; import android.util.Slog; import java.io.PrintWriter; -import java.lang.ref.WeakReference; /** * Maintains a connection to a tv remote provider service. */ final class TvRemoteProviderProxy implements ServiceConnection { - private static final String TAG = "TvRemoteProvProxy"; // max. 23 chars + private static final String TAG = "TvRemoteProviderProxy"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.VERBOSE); - private static final boolean DEBUG_KEY = false; // This should match TvRemoteProvider.ACTION_TV_REMOTE_PROVIDER protected static final String SERVICE_INTERFACE = "com.android.media.tv.remoteprovider.TvRemoteProvider"; private final Context mContext; + private final Object mLock; private final ComponentName mComponentName; private final int mUserId; private final int mUid; - /** - * State guarded by mLock. - * This is the first lock in sequence for an incoming call. - * The second lock is always {@link TvRemoteService#mLock} - * - * There are currently no methods that break this sequence. - */ - private final Object mLock = new Object(); - - private ProviderMethods mProviderMethods; - // Connection state + // State changes happen only in the main thread, hence no lock is needed private boolean mRunning; private boolean mBound; - private Connection mActiveConnection; + private boolean mConnected; - TvRemoteProviderProxy(Context context, ProviderMethods provider, + TvRemoteProviderProxy(Context context, Object lock, ComponentName componentName, int userId, int uid) { mContext = context; - mProviderMethods = provider; + mLock = lock; mComponentName = componentName; mUserId = userId; mUid = uid; @@ -78,7 +65,7 @@ final class TvRemoteProviderProxy implements ServiceConnection { pw.println(prefix + " mUserId=" + mUserId); pw.println(prefix + " mRunning=" + mRunning); pw.println(prefix + " mBound=" + mBound); - pw.println(prefix + " mActiveConnection=" + mActiveConnection); + pw.println(prefix + " mConnected=" + mConnected); } public boolean hasComponentName(String packageName, String className) { @@ -109,11 +96,9 @@ final class TvRemoteProviderProxy implements ServiceConnection { } public void rebindIfDisconnected() { - synchronized (mLock) { - if (mActiveConnection == null && mRunning) { - unbind(); - bind(); - } + if (mRunning && !mConnected) { + unbind(); + bind(); } } @@ -129,7 +114,7 @@ final class TvRemoteProviderProxy implements ServiceConnection { mBound = mContext.bindServiceAsUser(service, this, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, new UserHandle(mUserId)); - if (!mBound && DEBUG) { + if (DEBUG && !mBound) { Slog.d(TAG, this + ": Bind failed"); } } catch (SecurityException ex) { @@ -147,7 +132,6 @@ final class TvRemoteProviderProxy implements ServiceConnection { } mBound = false; - disconnect(); mContext.unbindService(this); } } @@ -158,392 +142,27 @@ final class TvRemoteProviderProxy implements ServiceConnection { Slog.d(TAG, this + ": onServiceConnected()"); } - if (mBound) { - disconnect(); + mConnected = true; - ITvRemoteProvider provider = ITvRemoteProvider.Stub.asInterface(service); - if (provider != null) { - Connection connection = new Connection(provider); - if (connection.register()) { - synchronized (mLock) { - mActiveConnection = connection; - } - if (DEBUG) { - Slog.d(TAG, this + ": Connected successfully."); - } - } else { - if (DEBUG) { - Slog.d(TAG, this + ": Registration failed"); - } - } - } else { - Slog.e(TAG, this + ": Service returned invalid remote-control provider binder"); - } + final ITvRemoteProvider provider = ITvRemoteProvider.Stub.asInterface(service); + if (provider == null) { + Slog.e(TAG, this + ": Invalid binder"); + return; } - } - @Override - public void onServiceDisconnected(ComponentName name) { - if (DEBUG) Slog.d(TAG, this + ": Service disconnected"); - disconnect(); - } - - private void disconnect() { - synchronized (mLock) { - if (mActiveConnection != null) { - mActiveConnection.dispose(); - mActiveConnection = null; - } + try { + provider.setRemoteServiceInputSink(new TvRemoteServiceInput(mLock, provider)); + } catch (RemoteException e) { + Slog.e(TAG, this + ": Failed remote call to setRemoteServiceInputSink"); } } - interface ProviderMethods { - // InputBridge - boolean openInputBridge(TvRemoteProviderProxy provider, IBinder token, String name, - int width, int height, int maxPointers); - - void closeInputBridge(TvRemoteProviderProxy provider, IBinder token); - - void clearInputBridge(TvRemoteProviderProxy provider, IBinder token); - - void sendKeyDown(TvRemoteProviderProxy provider, IBinder token, int keyCode); - - void sendKeyUp(TvRemoteProviderProxy provider, IBinder token, int keyCode); - - void sendPointerDown(TvRemoteProviderProxy provider, IBinder token, int pointerId, int x, - int y); - - void sendPointerUp(TvRemoteProviderProxy provider, IBinder token, int pointerId); - - void sendPointerSync(TvRemoteProviderProxy provider, IBinder token); - } - - private final class Connection { - private final ITvRemoteProvider mTvRemoteProvider; - private final RemoteServiceInputProvider mServiceInputProvider; - - public Connection(ITvRemoteProvider provider) { - mTvRemoteProvider = provider; - mServiceInputProvider = new RemoteServiceInputProvider(this); - } - - public boolean register() { - if (DEBUG) Slog.d(TAG, "Connection::register()"); - try { - mTvRemoteProvider.setRemoteServiceInputSink(mServiceInputProvider); - return true; - } catch (RemoteException ex) { - dispose(); - return false; - } - } - - public void dispose() { - if (DEBUG) Slog.d(TAG, "Connection::dispose()"); - mServiceInputProvider.dispose(); - } - - - public void onInputBridgeConnected(IBinder token) { - if (DEBUG) Slog.d(TAG, this + ": onInputBridgeConnected"); - try { - mTvRemoteProvider.onInputBridgeConnected(token); - } catch (RemoteException ex) { - Slog.e(TAG, "Failed to deliver onInputBridgeConnected. ", ex); - } - } - - void openInputBridge(final IBinder token, final String name, final int width, - final int height, final int maxPointers) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG) { - Slog.d(TAG, this + ": openInputBridge," + - " token=" + token + ", name=" + name); - } - final long idToken = Binder.clearCallingIdentity(); - try { - if (mProviderMethods.openInputBridge(TvRemoteProviderProxy.this, token, - name, width, height, maxPointers)) { - onInputBridgeConnected(token); - } - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "openInputBridge, Invalid connection or incorrect uid: " + Binder - .getCallingUid()); - } - } - } - } - - void closeInputBridge(final IBinder token) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG) { - Slog.d(TAG, this + ": closeInputBridge," + - " token=" + token); - } - final long idToken = Binder.clearCallingIdentity(); - try { - mProviderMethods.closeInputBridge(TvRemoteProviderProxy.this, token); - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "closeInputBridge, Invalid connection or incorrect uid: " + - Binder.getCallingUid()); - } - } - } - } - - void clearInputBridge(final IBinder token) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG) { - Slog.d(TAG, this + ": clearInputBridge," + - " token=" + token); - } - final long idToken = Binder.clearCallingIdentity(); - try { - mProviderMethods.clearInputBridge(TvRemoteProviderProxy.this, token); - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "clearInputBridge, Invalid connection or incorrect uid: " + - Binder.getCallingUid()); - } - } - } - } - - void sendTimestamp(final IBinder token, final long timestamp) { - if (DEBUG) { - Slog.e(TAG, "sendTimestamp is deprecated, please remove all usages of this API."); - } - } - - void sendKeyDown(final IBinder token, final int keyCode) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG_KEY) { - Slog.d(TAG, this + ": sendKeyDown," + - " token=" + token + ", keyCode=" + keyCode); - } - final long idToken = Binder.clearCallingIdentity(); - try { - mProviderMethods.sendKeyDown(TvRemoteProviderProxy.this, token, keyCode); - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "sendKeyDown, Invalid connection or incorrect uid: " + Binder - .getCallingUid()); - } - } - } - } - - void sendKeyUp(final IBinder token, final int keyCode) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG_KEY) { - Slog.d(TAG, this + ": sendKeyUp," + - " token=" + token + ", keyCode=" + keyCode); - } - final long idToken = Binder.clearCallingIdentity(); - try { - mProviderMethods.sendKeyUp(TvRemoteProviderProxy.this, token, keyCode); - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "sendKeyUp, Invalid connection or incorrect uid: " + Binder - .getCallingUid()); - } - } - } - } - - void sendPointerDown(final IBinder token, final int pointerId, final int x, final int y) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG_KEY) { - Slog.d(TAG, this + ": sendPointerDown," + - " token=" + token + ", pointerId=" + pointerId); - } - final long idToken = Binder.clearCallingIdentity(); - try { - mProviderMethods.sendPointerDown(TvRemoteProviderProxy.this, token, - pointerId, x, y); - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "sendPointerDown, Invalid connection or incorrect uid: " + Binder - .getCallingUid()); - } - } - } - } - - void sendPointerUp(final IBinder token, final int pointerId) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG_KEY) { - Slog.d(TAG, this + ": sendPointerUp," + - " token=" + token + ", pointerId=" + pointerId); - } - final long idToken = Binder.clearCallingIdentity(); - try { - mProviderMethods.sendPointerUp(TvRemoteProviderProxy.this, token, - pointerId); - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "sendPointerUp, Invalid connection or incorrect uid: " + Binder - .getCallingUid()); - } - } - } - } - - void sendPointerSync(final IBinder token) { - synchronized (mLock) { - if (mActiveConnection == this && Binder.getCallingUid() == mUid) { - if (DEBUG_KEY) { - Slog.d(TAG, this + ": sendPointerSync," + - " token=" + token); - } - final long idToken = Binder.clearCallingIdentity(); - try { - if (mProviderMethods != null) { - mProviderMethods.sendPointerSync(TvRemoteProviderProxy.this, token); - } - } finally { - Binder.restoreCallingIdentity(idToken); - } - } else { - if (DEBUG) { - Slog.w(TAG, - "sendPointerSync, Invalid connection or incorrect uid: " + Binder - .getCallingUid()); - } - } - } - } - } - - /** - * Receives events from the connected provider. - * <p> - * This inner class is static and only retains a weak reference to the connection - * to prevent the client from being leaked in case the service is holding an - * active reference to the client's callback. - * </p> - */ - private static final class RemoteServiceInputProvider extends ITvRemoteServiceInput.Stub { - private final WeakReference<Connection> mConnectionRef; - - public RemoteServiceInputProvider(Connection connection) { - mConnectionRef = new WeakReference<Connection>(connection); - } - - public void dispose() { - // Terminate the connection. - mConnectionRef.clear(); - } - - @Override - public void openInputBridge(IBinder token, String name, int width, - int height, int maxPointers) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.openInputBridge(token, name, width, height, maxPointers); - } - } - - @Override - public void closeInputBridge(IBinder token) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.closeInputBridge(token); - } - } - - @Override - public void clearInputBridge(IBinder token) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.clearInputBridge(token); - } - } - - @Override - public void sendTimestamp(IBinder token, long timestamp) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.sendTimestamp(token, timestamp); - } - } - - @Override - public void sendKeyDown(IBinder token, int keyCode) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.sendKeyDown(token, keyCode); - } - } - - @Override - public void sendKeyUp(IBinder token, int keyCode) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.sendKeyUp(token, keyCode); - } - } - - @Override - public void sendPointerDown(IBinder token, int pointerId, int x, int y) - throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.sendPointerDown(token, pointerId, x, y); - } - } - - @Override - public void sendPointerUp(IBinder token, int pointerId) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.sendPointerUp(token, pointerId); - } - } + @Override + public void onServiceDisconnected(ComponentName name) { + mConnected = false; - @Override - public void sendPointerSync(IBinder token) throws RemoteException { - Connection connection = mConnectionRef.get(); - if (connection != null) { - connection.sendPointerSync(token); - } + if (DEBUG) { + Slog.d(TAG, this + ": onServiceDisconnected()"); } } } diff --git a/services/core/java/com/android/server/tv/TvRemoteProviderWatcher.java b/services/core/java/com/android/server/tv/TvRemoteProviderWatcher.java index 0d29edd02663..cddcabe80f33 100644 --- a/services/core/java/com/android/server/tv/TvRemoteProviderWatcher.java +++ b/services/core/java/com/android/server/tv/TvRemoteProviderWatcher.java @@ -41,27 +41,27 @@ import java.util.Collections; */ final class TvRemoteProviderWatcher { - private static final String TAG = "TvRemoteProvWatcher"; // max. 23 chars + private static final String TAG = "TvRemoteProviderWatcher"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.VERBOSE); private final Context mContext; - private final TvRemoteProviderProxy.ProviderMethods mProvider; private final Handler mHandler; private final PackageManager mPackageManager; private final ArrayList<TvRemoteProviderProxy> mProviderProxies = new ArrayList<>(); private final int mUserId; private final String mUnbundledServicePackage; + private final Object mLock; private boolean mRunning; - TvRemoteProviderWatcher(Context context, TvRemoteProviderProxy.ProviderMethods provider) { + TvRemoteProviderWatcher(Context context, Object lock) { mContext = context; - mProvider = provider; mHandler = new Handler(true); mUserId = UserHandle.myUserId(); mPackageManager = context.getPackageManager(); mUnbundledServicePackage = context.getString( com.android.internal.R.string.config_tvRemoteServicePackage); + mLock = lock; } public void start() { @@ -116,7 +116,7 @@ final class TvRemoteProviderWatcher { int sourceIndex = findProvider(serviceInfo.packageName, serviceInfo.name); if (sourceIndex < 0) { TvRemoteProviderProxy providerProxy = - new TvRemoteProviderProxy(mContext, mProvider, + new TvRemoteProviderProxy(mContext, mLock, new ComponentName(serviceInfo.packageName, serviceInfo.name), mUserId, serviceInfo.applicationInfo.uid); providerProxy.start(); diff --git a/services/core/java/com/android/server/tv/TvRemoteService.java b/services/core/java/com/android/server/tv/TvRemoteService.java index bee6fb34a899..58946456b940 100644 --- a/services/core/java/com/android/server/tv/TvRemoteService.java +++ b/services/core/java/com/android/server/tv/TvRemoteService.java @@ -17,17 +17,11 @@ package com.android.server.tv; import android.content.Context; -import android.os.IBinder; -import android.os.RemoteException; -import android.util.ArrayMap; import android.util.Slog; import com.android.server.SystemService; import com.android.server.Watchdog; -import java.io.IOException; -import java.util.Map; - /** * TvRemoteService represents a system service that allows a connected * remote control (emote) service to inject white-listed input events @@ -38,27 +32,17 @@ import java.util.Map; public class TvRemoteService extends SystemService implements Watchdog.Monitor { private static final String TAG = "TvRemoteService"; private static final boolean DEBUG = false; - private static final boolean DEBUG_KEYS = false; - - private final TvRemoteProviderWatcher mWatcher; - private Map<IBinder, UinputBridge> mBridgeMap = new ArrayMap(); /** - * State guarded by mLock. - * This is the second lock in sequence for an incoming call. - * The first lock is always {@link TvRemoteProviderProxy#mLock} - * - * There are currently no methods that break this sequence. - * Special note: - * Outgoing call informInputBridgeConnected(), which is called from - * openInputBridgeInternalLocked() uses a handler thereby relinquishing held locks. + * All actions on input bridges are serialized using mLock. + * This is necessary because {@link UInputBridge} is not thread-safe. */ private final Object mLock = new Object(); + private final TvRemoteProviderWatcher mWatcher; public TvRemoteService(Context context) { super(context); - mWatcher = new TvRemoteProviderWatcher(context, - new UserProvider(TvRemoteService.this)); + mWatcher = new TvRemoteProviderWatcher(context, mLock); Watchdog.getInstance().addMonitor(this); } @@ -81,214 +65,4 @@ public class TvRemoteService extends SystemService implements Watchdog.Monitor { mWatcher.start(); // Also schedules the start of all providers. } } - - private boolean openInputBridgeInternalLocked(final IBinder token, - String name, int width, int height, - int maxPointers) { - if (DEBUG) { - Slog.d(TAG, "openInputBridgeInternalLocked(), token: " + token + ", name: " + name + - ", width: " + width + ", height: " + height + ", maxPointers: " + maxPointers); - } - - try { - //Create a new bridge, if one does not exist already - if (mBridgeMap.containsKey(token)) { - if (DEBUG) Slog.d(TAG, "RemoteBridge already exists"); - return true; - } - - UinputBridge inputBridge = new UinputBridge(token, name, width, height, maxPointers); - mBridgeMap.put(token, inputBridge); - - try { - token.linkToDeath(new IBinder.DeathRecipient() { - @Override - public void binderDied() { - synchronized (mLock) { - closeInputBridgeInternalLocked(token); - } - } - }, 0); - } catch (RemoteException e) { - if (DEBUG) Slog.d(TAG, "Token is already dead"); - closeInputBridgeInternalLocked(token); - return false; - } - } catch (IOException ioe) { - Slog.e(TAG, "Cannot create device for " + name); - return false; - } - return true; - } - - private void closeInputBridgeInternalLocked(IBinder token) { - if (DEBUG) { - Slog.d(TAG, "closeInputBridgeInternalLocked(), token: " + token); - } - - // Close an existing RemoteBridge - UinputBridge inputBridge = mBridgeMap.get(token); - if (inputBridge != null) { - inputBridge.close(token); - } - - mBridgeMap.remove(token); - } - - private void clearInputBridgeInternalLocked(IBinder token) { - if (DEBUG) { - Slog.d(TAG, "clearInputBridgeInternalLocked(), token: " + token); - } - - UinputBridge inputBridge = mBridgeMap.get(token); - if (inputBridge != null) { - inputBridge.clear(token); - } - } - - private void sendKeyDownInternalLocked(IBinder token, int keyCode) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendKeyDownInternalLocked(), token: " + token + ", keyCode: " + keyCode); - } - - UinputBridge inputBridge = mBridgeMap.get(token); - if (inputBridge != null) { - inputBridge.sendKeyDown(token, keyCode); - } - } - - private void sendKeyUpInternalLocked(IBinder token, int keyCode) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendKeyUpInternalLocked(), token: " + token + ", keyCode: " + keyCode); - } - - UinputBridge inputBridge = mBridgeMap.get(token); - if (inputBridge != null) { - inputBridge.sendKeyUp(token, keyCode); - } - } - - private void sendPointerDownInternalLocked(IBinder token, int pointerId, int x, int y) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendPointerDownInternalLocked(), token: " + token + ", pointerId: " + - pointerId + ", x: " + x + ", y: " + y); - } - - UinputBridge inputBridge = mBridgeMap.get(token); - if (inputBridge != null) { - inputBridge.sendPointerDown(token, pointerId, x, y); - } - } - - private void sendPointerUpInternalLocked(IBinder token, int pointerId) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendPointerUpInternalLocked(), token: " + token + ", pointerId: " + - pointerId); - } - - UinputBridge inputBridge = mBridgeMap.get(token); - if (inputBridge != null) { - inputBridge.sendPointerUp(token, pointerId); - } - } - - private void sendPointerSyncInternalLocked(IBinder token) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendPointerSyncInternalLocked(), token: " + token); - } - - UinputBridge inputBridge = mBridgeMap.get(token); - if (inputBridge != null) { - inputBridge.sendPointerSync(token); - } - } - - private final class UserProvider implements TvRemoteProviderProxy.ProviderMethods { - - private final TvRemoteService mService; - - public UserProvider(TvRemoteService service) { - mService = service; - } - - @Override - public boolean openInputBridge(TvRemoteProviderProxy provider, IBinder token, String name, - int width, int height, int maxPointers) { - if (DEBUG) { - Slog.d(TAG, "openInputBridge(), token: " + token + - ", name: " + name + ", width: " + width + - ", height: " + height + ", maxPointers: " + maxPointers); - } - - synchronized (mLock) { - return mService.openInputBridgeInternalLocked(token, name, width, - height, maxPointers); - } - } - - @Override - public void closeInputBridge(TvRemoteProviderProxy provider, IBinder token) { - if (DEBUG) Slog.d(TAG, "closeInputBridge(), token: " + token); - synchronized (mLock) { - mService.closeInputBridgeInternalLocked(token); - } - } - - @Override - public void clearInputBridge(TvRemoteProviderProxy provider, IBinder token) { - if (DEBUG) Slog.d(TAG, "clearInputBridge(), token: " + token); - synchronized (mLock) { - mService.clearInputBridgeInternalLocked(token); - } - } - - @Override - public void sendKeyDown(TvRemoteProviderProxy provider, IBinder token, int keyCode) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendKeyDown(), token: " + token + ", keyCode: " + keyCode); - } - synchronized (mLock) { - mService.sendKeyDownInternalLocked(token, keyCode); - } - } - - @Override - public void sendKeyUp(TvRemoteProviderProxy provider, IBinder token, int keyCode) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendKeyUp(), token: " + token + ", keyCode: " + keyCode); - } - synchronized (mLock) { - mService.sendKeyUpInternalLocked(token, keyCode); - } - } - - @Override - public void sendPointerDown(TvRemoteProviderProxy provider, IBinder token, int pointerId, - int x, int y) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendPointerDown(), token: " + token + ", pointerId: " + pointerId); - } - synchronized (mLock) { - mService.sendPointerDownInternalLocked(token, pointerId, x, y); - } - } - - @Override - public void sendPointerUp(TvRemoteProviderProxy provider, IBinder token, int pointerId) { - if (DEBUG_KEYS) { - Slog.d(TAG, "sendPointerUp(), token: " + token + ", pointerId: " + pointerId); - } - synchronized (mLock) { - mService.sendPointerUpInternalLocked(token, pointerId); - } - } - - @Override - public void sendPointerSync(TvRemoteProviderProxy provider, IBinder token) { - if (DEBUG_KEYS) Slog.d(TAG, "sendPointerSync(), token: " + token); - synchronized (mLock) { - mService.sendPointerSyncInternalLocked(token); - } - } - } } diff --git a/services/core/java/com/android/server/tv/TvRemoteServiceInput.java b/services/core/java/com/android/server/tv/TvRemoteServiceInput.java new file mode 100644 index 000000000000..8fe6da5e8dbe --- /dev/null +++ b/services/core/java/com/android/server/tv/TvRemoteServiceInput.java @@ -0,0 +1,244 @@ +/* + * 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.tv; + +import android.media.tv.ITvRemoteProvider; +import android.media.tv.ITvRemoteServiceInput; +import android.os.Binder; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.ArrayMap; +import android.util.Slog; + +import java.io.IOException; +import java.util.Map; + +final class TvRemoteServiceInput extends ITvRemoteServiceInput.Stub { + private static final String TAG = "TvRemoteServiceInput"; + private static final boolean DEBUG = false; + private static final boolean DEBUG_KEYS = false; + + private final Map<IBinder, UinputBridge> mBridgeMap; + private final Object mLock; + private final ITvRemoteProvider mProvider; + + TvRemoteServiceInput(Object lock, ITvRemoteProvider provider) { + mBridgeMap = new ArrayMap(); + mLock = lock; + mProvider = provider; + } + + @Override + public void openInputBridge(IBinder token, String name, int width, + int height, int maxPointers) { + if (DEBUG) { + Slog.d(TAG, "openInputBridge(), token: " + token + + ", name: " + name + ", width: " + width + + ", height: " + height + ", maxPointers: " + maxPointers); + } + + synchronized (mLock) { + if (mBridgeMap.containsKey(token)) { + if (DEBUG) { + Slog.d(TAG, "InputBridge already exists"); + } + } else { + final long idToken = Binder.clearCallingIdentity(); + try { + mBridgeMap.put(token, + new UinputBridge(token, name, width, height, maxPointers)); + token.linkToDeath(new IBinder.DeathRecipient() { + @Override + public void binderDied() { + closeInputBridge(token); + } + }, 0); + } catch (IOException e) { + Slog.e(TAG, "Cannot create device for " + name); + return; + } catch (RemoteException e) { + Slog.e(TAG, "Token is already dead"); + closeInputBridge(token); + return; + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } + + try { + mProvider.onInputBridgeConnected(token); + } catch (RemoteException e) { + Slog.e(TAG, "Failed remote call to onInputBridgeConnected"); + } + } + + @Override + public void closeInputBridge(IBinder token) { + if (DEBUG) { + Slog.d(TAG, "closeInputBridge(), token: " + token); + } + + synchronized (mLock) { + UinputBridge inputBridge = mBridgeMap.remove(token); + if (inputBridge == null) { + return; + } + + final long idToken = Binder.clearCallingIdentity(); + try { + inputBridge.close(token); + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } + + @Override + public void clearInputBridge(IBinder token) { + if (DEBUG) { + Slog.d(TAG, "clearInputBridge, token: " + token); + } + + synchronized (mLock) { + UinputBridge inputBridge = mBridgeMap.get(token); + if (inputBridge == null) { + return; + } + + final long idToken = Binder.clearCallingIdentity(); + try { + inputBridge.clear(token); + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } + + @Override + public void sendTimestamp(IBinder token, long timestamp) { + if (DEBUG) { + Slog.e(TAG, "sendTimestamp is deprecated, please remove all usages of this API."); + } + } + + @Override + public void sendKeyDown(IBinder token, int keyCode) { + if (DEBUG_KEYS) { + Slog.d(TAG, "sendKeyDown(), token: " + token + ", keyCode: " + keyCode); + } + + synchronized (mLock) { + UinputBridge inputBridge = mBridgeMap.get(token); + if (inputBridge == null) { + return; + } + + final long idToken = Binder.clearCallingIdentity(); + try { + inputBridge.sendKeyDown(token, keyCode); + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } + + @Override + public void sendKeyUp(IBinder token, int keyCode) { + if (DEBUG_KEYS) { + Slog.d(TAG, "sendKeyUp(), token: " + token + ", keyCode: " + keyCode); + } + + synchronized (mLock) { + UinputBridge inputBridge = mBridgeMap.get(token); + if (inputBridge == null) { + return; + } + + final long idToken = Binder.clearCallingIdentity(); + try { + inputBridge.sendKeyUp(token, keyCode); + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } + + @Override + public void sendPointerDown(IBinder token, int pointerId, int x, int y) { + if (DEBUG_KEYS) { + Slog.d(TAG, "sendPointerDown(), token: " + token + ", pointerId: " + + pointerId + ", x: " + x + ", y: " + y); + } + + synchronized (mLock) { + UinputBridge inputBridge = mBridgeMap.get(token); + if (inputBridge == null) { + return; + } + + final long idToken = Binder.clearCallingIdentity(); + try { + inputBridge.sendPointerDown(token, pointerId, x, y); + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } + + @Override + public void sendPointerUp(IBinder token, int pointerId) { + if (DEBUG_KEYS) { + Slog.d(TAG, "sendPointerUp(), token: " + token + ", pointerId: " + pointerId); + } + + synchronized (mLock) { + UinputBridge inputBridge = mBridgeMap.get(token); + if (inputBridge == null) { + return; + } + + final long idToken = Binder.clearCallingIdentity(); + try { + inputBridge.sendPointerUp(token, pointerId); + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } + + @Override + public void sendPointerSync(IBinder token) { + if (DEBUG_KEYS) { + Slog.d(TAG, "sendPointerSync(), token: " + token); + } + + synchronized (mLock) { + UinputBridge inputBridge = mBridgeMap.get(token); + if (inputBridge == null) { + return; + } + + final long idToken = Binder.clearCallingIdentity(); + try { + inputBridge.sendPointerSync(token); + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + } +} diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index dbf06a580282..54bb5f7bcd5f 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1743,7 +1743,12 @@ class ActivityStarter { return START_SUCCESS; } - if (!mMovedToFront && mDoResume) { + if (mMovedToFront) { + // We moved the task to front, use starting window to hide initial drawn delay. + targetTaskTop.showStartingWindow(null /* prev */, false /* newTask */, + true /* taskSwitch */); + } else if (mDoResume) { + // Make sure the stack and its belonging display are moved to topmost. mTargetStack.moveToFront("intentActivityFound"); } // We didn't do anything... but it was needed (a.k.a., client don't use that intent!) @@ -2349,11 +2354,6 @@ class ActivityStarter { } mOptions = null; - - // We are moving a task to the front, use starting window to hide initial drawn - // delay. - intentActivity.showStartingWindow(null /* prev */, false /* newTask */, - true /* taskSwitch */); } } // Need to update mTargetStack because if task was moved out of it, the original stack may diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 63ff2ea8069c..6462744703a3 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -564,6 +564,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo // 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<>(); + /** Corner radius that windows should have in order to match the display. */ private final float mWindowCornerRadius; @@ -4266,54 +4270,56 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } void assignStackOrdering(SurfaceControl.Transaction t) { - - final int HOME_STACK_STATE = 0; - final int NORMAL_STACK_STATE = 1; - final int ALWAYS_ON_TOP_STATE = 2; + if (getParent() == null) { + return; + } + mTmpAlwaysOnTopStacks.clear(); + mTmpHomeStacks.clear(); + mTmpNormalStacks.clear(); + for (int i = 0; i < mChildren.size(); ++i) { + final TaskStack s = mChildren.get(i); + if (s.isAlwaysOnTop()) { + mTmpAlwaysOnTopStacks.add(s); + } else if (s.isActivityTypeHome()) { + mTmpHomeStacks.add(s); + } else { + mTmpNormalStacks.add(s); + } + } int layer = 0; - int layerForAnimationLayer = 0; - int layerForBoostedAnimationLayer = 0; - int layerForHomeAnimationLayer = 0; - - for (int state = 0; state <= ALWAYS_ON_TOP_STATE; state++) { - for (int i = 0; i < mChildren.size(); i++) { - final TaskStack s = mChildren.get(i); - if (state == HOME_STACK_STATE && !s.isActivityTypeHome()) { - continue; - } else if (state == NORMAL_STACK_STATE && (s.isActivityTypeHome() - || s.isAlwaysOnTop())) { - continue; - } else if (state == ALWAYS_ON_TOP_STATE && !s.isAlwaysOnTop()) { - continue; - } - s.assignLayer(t, layer++); - if (s.inSplitScreenWindowingMode() && mSplitScreenDividerAnchor != null) { - t.setLayer(mSplitScreenDividerAnchor, layer++); - } - if ((s.isTaskAnimating() || s.isAppAnimating()) - && state != ALWAYS_ON_TOP_STATE) { - // Ensure the animation layer ends up above the - // highest animating stack and no higher. - layerForAnimationLayer = layer++; - } - if (state != ALWAYS_ON_TOP_STATE) { - layerForBoostedAnimationLayer = layer++; - } + // Place home stacks to the bottom. + for (int i = 0; i < mTmpHomeStacks.size(); i++) { + mTmpHomeStacks.get(i).assignLayer(t, layer++); + } + // The home animation layer is between the home stacks and the normal stacks. + final int layerForHomeAnimationLayer = layer++; + int layerForSplitScreenDividerAnchor = layer++; + int layerForAnimationLayer = layer++; + for (int i = 0; i < mTmpNormalStacks.size(); i++) { + final TaskStack s = mTmpNormalStacks.get(i); + s.assignLayer(t, layer++); + if (s.inSplitScreenWindowingMode()) { + // The split screen divider anchor is located above the split screen window. + layerForSplitScreenDividerAnchor = layer++; } - if (state == HOME_STACK_STATE) { - layerForHomeAnimationLayer = layer++; + if (s.isTaskAnimating() || s.isAppAnimating()) { + // The animation layer is located above the highest animating stack and no + // higher. + layerForAnimationLayer = layer++; } } - if (mAppAnimationLayer != null) { - t.setLayer(mAppAnimationLayer, layerForAnimationLayer); - } - if (mBoostedAppAnimationLayer != null) { - t.setLayer(mBoostedAppAnimationLayer, layerForBoostedAnimationLayer); - } - if (mHomeAppAnimationLayer != null) { - t.setLayer(mHomeAppAnimationLayer, layerForHomeAnimationLayer); + // The boosted animation layer is between the normal stacks and the always on top + // stacks. + final int layerForBoostedAnimationLayer = layer++; + for (int i = 0; i < mTmpAlwaysOnTopStacks.size(); i++) { + mTmpAlwaysOnTopStacks.get(i).assignLayer(t, layer++); } + + t.setLayer(mHomeAppAnimationLayer, layerForHomeAnimationLayer); + t.setLayer(mAppAnimationLayer, layerForAnimationLayer); + t.setLayer(mSplitScreenDividerAnchor, layerForSplitScreenDividerAnchor); + t.setLayer(mBoostedAppAnimationLayer, layerForBoostedAnimationLayer); } @Override @@ -4335,27 +4341,28 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo @Override void onParentChanged() { - super.onParentChanged(); if (getParent() != null) { - mAppAnimationLayer = makeChildSurface(null) - .setName("animationLayer") - .build(); - mBoostedAppAnimationLayer = makeChildSurface(null) - .setName("boostedAnimationLayer") - .build(); - mHomeAppAnimationLayer = makeChildSurface(null) - .setName("homeAnimationLayer") - .build(); - mSplitScreenDividerAnchor = makeChildSurface(null) - .setName("splitScreenDividerAnchor") - .build(); - getPendingTransaction() - .show(mAppAnimationLayer) - .show(mBoostedAppAnimationLayer) - .show(mHomeAppAnimationLayer) - .show(mSplitScreenDividerAnchor); - scheduleAnimation(); + super.onParentChanged(() -> { + mAppAnimationLayer = makeChildSurface(null) + .setName("animationLayer") + .build(); + mBoostedAppAnimationLayer = makeChildSurface(null) + .setName("boostedAnimationLayer") + .build(); + mHomeAppAnimationLayer = makeChildSurface(null) + .setName("homeAnimationLayer") + .build(); + mSplitScreenDividerAnchor = makeChildSurface(null) + .setName("splitScreenDividerAnchor") + .build(); + getPendingTransaction() + .show(mAppAnimationLayer) + .show(mBoostedAppAnimationLayer) + .show(mHomeAppAnimationLayer) + .show(mSplitScreenDividerAnchor); + }); } else { + super.onParentChanged(); mWmService.mTransactionFactory.get() .remove(mAppAnimationLayer) .remove(mBoostedAppAnimationLayer) diff --git a/services/core/java/com/android/server/wm/PinnedStackController.java b/services/core/java/com/android/server/wm/PinnedStackController.java index 8e57fec6ba46..2e6df601cf0b 100644 --- a/services/core/java/com/android/server/wm/PinnedStackController.java +++ b/services/core/java/com/android/server/wm/PinnedStackController.java @@ -90,8 +90,6 @@ class PinnedStackController { private boolean mIsMinimized; private boolean mIsImeShowing; private int mImeHeight; - private boolean mIsShelfShowing; - private int mShelfHeight; // The set of actions and aspect-ratio for the that are currently allowed on the PiP activity private ArrayList<RemoteAction> mActions = new ArrayList<>(); @@ -216,7 +214,6 @@ class PinnedStackController { mPinnedStackListener = listener; notifyDisplayInfoChanged(mDisplayInfo); notifyImeVisibilityChanged(mIsImeShowing, mImeHeight); - notifyShelfVisibilityChanged(mIsShelfShowing, mShelfHeight); // The movement bounds notification needs to be sent before the minimized state, since // SystemUI may use the bounds to retore the minimized position notifyMovementBoundsChanged(false /* fromImeAdjustment */, @@ -278,9 +275,7 @@ class PinnedStackController { mSnapAlgorithm.applySnapFraction(defaultBounds, movementBounds, snapFraction); } else { Gravity.apply(mDefaultStackGravity, size.getWidth(), size.getHeight(), insetBounds, - 0, Math.max(mIsImeShowing ? mImeHeight : 0, - mIsShelfShowing ? mShelfHeight : 0), - defaultBounds); + 0, mIsImeShowing ? mImeHeight : 0, defaultBounds); } return defaultBounds; } @@ -367,21 +362,6 @@ class PinnedStackController { } /** - * Sets the shelf state and height. - */ - void setAdjustedForShelf(boolean adjustedForShelf, int shelfHeight) { - final boolean shelfShowing = adjustedForShelf && shelfHeight > 0; - if (shelfShowing == mIsShelfShowing && shelfHeight == mShelfHeight) { - return; - } - - mIsShelfShowing = shelfShowing; - mShelfHeight = shelfHeight; - notifyShelfVisibilityChanged(shelfShowing, shelfHeight); - notifyMovementBoundsChanged(false /* fromImeAdjustment */, true /* fromShelfAdjustment */); - } - - /** * Sets the current aspect ratio. */ void setAspectRatio(float aspectRatio) { @@ -439,16 +419,6 @@ class PinnedStackController { } } - private void notifyShelfVisibilityChanged(boolean shelfVisible, int shelfHeight) { - if (mPinnedStackListener != null) { - try { - mPinnedStackListener.onShelfVisibilityChanged(shelfVisible, shelfHeight); - } catch (RemoteException e) { - Slog.e(TAG_WM, "Error delivering bounds changed event.", e); - } - } - } - private void notifyAspectRatioChanged(float aspectRatio) { if (mPinnedStackListener == null) return; try { @@ -613,8 +583,6 @@ class PinnedStackController { pw.println(); pw.println(prefix + " mIsImeShowing=" + mIsImeShowing); pw.println(prefix + " mImeHeight=" + mImeHeight); - pw.println(prefix + " mIsShelfShowing=" + mIsShelfShowing); - pw.println(prefix + " mShelfHeight=" + mShelfHeight); pw.println(prefix + " mIsMinimized=" + mIsMinimized); pw.println(prefix + " mAspectRatio=" + mAspectRatio); pw.println(prefix + " mMinAspectRatio=" + mMinAspectRatio); diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 586375f9d714..ec43ec56a573 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -137,6 +137,14 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< */ private boolean mCommittedReparentToAnimationLeash; + /** + * Callback which is triggered while changing the parent, after setting up the surface but + * before asking the parent to assign child layers. + */ + interface PreAssignChildLayersCallback { + void onPreAssignChildLayers(); + } + WindowContainer(WindowManagerService wms) { mWmService = wms; mPendingTransaction = wms.mTransactionFactory.get(); @@ -176,6 +184,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< */ @Override void onParentChanged() { + onParentChanged(null); + } + + void onParentChanged(PreAssignChildLayersCallback callback) { super.onParentChanged(); if (mParent == null) { return; @@ -195,6 +207,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< reparentSurfaceControl(getPendingTransaction(), mParent.mSurfaceControl); } + if (callback != null) { + callback.onPreAssignChildLayers(); + } + // Either way we need to ask the parent to assign us a Z-order. mParent.assignChildLayers(); scheduleAnimation(); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 8b227a62ebaa..b4309c74b390 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -5594,16 +5594,6 @@ public class WindowManagerService extends IWindowManager.Stub } @Override - public void setShelfHeight(boolean visible, int shelfHeight) { - mAtmInternal.enforceCallerIsRecentsOrHasPermission(android.Manifest.permission.STATUS_BAR, - "setShelfHeight()"); - synchronized (mGlobalLock) { - getDefaultDisplayContentLocked().getPinnedStackController().setAdjustedForShelf(visible, - shelfHeight); - } - } - - @Override public void statusBarVisibilityChanged(int displayId, int visibility) { if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.STATUS_BAR) != PackageManager.PERMISSION_GRANTED) { diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp index d5fbd2b316e7..7aa9c7cce876 100644 --- a/services/core/jni/com_android_server_VibratorService.cpp +++ b/services/core/jni/com_android_server_VibratorService.cpp @@ -56,37 +56,57 @@ inline Return<R> NullptrStatus() { return Return<R>{Status::fromExceptionCode(Status::EX_NULL_POINTER)}; } -// Helper used to transparently deal with the vibrator HAL becoming unavailable. -template<class R, class I, class... Args0, class... Args1> -Return<R> halCall(Return<R> (I::* fn)(Args0...), Args1&&... args1) { - // Assume that if getService returns a nullptr, HAL is not available on the - // device. - static sp<I> sHal = I::getService(); - static bool sAvailable = sHal != nullptr; +template <typename I> +class HalWrapper { + public: + static std::unique_ptr<HalWrapper> Create() { + // Assume that if getService returns a nullptr, HAL is not available on the + // device. + auto hal = I::getService(); + return hal ? std::unique_ptr<HalWrapper>(new HalWrapper(std::move(hal))) : nullptr; + } - if (!sAvailable) { - return NullptrStatus<R>(); + // Helper used to transparently deal with the vibrator HAL becoming unavailable. + template<class R, class... Args0, class... Args1> + Return<R> call(Return<R> (I::* fn)(Args0...), Args1&&... args1) { + // Return<R> doesn't have a default constructor, so make a Return<R> with + // STATUS::EX_NONE. + using ::android::hardware::Status; + Return<R> ret{Status::fromExceptionCode(Status::EX_NONE)}; + + // Note that ret is guaranteed to be changed after this loop. + for (int i = 0; i < NUM_TRIES; ++i) { + ret = (mHal == nullptr) ? NullptrStatus<R>() + : (*mHal.*fn)(std::forward<Args1>(args1)...); + + if (ret.isOk()) { + break; + } + + ALOGE("Failed to issue command to vibrator HAL. Retrying."); + // Restoring connection to the HAL. + mHal = I::tryGetService(); + } + return ret; } - // Return<R> doesn't have a default constructor, so make a Return<R> with - // STATUS::EX_NONE. - using ::android::hardware::Status; - Return<R> ret{Status::fromExceptionCode(Status::EX_NONE)}; + private: + HalWrapper(sp<I> &&hal) : mHal(std::move(hal)) {} - // Note that ret is guaranteed to be changed after this loop. - for (int i = 0; i < NUM_TRIES; ++i) { - ret = (sHal == nullptr) ? NullptrStatus<R>() - : (*sHal.*fn)(std::forward<Args1>(args1)...); + private: + sp<I> mHal; +}; - if (ret.isOk()) { - break; - } +template <typename I> +static auto getHal() { + static auto sHalWrapper = HalWrapper<I>::Create(); + return sHalWrapper.get(); +} - ALOGE("Failed to issue command to vibrator HAL. Retrying."); - // Restoring connection to the HAL. - sHal = I::tryGetService(); - } - return ret; +template<class R, class I, class... Args0, class... Args1> +Return<R> halCall(Return<R> (I::* fn)(Args0...), Args1&&... args1) { + auto hal = getHal<I>(); + return hal ? hal->call(fn, std::forward<Args1>(args1)...) : NullptrStatus<R>(); } template<class R> diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 03f475582a5a..0e9da83d4d1f 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -159,12 +159,7 @@ static void loadSystemIconAsSpriteWithPointerIcon(JNIEnv* env, jobject contextOb status_t status = android_view_PointerIcon_loadSystemIcon(env, contextObj, style, outPointerIcon); if (!status) { - SkBitmap* bitmapCopy = &outSpriteIcon->bitmap; - SkImageInfo bitmapCopyInfo = outPointerIcon->bitmap.info().makeColorType(kN32_SkColorType); - if (bitmapCopy->tryAllocPixels(bitmapCopyInfo)) { - outPointerIcon->bitmap.readPixels(bitmapCopy->info(), bitmapCopy->getPixels(), - bitmapCopy->rowBytes(), 0, 0); - } + outSpriteIcon->bitmap = outPointerIcon->bitmap.copy(ANDROID_BITMAP_FORMAT_RGBA_8888); outSpriteIcon->style = outPointerIcon->style; outSpriteIcon->hotSpotX = outPointerIcon->hotSpotX; outSpriteIcon->hotSpotY = outPointerIcon->hotSpotY; @@ -1709,15 +1704,8 @@ static void nativeSetCustomPointerIcon(JNIEnv* env, jclass /* clazz */, return; } - SpriteIcon spriteIcon; - SkImageInfo spriteInfo = pointerIcon.bitmap.info().makeColorType(kN32_SkColorType); - if (spriteIcon.bitmap.tryAllocPixels(spriteInfo)) { - pointerIcon.bitmap.readPixels(spriteInfo, spriteIcon.bitmap.getPixels(), - spriteIcon.bitmap.rowBytes(), 0, 0); - } - spriteIcon.style = pointerIcon.style; - spriteIcon.hotSpotX = pointerIcon.hotSpotX; - spriteIcon.hotSpotY = pointerIcon.hotSpotY; + SpriteIcon spriteIcon(pointerIcon.bitmap.copy(ANDROID_BITMAP_FORMAT_RGBA_8888), + pointerIcon.style, pointerIcon.hotSpotX, pointerIcon.hotSpotY); im->setCustomPointerIcon(spriteIcon); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 555968a31ca8..479dd1e5d84e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -50,6 +50,7 @@ import static android.app.admin.DevicePolicyManager.DELEGATION_PACKAGE_ACCESS; import static android.app.admin.DevicePolicyManager.DELEGATION_PERMISSION_GRANT; import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO; import static android.app.admin.DevicePolicyManager.ID_TYPE_IMEI; +import static android.app.admin.DevicePolicyManager.ID_TYPE_INDIVIDUAL_ATTESTATION; import static android.app.admin.DevicePolicyManager.ID_TYPE_MEID; import static android.app.admin.DevicePolicyManager.ID_TYPE_SERIAL; import static android.app.admin.DevicePolicyManager.LEAVE_ALL_SYSTEM_APPS_ENABLED; @@ -4132,6 +4133,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { final PasswordMetrics metrics = ap.minimumPasswordMetrics; if (metrics.quality != quality) { metrics.quality = quality; + resetInactivePasswordRequirementsIfRPlus(userId, ap); updatePasswordValidityCheckpointLocked(userId, parent); updatePasswordQualityCacheForUserGroup(userId); saveSettingsLocked(userId); @@ -4150,6 +4152,27 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } /** + * For admins targeting R+ reset various password constraints to default values when quality is + * set to a value that makes those constraints that have no effect. + */ + private void resetInactivePasswordRequirementsIfRPlus(int userId, ActiveAdmin admin) { + if (getTargetSdk(admin.info.getPackageName(), userId) > Build.VERSION_CODES.Q) { + final PasswordMetrics metrics = admin.minimumPasswordMetrics; + if (metrics.quality < PASSWORD_QUALITY_NUMERIC) { + metrics.length = ActiveAdmin.DEF_MINIMUM_PASSWORD_LENGTH; + } + if (metrics.quality < PASSWORD_QUALITY_COMPLEX) { + metrics.letters = ActiveAdmin.DEF_MINIMUM_PASSWORD_LETTERS; + metrics.upperCase = ActiveAdmin.DEF_MINIMUM_PASSWORD_UPPER_CASE; + metrics.lowerCase = ActiveAdmin.DEF_MINIMUM_PASSWORD_LOWER_CASE; + metrics.numeric = ActiveAdmin.DEF_MINIMUM_PASSWORD_NUMERIC; + metrics.symbols = ActiveAdmin.DEF_MINIMUM_PASSWORD_SYMBOLS; + metrics.nonLetter = ActiveAdmin.DEF_MINIMUM_PASSWORD_NON_LETTER; + } + } + } + + /** * Updates a flag that tells us whether the user's password currently satisfies the * requirements set by all of the user's active admins. The flag is updated both in memory * and persisted to disk by calling {@link #saveSettingsLocked}, for the value of the flag @@ -4280,6 +4303,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { ActiveAdmin ap = getActiveAdminForCallerLocked( who, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, parent); final PasswordMetrics metrics = ap.minimumPasswordMetrics; + ensureMinimumQuality(userId, ap, PASSWORD_QUALITY_NUMERIC, "setPasswordMinimumLength"); if (metrics.length != length) { metrics.length = length; updatePasswordValidityCheckpointLocked(userId, parent); @@ -4294,10 +4318,19 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { .write(); } + private void ensureMinimumQuality( + int userId, ActiveAdmin admin, int minimumQuality, String operation) { + if (admin.minimumPasswordMetrics.quality < minimumQuality + && getTargetSdk(admin.info.getPackageName(), userId) > Build.VERSION_CODES.Q) { + throw new IllegalStateException(String.format( + "password quality should be at least %d for %s", minimumQuality, operation)); + } + } + @Override public int getPasswordMinimumLength(ComponentName who, int userHandle, boolean parent) { return getStrictestPasswordRequirement(who, userHandle, parent, - admin -> admin.minimumPasswordMetrics.length, PASSWORD_QUALITY_UNSPECIFIED); + admin -> admin.minimumPasswordMetrics.length, PASSWORD_QUALITY_NUMERIC); } @Override @@ -4524,6 +4557,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { synchronized (getLockObject()) { final ActiveAdmin ap = getActiveAdminForCallerLocked( who, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, parent); + ensureMinimumQuality( + userId, ap, PASSWORD_QUALITY_COMPLEX, "setPasswordMinimumUpperCase"); final PasswordMetrics metrics = ap.minimumPasswordMetrics; if (metrics.upperCase != length) { metrics.upperCase = length; @@ -4552,6 +4587,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { synchronized (getLockObject()) { ActiveAdmin ap = getActiveAdminForCallerLocked( who, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, parent); + ensureMinimumQuality( + userId, ap, PASSWORD_QUALITY_COMPLEX, "setPasswordMinimumLowerCase"); final PasswordMetrics metrics = ap.minimumPasswordMetrics; if (metrics.lowerCase != length) { metrics.lowerCase = length; @@ -4583,6 +4620,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { synchronized (getLockObject()) { ActiveAdmin ap = getActiveAdminForCallerLocked( who, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, parent); + ensureMinimumQuality(userId, ap, PASSWORD_QUALITY_COMPLEX, "setPasswordMinimumLetters"); final PasswordMetrics metrics = ap.minimumPasswordMetrics; if (metrics.letters != length) { metrics.letters = length; @@ -4614,6 +4652,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { synchronized (getLockObject()) { ActiveAdmin ap = getActiveAdminForCallerLocked( who, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, parent); + ensureMinimumQuality(userId, ap, PASSWORD_QUALITY_COMPLEX, "setPasswordMinimumNumeric"); final PasswordMetrics metrics = ap.minimumPasswordMetrics; if (metrics.numeric != length) { metrics.numeric = length; @@ -4645,6 +4684,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { synchronized (getLockObject()) { ActiveAdmin ap = getActiveAdminForCallerLocked( who, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, parent); + ensureMinimumQuality(userId, ap, PASSWORD_QUALITY_COMPLEX, "setPasswordMinimumSymbols"); final PasswordMetrics metrics = ap.minimumPasswordMetrics; if (metrics.symbols != length) { ap.minimumPasswordMetrics.symbols = length; @@ -4676,6 +4716,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { synchronized (getLockObject()) { ActiveAdmin ap = getActiveAdminForCallerLocked( who, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, parent); + ensureMinimumQuality( + userId, ap, PASSWORD_QUALITY_COMPLEX, "setPasswordMinimumNonLetter"); final PasswordMetrics metrics = ap.minimumPasswordMetrics; if (metrics.nonLetter != length) { ap.minimumPasswordMetrics.nonLetter = length; @@ -5816,6 +5858,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { idTypeToAttestationFlag.put(ID_TYPE_SERIAL, AttestationUtils.ID_TYPE_SERIAL); idTypeToAttestationFlag.put(ID_TYPE_IMEI, AttestationUtils.ID_TYPE_IMEI); idTypeToAttestationFlag.put(ID_TYPE_MEID, AttestationUtils.ID_TYPE_MEID); + idTypeToAttestationFlag.put( + ID_TYPE_INDIVIDUAL_ATTESTATION, AttestationUtils.USE_INDIVIDUAL_ATTESTATION); int numFlagsSet = Integer.bitCount(idAttestationFlags); // No flags are set - return null to indicate no device ID attestation information should @@ -8008,6 +8052,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { "clearDeviceOwner can only be called by the device owner"); } enforceUserUnlocked(deviceOwnerUserId); + DevicePolicyData policy = getUserData(deviceOwnerUserId); + if (policy.mPasswordTokenHandle != 0) { + mLockPatternUtils.removeEscrowToken(policy.mPasswordTokenHandle, deviceOwnerUserId); + } final ActiveAdmin admin = getDeviceOwnerAdminLocked(); long ident = mInjector.binderClearCallingIdentity(); diff --git a/services/net/Android.bp b/services/net/Android.bp index 8f8f9f9bbf55..1ca96ed80e5e 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -1,87 +1,10 @@ -// AIDL interfaces between the core system and the networking mainline module. -aidl_interface { - name: "ipmemorystore-aidl-interfaces", - local_include_dir: "java", - srcs: [ - "java/android/net/IIpMemoryStore.aidl", - "java/android/net/IIpMemoryStoreCallbacks.aidl", - "java/android/net/ipmemorystore/**/*.aidl", - ], - backend: { - ndk: { - enabled: false, - }, - cpp: { - enabled: false, - }, - }, - api_dir: "aidl/ipmemorystore", - versions: [ - "1", - "2", - "3", - ], -} - -aidl_interface { - name: "networkstack-aidl-interfaces", - local_include_dir: "java", - include_dirs: ["frameworks/base/core/java"], // For framework parcelables. - srcs: [ - "java/android/net/DhcpResultsParcelable.aidl", - "java/android/net/INetworkMonitor.aidl", - "java/android/net/INetworkMonitorCallbacks.aidl", - "java/android/net/INetworkStackConnector.aidl", - "java/android/net/INetworkStackStatusCallback.aidl", - "java/android/net/InitialConfigurationParcelable.aidl", - "java/android/net/NattKeepalivePacketDataParcelable.aidl", - "java/android/net/PrivateDnsConfigParcel.aidl", - "java/android/net/ProvisioningConfigurationParcelable.aidl", - "java/android/net/TcpKeepalivePacketDataParcelable.aidl", - "java/android/net/dhcp/DhcpServingParamsParcel.aidl", - "java/android/net/dhcp/IDhcpServer.aidl", - "java/android/net/dhcp/IDhcpServerCallbacks.aidl", - "java/android/net/ip/IIpClient.aidl", - "java/android/net/ip/IIpClientCallbacks.aidl", - ], - backend: { - ndk: { - enabled: false, - }, - cpp: { - enabled: false, - }, - }, - api_dir: "aidl/networkstack", - imports: ["ipmemorystore-aidl-interfaces"], - versions: [ - "1", - "2", - "3", - ], -} - java_library_static { name: "services.net", srcs: ["java/**/*.java"], static_libs: [ "dnsresolver_aidl_interface-V2-java", - "ipmemorystore-client", "netd_aidl_interface-java", - "networkstack-aidl-interfaces-V3-java", - ], -} - -java_library_static { - name: "ipmemorystore-client", - sdk_version: "system_current", - srcs: [ - ":framework-annotations", - "java/android/net/IpMemoryStoreClient.java", - "java/android/net/ipmemorystore/**/*.java", - ], - static_libs: [ - "ipmemorystore-aidl-interfaces-V3-java", + "networkstack-client", ], } diff --git a/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl b/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl deleted file mode 100644 index a8cbab26190f..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl +++ /dev/null @@ -1,9 +0,0 @@ -package android.net; -interface IIpMemoryStore { - oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener); - oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener); - oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener); - oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener); - oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener); - oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener); -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl b/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl deleted file mode 100644 index cf02c26c2fe3..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net; -interface IIpMemoryStoreCallbacks { - oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore); -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl deleted file mode 100644 index 291dbef817e6..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -parcelable Blob { - byte[] data; -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl deleted file mode 100644 index 52f40d49abd5..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnBlobRetrievedListener { - oneway void onBlobRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in String name, in android.net.ipmemorystore.Blob data); -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl deleted file mode 100644 index 785351435d73..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnL2KeyResponseListener { - oneway void onL2KeyResponse(in android.net.ipmemorystore.StatusParcelable status, in String l2Key); -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl deleted file mode 100644 index 3dd2ae6e9bab..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnNetworkAttributesRetrievedListener { - oneway void onNetworkAttributesRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes); -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl deleted file mode 100644 index 46d4ecb9ed7c..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnSameL3NetworkResponseListener { - oneway void onSameL3NetworkResponse(in android.net.ipmemorystore.StatusParcelable status, in android.net.ipmemorystore.SameL3NetworkResponseParcelable response); -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl deleted file mode 100644 index 54e654b80c9e..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnStatusListener { - oneway void onComplete(in android.net.ipmemorystore.StatusParcelable status); -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl deleted file mode 100644 index 9531ea3963fb..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl +++ /dev/null @@ -1,8 +0,0 @@ -package android.net.ipmemorystore; -parcelable NetworkAttributesParcelable { - byte[] assignedV4Address; - long assignedV4AddressExpiry; - String groupHint; - android.net.ipmemorystore.Blob[] dnsAddresses; - int mtu; -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl deleted file mode 100644 index 414272b49f1d..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl +++ /dev/null @@ -1,6 +0,0 @@ -package android.net.ipmemorystore; -parcelable SameL3NetworkResponseParcelable { - String l2Key1; - String l2Key2; - float confidence; -} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl deleted file mode 100644 index 92c6779b5dc0..000000000000 --- a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -parcelable StatusParcelable { - int resultCode; -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/IIpMemoryStore.aidl b/services/net/aidl/ipmemorystore/2/android/net/IIpMemoryStore.aidl deleted file mode 100644 index a8cbab26190f..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/IIpMemoryStore.aidl +++ /dev/null @@ -1,9 +0,0 @@ -package android.net; -interface IIpMemoryStore { - oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener); - oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener); - oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener); - oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener); - oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener); - oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener); -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/IIpMemoryStoreCallbacks.aidl b/services/net/aidl/ipmemorystore/2/android/net/IIpMemoryStoreCallbacks.aidl deleted file mode 100644 index cf02c26c2fe3..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/IIpMemoryStoreCallbacks.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net; -interface IIpMemoryStoreCallbacks { - oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore); -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/Blob.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/Blob.aidl deleted file mode 100644 index 291dbef817e6..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/Blob.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -parcelable Blob { - byte[] data; -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl deleted file mode 100644 index 52f40d49abd5..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnBlobRetrievedListener { - oneway void onBlobRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in String name, in android.net.ipmemorystore.Blob data); -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl deleted file mode 100644 index 785351435d73..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnL2KeyResponseListener { - oneway void onL2KeyResponse(in android.net.ipmemorystore.StatusParcelable status, in String l2Key); -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl deleted file mode 100644 index 3dd2ae6e9bab..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnNetworkAttributesRetrievedListener { - oneway void onNetworkAttributesRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes); -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl deleted file mode 100644 index 46d4ecb9ed7c..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnSameL3NetworkResponseListener { - oneway void onSameL3NetworkResponse(in android.net.ipmemorystore.StatusParcelable status, in android.net.ipmemorystore.SameL3NetworkResponseParcelable response); -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnStatusListener.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnStatusListener.aidl deleted file mode 100644 index 54e654b80c9e..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnStatusListener.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -interface IOnStatusListener { - oneway void onComplete(in android.net.ipmemorystore.StatusParcelable status); -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/NetworkAttributesParcelable.aidl deleted file mode 100644 index 9531ea3963fb..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/NetworkAttributesParcelable.aidl +++ /dev/null @@ -1,8 +0,0 @@ -package android.net.ipmemorystore; -parcelable NetworkAttributesParcelable { - byte[] assignedV4Address; - long assignedV4AddressExpiry; - String groupHint; - android.net.ipmemorystore.Blob[] dnsAddresses; - int mtu; -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl deleted file mode 100644 index 414272b49f1d..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl +++ /dev/null @@ -1,6 +0,0 @@ -package android.net.ipmemorystore; -parcelable SameL3NetworkResponseParcelable { - String l2Key1; - String l2Key2; - float confidence; -} diff --git a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/StatusParcelable.aidl b/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/StatusParcelable.aidl deleted file mode 100644 index 92c6779b5dc0..000000000000 --- a/services/net/aidl/ipmemorystore/2/android/net/ipmemorystore/StatusParcelable.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.ipmemorystore; -parcelable StatusParcelable { - int resultCode; -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl b/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl deleted file mode 100644 index 30893b215001..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -interface IIpMemoryStore { - oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener); - oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener); - oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener); - oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener); - oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener); - oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener); - oneway void factoryReset(); -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl b/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl deleted file mode 100644 index 535ae2cf25e4..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -interface IIpMemoryStoreCallbacks { - oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore); -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl deleted file mode 100644 index 6d2dc0ccaaac..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -parcelable Blob { - byte[] data; -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl deleted file mode 100644 index 48c1fb8c180a..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -interface IOnBlobRetrievedListener { - oneway void onBlobRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in String name, in android.net.ipmemorystore.Blob data); -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl deleted file mode 100644 index aebc7240bc9e..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -interface IOnL2KeyResponseListener { - oneway void onL2KeyResponse(in android.net.ipmemorystore.StatusParcelable status, in String l2Key); -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl deleted file mode 100644 index b66db5ab21cb..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -interface IOnNetworkAttributesRetrievedListener { - oneway void onNetworkAttributesRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes); -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl deleted file mode 100644 index e9f2db445d38..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -interface IOnSameL3NetworkResponseListener { - oneway void onSameL3NetworkResponse(in android.net.ipmemorystore.StatusParcelable status, in android.net.ipmemorystore.SameL3NetworkResponseParcelable response); -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl deleted file mode 100644 index 49172cea9587..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -interface IOnStatusListener { - oneway void onComplete(in android.net.ipmemorystore.StatusParcelable status); -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl deleted file mode 100644 index 188db20b531a..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl +++ /dev/null @@ -1,25 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -parcelable NetworkAttributesParcelable { - byte[] assignedV4Address; - long assignedV4AddressExpiry; - String groupHint; - android.net.ipmemorystore.Blob[] dnsAddresses; - int mtu; -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl deleted file mode 100644 index 7a2ed48241e7..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl +++ /dev/null @@ -1,23 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -parcelable SameL3NetworkResponseParcelable { - String l2Key1; - String l2Key2; - float confidence; -} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl deleted file mode 100644 index d9b067875e84..000000000000 --- a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ipmemorystore; -parcelable StatusParcelable { - int resultCode; -} diff --git a/services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl b/services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl deleted file mode 100644 index 92b5345ee221..000000000000 --- a/services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl +++ /dev/null @@ -1,8 +0,0 @@ -package android.net; -parcelable DhcpResultsParcelable { - android.net.StaticIpConfiguration baseConfiguration; - int leaseDuration; - int mtu; - String serverAddress; - String vendorInfo; -} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl b/services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl deleted file mode 100644 index b19f522880ec..000000000000 --- a/services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl +++ /dev/null @@ -1,17 +0,0 @@ -package android.net; -interface INetworkMonitor { - oneway void start(); - oneway void launchCaptivePortalApp(); - oneway void notifyCaptivePortalAppFinished(int response); - oneway void setAcceptPartialConnectivity(); - oneway void forceReevaluation(int uid); - oneway void notifyPrivateDnsChanged(in android.net.PrivateDnsConfigParcel config); - oneway void notifyDnsResponse(int returnCode); - oneway void notifyNetworkConnected(in android.net.LinkProperties lp, in android.net.NetworkCapabilities nc); - oneway void notifyNetworkDisconnected(); - oneway void notifyLinkPropertiesChanged(in android.net.LinkProperties lp); - oneway void notifyNetworkCapabilitiesChanged(in android.net.NetworkCapabilities nc); - const int NETWORK_TEST_RESULT_VALID = 0; - const int NETWORK_TEST_RESULT_INVALID = 1; - const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2; -} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl b/services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl deleted file mode 100644 index ee9871ddcd15..000000000000 --- a/services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl +++ /dev/null @@ -1,8 +0,0 @@ -package android.net; -interface INetworkMonitorCallbacks { - oneway void onNetworkMonitorCreated(in android.net.INetworkMonitor networkMonitor); - oneway void notifyNetworkTested(int testResult, @nullable String redirectUrl); - oneway void notifyPrivateDnsConfigResolved(in android.net.PrivateDnsConfigParcel config); - oneway void showProvisioningNotification(String action, String packageName); - oneway void hideProvisioningNotification(); -} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl b/services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl deleted file mode 100644 index 7da11e476c0e..000000000000 --- a/services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl +++ /dev/null @@ -1,7 +0,0 @@ -package android.net; -interface INetworkStackConnector { - oneway void makeDhcpServer(in String ifName, in android.net.dhcp.DhcpServingParamsParcel params, in android.net.dhcp.IDhcpServerCallbacks cb); - oneway void makeNetworkMonitor(in android.net.Network network, String name, in android.net.INetworkMonitorCallbacks cb); - oneway void makeIpClient(in String ifName, in android.net.ip.IIpClientCallbacks callbacks); - oneway void fetchIpMemoryStore(in android.net.IIpMemoryStoreCallbacks cb); -} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl b/services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl deleted file mode 100644 index f6ca6f7a78e2..000000000000 --- a/services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net; -interface INetworkStackStatusCallback { - oneway void onStatusAvailable(int statusCode); -} diff --git a/services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl b/services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl deleted file mode 100644 index c80a78785b3b..000000000000 --- a/services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl +++ /dev/null @@ -1,7 +0,0 @@ -package android.net; -parcelable InitialConfigurationParcelable { - android.net.LinkAddress[] ipAddresses; - android.net.IpPrefix[] directlyConnectedRoutes; - String[] dnsServers; - String gateway; -} diff --git a/services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl b/services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl deleted file mode 100644 index 2de790bb7754..000000000000 --- a/services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl +++ /dev/null @@ -1,5 +0,0 @@ -package android.net; -parcelable PrivateDnsConfigParcel { - String hostname; - String[] ips; -} diff --git a/services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl b/services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl deleted file mode 100644 index 3a6c30496fd8..000000000000 --- a/services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl +++ /dev/null @@ -1,15 +0,0 @@ -package android.net; -parcelable ProvisioningConfigurationParcelable { - boolean enableIPv4; - boolean enableIPv6; - boolean usingMultinetworkPolicyTracker; - boolean usingIpReachabilityMonitor; - int requestedPreDhcpActionMs; - android.net.InitialConfigurationParcelable initialConfig; - android.net.StaticIpConfiguration staticIpConfig; - android.net.apf.ApfCapabilities apfCapabilities; - int provisioningTimeoutMs; - int ipv6AddrGenMode; - android.net.Network network; - String displayName; -} diff --git a/services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl b/services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl deleted file mode 100644 index e121c064f7ac..000000000000 --- a/services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl +++ /dev/null @@ -1,13 +0,0 @@ -package android.net; -parcelable TcpKeepalivePacketDataParcelable { - byte[] srcAddress; - int srcPort; - byte[] dstAddress; - int dstPort; - int seq; - int ack; - int rcvWnd; - int rcvWndScale; - int tos; - int ttl; -} diff --git a/services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl b/services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl deleted file mode 100644 index 67193ae904bc..000000000000 --- a/services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl +++ /dev/null @@ -1,11 +0,0 @@ -package android.net.dhcp; -parcelable DhcpServingParamsParcel { - int serverAddr; - int serverAddrPrefixLength; - int[] defaultRouters; - int[] dnsServers; - int[] excludedAddrs; - long dhcpLeaseTimeSecs; - int linkMtu; - boolean metered; -} diff --git a/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl b/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl deleted file mode 100644 index 914315855496..000000000000 --- a/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl +++ /dev/null @@ -1,10 +0,0 @@ -package android.net.dhcp; -interface IDhcpServer { - oneway void start(in android.net.INetworkStackStatusCallback cb); - oneway void updateParams(in android.net.dhcp.DhcpServingParamsParcel params, in android.net.INetworkStackStatusCallback cb); - oneway void stop(in android.net.INetworkStackStatusCallback cb); - const int STATUS_UNKNOWN = 0; - const int STATUS_SUCCESS = 1; - const int STATUS_INVALID_ARGUMENT = 2; - const int STATUS_UNKNOWN_ERROR = 3; -} diff --git a/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl b/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl deleted file mode 100644 index dcc4489d52a6..000000000000 --- a/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.dhcp; -interface IDhcpServerCallbacks { - oneway void onDhcpServerCreated(int statusCode, in android.net.dhcp.IDhcpServer server); -} diff --git a/services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl b/services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl deleted file mode 100644 index 95a15742a684..000000000000 --- a/services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl +++ /dev/null @@ -1,14 +0,0 @@ -package android.net.ip; -interface IIpClient { - oneway void completedPreDhcpAction(); - oneway void confirmConfiguration(); - oneway void readPacketFilterComplete(in byte[] data); - oneway void shutdown(); - oneway void startProvisioning(in android.net.ProvisioningConfigurationParcelable req); - oneway void stop(); - oneway void setTcpBufferSizes(in String tcpBufferSizes); - oneway void setHttpProxy(in android.net.ProxyInfo proxyInfo); - oneway void setMulticastFilter(boolean enabled); - oneway void addKeepalivePacketFilter(int slot, in android.net.TcpKeepalivePacketDataParcelable pkt); - oneway void removeKeepalivePacketFilter(int slot); -} diff --git a/services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl b/services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl deleted file mode 100644 index d6bc8089a0be..000000000000 --- a/services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl +++ /dev/null @@ -1,16 +0,0 @@ -package android.net.ip; -interface IIpClientCallbacks { - oneway void onIpClientCreated(in android.net.ip.IIpClient ipClient); - oneway void onPreDhcpAction(); - oneway void onPostDhcpAction(); - oneway void onNewDhcpResults(in android.net.DhcpResultsParcelable dhcpResults); - oneway void onProvisioningSuccess(in android.net.LinkProperties newLp); - oneway void onProvisioningFailure(in android.net.LinkProperties newLp); - oneway void onLinkPropertiesChange(in android.net.LinkProperties newLp); - oneway void onReachabilityLost(in String logMsg); - oneway void onQuit(); - oneway void installPacketFilter(in byte[] filter); - oneway void startReadPacketFilter(); - oneway void setFallbackMulticastFilter(boolean enabled); - oneway void setNeighborDiscoveryOffload(boolean enable); -} diff --git a/services/net/aidl/networkstack/2/android/net/DhcpResultsParcelable.aidl b/services/net/aidl/networkstack/2/android/net/DhcpResultsParcelable.aidl deleted file mode 100644 index 31891de7230a..000000000000 --- a/services/net/aidl/networkstack/2/android/net/DhcpResultsParcelable.aidl +++ /dev/null @@ -1,9 +0,0 @@ -package android.net; -parcelable DhcpResultsParcelable { - android.net.StaticIpConfiguration baseConfiguration; - int leaseDuration; - int mtu; - String serverAddress; - String vendorInfo; - String serverHostName; -} diff --git a/services/net/aidl/networkstack/2/android/net/INetworkMonitor.aidl b/services/net/aidl/networkstack/2/android/net/INetworkMonitor.aidl deleted file mode 100644 index 029968b6f324..000000000000 --- a/services/net/aidl/networkstack/2/android/net/INetworkMonitor.aidl +++ /dev/null @@ -1,24 +0,0 @@ -package android.net; -interface INetworkMonitor { - oneway void start(); - oneway void launchCaptivePortalApp(); - oneway void notifyCaptivePortalAppFinished(int response); - oneway void setAcceptPartialConnectivity(); - oneway void forceReevaluation(int uid); - oneway void notifyPrivateDnsChanged(in android.net.PrivateDnsConfigParcel config); - oneway void notifyDnsResponse(int returnCode); - oneway void notifyNetworkConnected(in android.net.LinkProperties lp, in android.net.NetworkCapabilities nc); - oneway void notifyNetworkDisconnected(); - oneway void notifyLinkPropertiesChanged(in android.net.LinkProperties lp); - oneway void notifyNetworkCapabilitiesChanged(in android.net.NetworkCapabilities nc); - const int NETWORK_TEST_RESULT_VALID = 0; - const int NETWORK_TEST_RESULT_INVALID = 1; - const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2; - const int NETWORK_VALIDATION_RESULT_VALID = 1; - const int NETWORK_VALIDATION_RESULT_PARTIAL = 2; - const int NETWORK_VALIDATION_PROBE_DNS = 4; - const int NETWORK_VALIDATION_PROBE_HTTP = 8; - const int NETWORK_VALIDATION_PROBE_HTTPS = 16; - const int NETWORK_VALIDATION_PROBE_FALLBACK = 32; - const int NETWORK_VALIDATION_PROBE_PRIVDNS = 64; -} diff --git a/services/net/aidl/networkstack/2/android/net/INetworkMonitorCallbacks.aidl b/services/net/aidl/networkstack/2/android/net/INetworkMonitorCallbacks.aidl deleted file mode 100644 index ee9871ddcd15..000000000000 --- a/services/net/aidl/networkstack/2/android/net/INetworkMonitorCallbacks.aidl +++ /dev/null @@ -1,8 +0,0 @@ -package android.net; -interface INetworkMonitorCallbacks { - oneway void onNetworkMonitorCreated(in android.net.INetworkMonitor networkMonitor); - oneway void notifyNetworkTested(int testResult, @nullable String redirectUrl); - oneway void notifyPrivateDnsConfigResolved(in android.net.PrivateDnsConfigParcel config); - oneway void showProvisioningNotification(String action, String packageName); - oneway void hideProvisioningNotification(); -} diff --git a/services/net/aidl/networkstack/2/android/net/INetworkStackConnector.aidl b/services/net/aidl/networkstack/2/android/net/INetworkStackConnector.aidl deleted file mode 100644 index 7da11e476c0e..000000000000 --- a/services/net/aidl/networkstack/2/android/net/INetworkStackConnector.aidl +++ /dev/null @@ -1,7 +0,0 @@ -package android.net; -interface INetworkStackConnector { - oneway void makeDhcpServer(in String ifName, in android.net.dhcp.DhcpServingParamsParcel params, in android.net.dhcp.IDhcpServerCallbacks cb); - oneway void makeNetworkMonitor(in android.net.Network network, String name, in android.net.INetworkMonitorCallbacks cb); - oneway void makeIpClient(in String ifName, in android.net.ip.IIpClientCallbacks callbacks); - oneway void fetchIpMemoryStore(in android.net.IIpMemoryStoreCallbacks cb); -} diff --git a/services/net/aidl/networkstack/2/android/net/INetworkStackStatusCallback.aidl b/services/net/aidl/networkstack/2/android/net/INetworkStackStatusCallback.aidl deleted file mode 100644 index f6ca6f7a78e2..000000000000 --- a/services/net/aidl/networkstack/2/android/net/INetworkStackStatusCallback.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net; -interface INetworkStackStatusCallback { - oneway void onStatusAvailable(int statusCode); -} diff --git a/services/net/aidl/networkstack/2/android/net/InitialConfigurationParcelable.aidl b/services/net/aidl/networkstack/2/android/net/InitialConfigurationParcelable.aidl deleted file mode 100644 index c80a78785b3b..000000000000 --- a/services/net/aidl/networkstack/2/android/net/InitialConfigurationParcelable.aidl +++ /dev/null @@ -1,7 +0,0 @@ -package android.net; -parcelable InitialConfigurationParcelable { - android.net.LinkAddress[] ipAddresses; - android.net.IpPrefix[] directlyConnectedRoutes; - String[] dnsServers; - String gateway; -} diff --git a/services/net/aidl/networkstack/2/android/net/NattKeepalivePacketDataParcelable.aidl b/services/net/aidl/networkstack/2/android/net/NattKeepalivePacketDataParcelable.aidl deleted file mode 100644 index 65de8833e6c5..000000000000 --- a/services/net/aidl/networkstack/2/android/net/NattKeepalivePacketDataParcelable.aidl +++ /dev/null @@ -1,7 +0,0 @@ -package android.net; -parcelable NattKeepalivePacketDataParcelable { - byte[] srcAddress; - int srcPort; - byte[] dstAddress; - int dstPort; -} diff --git a/services/net/aidl/networkstack/2/android/net/PrivateDnsConfigParcel.aidl b/services/net/aidl/networkstack/2/android/net/PrivateDnsConfigParcel.aidl deleted file mode 100644 index 2de790bb7754..000000000000 --- a/services/net/aidl/networkstack/2/android/net/PrivateDnsConfigParcel.aidl +++ /dev/null @@ -1,5 +0,0 @@ -package android.net; -parcelable PrivateDnsConfigParcel { - String hostname; - String[] ips; -} diff --git a/services/net/aidl/networkstack/2/android/net/ProvisioningConfigurationParcelable.aidl b/services/net/aidl/networkstack/2/android/net/ProvisioningConfigurationParcelable.aidl deleted file mode 100644 index 3a6c30496fd8..000000000000 --- a/services/net/aidl/networkstack/2/android/net/ProvisioningConfigurationParcelable.aidl +++ /dev/null @@ -1,15 +0,0 @@ -package android.net; -parcelable ProvisioningConfigurationParcelable { - boolean enableIPv4; - boolean enableIPv6; - boolean usingMultinetworkPolicyTracker; - boolean usingIpReachabilityMonitor; - int requestedPreDhcpActionMs; - android.net.InitialConfigurationParcelable initialConfig; - android.net.StaticIpConfiguration staticIpConfig; - android.net.apf.ApfCapabilities apfCapabilities; - int provisioningTimeoutMs; - int ipv6AddrGenMode; - android.net.Network network; - String displayName; -} diff --git a/services/net/aidl/networkstack/2/android/net/TcpKeepalivePacketDataParcelable.aidl b/services/net/aidl/networkstack/2/android/net/TcpKeepalivePacketDataParcelable.aidl deleted file mode 100644 index e121c064f7ac..000000000000 --- a/services/net/aidl/networkstack/2/android/net/TcpKeepalivePacketDataParcelable.aidl +++ /dev/null @@ -1,13 +0,0 @@ -package android.net; -parcelable TcpKeepalivePacketDataParcelable { - byte[] srcAddress; - int srcPort; - byte[] dstAddress; - int dstPort; - int seq; - int ack; - int rcvWnd; - int rcvWndScale; - int tos; - int ttl; -} diff --git a/services/net/aidl/networkstack/2/android/net/dhcp/DhcpServingParamsParcel.aidl b/services/net/aidl/networkstack/2/android/net/dhcp/DhcpServingParamsParcel.aidl deleted file mode 100644 index 67193ae904bc..000000000000 --- a/services/net/aidl/networkstack/2/android/net/dhcp/DhcpServingParamsParcel.aidl +++ /dev/null @@ -1,11 +0,0 @@ -package android.net.dhcp; -parcelable DhcpServingParamsParcel { - int serverAddr; - int serverAddrPrefixLength; - int[] defaultRouters; - int[] dnsServers; - int[] excludedAddrs; - long dhcpLeaseTimeSecs; - int linkMtu; - boolean metered; -} diff --git a/services/net/aidl/networkstack/2/android/net/dhcp/IDhcpServer.aidl b/services/net/aidl/networkstack/2/android/net/dhcp/IDhcpServer.aidl deleted file mode 100644 index 914315855496..000000000000 --- a/services/net/aidl/networkstack/2/android/net/dhcp/IDhcpServer.aidl +++ /dev/null @@ -1,10 +0,0 @@ -package android.net.dhcp; -interface IDhcpServer { - oneway void start(in android.net.INetworkStackStatusCallback cb); - oneway void updateParams(in android.net.dhcp.DhcpServingParamsParcel params, in android.net.INetworkStackStatusCallback cb); - oneway void stop(in android.net.INetworkStackStatusCallback cb); - const int STATUS_UNKNOWN = 0; - const int STATUS_SUCCESS = 1; - const int STATUS_INVALID_ARGUMENT = 2; - const int STATUS_UNKNOWN_ERROR = 3; -} diff --git a/services/net/aidl/networkstack/2/android/net/dhcp/IDhcpServerCallbacks.aidl b/services/net/aidl/networkstack/2/android/net/dhcp/IDhcpServerCallbacks.aidl deleted file mode 100644 index dcc4489d52a6..000000000000 --- a/services/net/aidl/networkstack/2/android/net/dhcp/IDhcpServerCallbacks.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package android.net.dhcp; -interface IDhcpServerCallbacks { - oneway void onDhcpServerCreated(int statusCode, in android.net.dhcp.IDhcpServer server); -} diff --git a/services/net/aidl/networkstack/2/android/net/ip/IIpClient.aidl b/services/net/aidl/networkstack/2/android/net/ip/IIpClient.aidl deleted file mode 100644 index 77d5917de913..000000000000 --- a/services/net/aidl/networkstack/2/android/net/ip/IIpClient.aidl +++ /dev/null @@ -1,15 +0,0 @@ -package android.net.ip; -interface IIpClient { - oneway void completedPreDhcpAction(); - oneway void confirmConfiguration(); - oneway void readPacketFilterComplete(in byte[] data); - oneway void shutdown(); - oneway void startProvisioning(in android.net.ProvisioningConfigurationParcelable req); - oneway void stop(); - oneway void setTcpBufferSizes(in String tcpBufferSizes); - oneway void setHttpProxy(in android.net.ProxyInfo proxyInfo); - oneway void setMulticastFilter(boolean enabled); - oneway void addKeepalivePacketFilter(int slot, in android.net.TcpKeepalivePacketDataParcelable pkt); - oneway void removeKeepalivePacketFilter(int slot); - oneway void setL2KeyAndGroupHint(in String l2Key, in String groupHint); -} diff --git a/services/net/aidl/networkstack/2/android/net/ip/IIpClientCallbacks.aidl b/services/net/aidl/networkstack/2/android/net/ip/IIpClientCallbacks.aidl deleted file mode 100644 index d6bc8089a0be..000000000000 --- a/services/net/aidl/networkstack/2/android/net/ip/IIpClientCallbacks.aidl +++ /dev/null @@ -1,16 +0,0 @@ -package android.net.ip; -interface IIpClientCallbacks { - oneway void onIpClientCreated(in android.net.ip.IIpClient ipClient); - oneway void onPreDhcpAction(); - oneway void onPostDhcpAction(); - oneway void onNewDhcpResults(in android.net.DhcpResultsParcelable dhcpResults); - oneway void onProvisioningSuccess(in android.net.LinkProperties newLp); - oneway void onProvisioningFailure(in android.net.LinkProperties newLp); - oneway void onLinkPropertiesChange(in android.net.LinkProperties newLp); - oneway void onReachabilityLost(in String logMsg); - oneway void onQuit(); - oneway void installPacketFilter(in byte[] filter); - oneway void startReadPacketFilter(); - oneway void setFallbackMulticastFilter(boolean enabled); - oneway void setNeighborDiscoveryOffload(boolean enable); -} diff --git a/services/net/aidl/networkstack/3/android/net/DhcpResultsParcelable.aidl b/services/net/aidl/networkstack/3/android/net/DhcpResultsParcelable.aidl deleted file mode 100644 index 07ff32111bb1..000000000000 --- a/services/net/aidl/networkstack/3/android/net/DhcpResultsParcelable.aidl +++ /dev/null @@ -1,26 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -parcelable DhcpResultsParcelable { - android.net.StaticIpConfiguration baseConfiguration; - int leaseDuration; - int mtu; - String serverAddress; - String vendorInfo; - String serverHostName; -} diff --git a/services/net/aidl/networkstack/3/android/net/INetworkMonitor.aidl b/services/net/aidl/networkstack/3/android/net/INetworkMonitor.aidl deleted file mode 100644 index 8aa68bd1c7bf..000000000000 --- a/services/net/aidl/networkstack/3/android/net/INetworkMonitor.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -interface INetworkMonitor { - oneway void start(); - oneway void launchCaptivePortalApp(); - oneway void notifyCaptivePortalAppFinished(int response); - oneway void setAcceptPartialConnectivity(); - oneway void forceReevaluation(int uid); - oneway void notifyPrivateDnsChanged(in android.net.PrivateDnsConfigParcel config); - oneway void notifyDnsResponse(int returnCode); - oneway void notifyNetworkConnected(in android.net.LinkProperties lp, in android.net.NetworkCapabilities nc); - oneway void notifyNetworkDisconnected(); - oneway void notifyLinkPropertiesChanged(in android.net.LinkProperties lp); - oneway void notifyNetworkCapabilitiesChanged(in android.net.NetworkCapabilities nc); - const int NETWORK_TEST_RESULT_VALID = 0; - const int NETWORK_TEST_RESULT_INVALID = 1; - const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2; - const int NETWORK_VALIDATION_RESULT_VALID = 1; - const int NETWORK_VALIDATION_RESULT_PARTIAL = 2; - const int NETWORK_VALIDATION_PROBE_DNS = 4; - const int NETWORK_VALIDATION_PROBE_HTTP = 8; - const int NETWORK_VALIDATION_PROBE_HTTPS = 16; - const int NETWORK_VALIDATION_PROBE_FALLBACK = 32; - const int NETWORK_VALIDATION_PROBE_PRIVDNS = 64; -} diff --git a/services/net/aidl/networkstack/3/android/net/INetworkMonitorCallbacks.aidl b/services/net/aidl/networkstack/3/android/net/INetworkMonitorCallbacks.aidl deleted file mode 100644 index ea93729da5e7..000000000000 --- a/services/net/aidl/networkstack/3/android/net/INetworkMonitorCallbacks.aidl +++ /dev/null @@ -1,25 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -interface INetworkMonitorCallbacks { - oneway void onNetworkMonitorCreated(in android.net.INetworkMonitor networkMonitor); - oneway void notifyNetworkTested(int testResult, @nullable String redirectUrl); - oneway void notifyPrivateDnsConfigResolved(in android.net.PrivateDnsConfigParcel config); - oneway void showProvisioningNotification(String action, String packageName); - oneway void hideProvisioningNotification(); -} diff --git a/services/net/aidl/networkstack/3/android/net/INetworkStackConnector.aidl b/services/net/aidl/networkstack/3/android/net/INetworkStackConnector.aidl deleted file mode 100644 index e3a83d17eb0b..000000000000 --- a/services/net/aidl/networkstack/3/android/net/INetworkStackConnector.aidl +++ /dev/null @@ -1,24 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -interface INetworkStackConnector { - oneway void makeDhcpServer(in String ifName, in android.net.dhcp.DhcpServingParamsParcel params, in android.net.dhcp.IDhcpServerCallbacks cb); - oneway void makeNetworkMonitor(in android.net.Network network, String name, in android.net.INetworkMonitorCallbacks cb); - oneway void makeIpClient(in String ifName, in android.net.ip.IIpClientCallbacks callbacks); - oneway void fetchIpMemoryStore(in android.net.IIpMemoryStoreCallbacks cb); -} diff --git a/services/net/aidl/networkstack/3/android/net/INetworkStackStatusCallback.aidl b/services/net/aidl/networkstack/3/android/net/INetworkStackStatusCallback.aidl deleted file mode 100644 index 3112a081735a..000000000000 --- a/services/net/aidl/networkstack/3/android/net/INetworkStackStatusCallback.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -interface INetworkStackStatusCallback { - oneway void onStatusAvailable(int statusCode); -} diff --git a/services/net/aidl/networkstack/3/android/net/InitialConfigurationParcelable.aidl b/services/net/aidl/networkstack/3/android/net/InitialConfigurationParcelable.aidl deleted file mode 100644 index f846b26af808..000000000000 --- a/services/net/aidl/networkstack/3/android/net/InitialConfigurationParcelable.aidl +++ /dev/null @@ -1,24 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -parcelable InitialConfigurationParcelable { - android.net.LinkAddress[] ipAddresses; - android.net.IpPrefix[] directlyConnectedRoutes; - String[] dnsServers; - String gateway; -} diff --git a/services/net/aidl/networkstack/3/android/net/NattKeepalivePacketDataParcelable.aidl b/services/net/aidl/networkstack/3/android/net/NattKeepalivePacketDataParcelable.aidl deleted file mode 100644 index de75940f5a50..000000000000 --- a/services/net/aidl/networkstack/3/android/net/NattKeepalivePacketDataParcelable.aidl +++ /dev/null @@ -1,24 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -parcelable NattKeepalivePacketDataParcelable { - byte[] srcAddress; - int srcPort; - byte[] dstAddress; - int dstPort; -} diff --git a/services/net/aidl/networkstack/3/android/net/PrivateDnsConfigParcel.aidl b/services/net/aidl/networkstack/3/android/net/PrivateDnsConfigParcel.aidl deleted file mode 100644 index cf0fbce94c91..000000000000 --- a/services/net/aidl/networkstack/3/android/net/PrivateDnsConfigParcel.aidl +++ /dev/null @@ -1,22 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -parcelable PrivateDnsConfigParcel { - String hostname; - String[] ips; -} diff --git a/services/net/aidl/networkstack/3/android/net/ProvisioningConfigurationParcelable.aidl b/services/net/aidl/networkstack/3/android/net/ProvisioningConfigurationParcelable.aidl deleted file mode 100644 index c0f2d4d1747e..000000000000 --- a/services/net/aidl/networkstack/3/android/net/ProvisioningConfigurationParcelable.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -parcelable ProvisioningConfigurationParcelable { - boolean enableIPv4; - boolean enableIPv6; - boolean usingMultinetworkPolicyTracker; - boolean usingIpReachabilityMonitor; - int requestedPreDhcpActionMs; - android.net.InitialConfigurationParcelable initialConfig; - android.net.StaticIpConfiguration staticIpConfig; - android.net.apf.ApfCapabilities apfCapabilities; - int provisioningTimeoutMs; - int ipv6AddrGenMode; - android.net.Network network; - String displayName; -} diff --git a/services/net/aidl/networkstack/3/android/net/TcpKeepalivePacketDataParcelable.aidl b/services/net/aidl/networkstack/3/android/net/TcpKeepalivePacketDataParcelable.aidl deleted file mode 100644 index 5926794c2e8a..000000000000 --- a/services/net/aidl/networkstack/3/android/net/TcpKeepalivePacketDataParcelable.aidl +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net; -parcelable TcpKeepalivePacketDataParcelable { - byte[] srcAddress; - int srcPort; - byte[] dstAddress; - int dstPort; - int seq; - int ack; - int rcvWnd; - int rcvWndScale; - int tos; - int ttl; -} diff --git a/services/net/aidl/networkstack/3/android/net/dhcp/DhcpServingParamsParcel.aidl b/services/net/aidl/networkstack/3/android/net/dhcp/DhcpServingParamsParcel.aidl deleted file mode 100644 index 7ab156f10553..000000000000 --- a/services/net/aidl/networkstack/3/android/net/dhcp/DhcpServingParamsParcel.aidl +++ /dev/null @@ -1,28 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.dhcp; -parcelable DhcpServingParamsParcel { - int serverAddr; - int serverAddrPrefixLength; - int[] defaultRouters; - int[] dnsServers; - int[] excludedAddrs; - long dhcpLeaseTimeSecs; - int linkMtu; - boolean metered; -} diff --git a/services/net/aidl/networkstack/3/android/net/dhcp/IDhcpServer.aidl b/services/net/aidl/networkstack/3/android/net/dhcp/IDhcpServer.aidl deleted file mode 100644 index d281ecfee61d..000000000000 --- a/services/net/aidl/networkstack/3/android/net/dhcp/IDhcpServer.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.dhcp; -interface IDhcpServer { - oneway void start(in android.net.INetworkStackStatusCallback cb); - oneway void updateParams(in android.net.dhcp.DhcpServingParamsParcel params, in android.net.INetworkStackStatusCallback cb); - oneway void stop(in android.net.INetworkStackStatusCallback cb); - const int STATUS_UNKNOWN = 0; - const int STATUS_SUCCESS = 1; - const int STATUS_INVALID_ARGUMENT = 2; - const int STATUS_UNKNOWN_ERROR = 3; -} diff --git a/services/net/aidl/networkstack/3/android/net/dhcp/IDhcpServerCallbacks.aidl b/services/net/aidl/networkstack/3/android/net/dhcp/IDhcpServerCallbacks.aidl deleted file mode 100644 index 98be0ab1d540..000000000000 --- a/services/net/aidl/networkstack/3/android/net/dhcp/IDhcpServerCallbacks.aidl +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.dhcp; -interface IDhcpServerCallbacks { - oneway void onDhcpServerCreated(int statusCode, in android.net.dhcp.IDhcpServer server); -} diff --git a/services/net/aidl/networkstack/3/android/net/ip/IIpClient.aidl b/services/net/aidl/networkstack/3/android/net/ip/IIpClient.aidl deleted file mode 100644 index 85c8676ab8d0..000000000000 --- a/services/net/aidl/networkstack/3/android/net/ip/IIpClient.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ip; -interface IIpClient { - oneway void completedPreDhcpAction(); - oneway void confirmConfiguration(); - oneway void readPacketFilterComplete(in byte[] data); - oneway void shutdown(); - oneway void startProvisioning(in android.net.ProvisioningConfigurationParcelable req); - oneway void stop(); - oneway void setTcpBufferSizes(in String tcpBufferSizes); - oneway void setHttpProxy(in android.net.ProxyInfo proxyInfo); - oneway void setMulticastFilter(boolean enabled); - oneway void addKeepalivePacketFilter(int slot, in android.net.TcpKeepalivePacketDataParcelable pkt); - oneway void removeKeepalivePacketFilter(int slot); - oneway void setL2KeyAndGroupHint(in String l2Key, in String groupHint); - oneway void addNattKeepalivePacketFilter(int slot, in android.net.NattKeepalivePacketDataParcelable pkt); -} diff --git a/services/net/aidl/networkstack/3/android/net/ip/IIpClientCallbacks.aidl b/services/net/aidl/networkstack/3/android/net/ip/IIpClientCallbacks.aidl deleted file mode 100644 index 7fe39ed1ed7a..000000000000 --- a/services/net/aidl/networkstack/3/android/net/ip/IIpClientCallbacks.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a frozen snapshot of an AIDL interface (or parcelable). Do not -// try to edit this file. It looks like you are doing that because you have -// modified an AIDL interface in a backward-incompatible way, e.g., deleting a -// function from an interface or a field from a parcelable and it broke the -// build. That breakage is intended. -// -// You must not make a backward incompatible changes to the AIDL files built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.net.ip; -interface IIpClientCallbacks { - oneway void onIpClientCreated(in android.net.ip.IIpClient ipClient); - oneway void onPreDhcpAction(); - oneway void onPostDhcpAction(); - oneway void onNewDhcpResults(in android.net.DhcpResultsParcelable dhcpResults); - oneway void onProvisioningSuccess(in android.net.LinkProperties newLp); - oneway void onProvisioningFailure(in android.net.LinkProperties newLp); - oneway void onLinkPropertiesChange(in android.net.LinkProperties newLp); - oneway void onReachabilityLost(in String logMsg); - oneway void onQuit(); - oneway void installPacketFilter(in byte[] filter); - oneway void startReadPacketFilter(); - oneway void setFallbackMulticastFilter(boolean enabled); - oneway void setNeighborDiscoveryOffload(boolean enable); -} diff --git a/services/net/java/android/net/DhcpResultsParcelable.aidl b/services/net/java/android/net/DhcpResultsParcelable.aidl deleted file mode 100644 index c98d9c201342..000000000000 --- a/services/net/java/android/net/DhcpResultsParcelable.aidl +++ /dev/null @@ -1,28 +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 perNmissions and - * limitations under the License. - */ - -package android.net; - -import android.net.StaticIpConfiguration; - -parcelable DhcpResultsParcelable { - StaticIpConfiguration baseConfiguration; - int leaseDuration; - int mtu; - String serverAddress; - String vendorInfo; - String serverHostName; -} diff --git a/services/net/java/android/net/IIpMemoryStore.aidl b/services/net/java/android/net/IIpMemoryStore.aidl deleted file mode 100644 index add221ae2e01..000000000000 --- a/services/net/java/android/net/IIpMemoryStore.aidl +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net; - -import android.net.ipmemorystore.Blob; -import android.net.ipmemorystore.NetworkAttributesParcelable; -import android.net.ipmemorystore.IOnBlobRetrievedListener; -import android.net.ipmemorystore.IOnL2KeyResponseListener; -import android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener; -import android.net.ipmemorystore.IOnSameL3NetworkResponseListener; -import android.net.ipmemorystore.IOnStatusListener; - -/** {@hide} */ -oneway interface IIpMemoryStore { - /** - * Store network attributes for a given L2 key. - * If L2Key is null, choose automatically from the attributes ; passing null is equivalent to - * calling findL2Key with the attributes and storing in the returned value. - * - * @param l2Key The L2 key for the L2 network. Clients that don't know or care about the L2 - * key and only care about grouping can pass a unique ID here like the ones - * generated by {@code java.util.UUID.randomUUID()}, but keep in mind the low - * relevance of such a network will lead to it being evicted soon if it's not - * refreshed. Use findL2Key to try and find a similar L2Key to these attributes. - * @param attributes The attributes for this network. - * @param listener A listener that will be invoked to inform of the completion of this call, - * or null if the client is not interested in learning about success/failure. - * @return (through the listener) The L2 key. This is useful if the L2 key was not specified. - * If the call failed, the L2 key will be null. - */ - void storeNetworkAttributes(String l2Key, in NetworkAttributesParcelable attributes, - IOnStatusListener listener); - - /** - * Store a binary blob associated with an L2 key and a name. - * - * @param l2Key The L2 key for this network. - * @param clientId The ID of the client. - * @param name The name of this data. - * @param data The data to store. - * @param listener A listener to inform of the completion of this call, or null if the client - * is not interested in learning about success/failure. - * @return (through the listener) A status to indicate success or failure. - */ - void storeBlob(String l2Key, String clientId, String name, in Blob data, - IOnStatusListener listener); - - /** - * Returns the best L2 key associated with the attributes. - * - * This will find a record that would be in the same group as the passed attributes. This is - * useful to choose the key for storing a sample or private data when the L2 key is not known. - * If multiple records are group-close to these attributes, the closest match is returned. - * If multiple records have the same closeness, the one with the smaller (unicode codepoint - * order) L2 key is returned. - * If no record matches these attributes, null is returned. - * - * @param attributes The attributes of the network to find. - * @param listener The listener that will be invoked to return the answer. - * @return (through the listener) The L2 key if one matched, or null. - */ - void findL2Key(in NetworkAttributesParcelable attributes, IOnL2KeyResponseListener listener); - - /** - * Returns whether, to the best of the store's ability to tell, the two specified L2 keys point - * to the same L3 network. Group-closeness is used to determine this. - * - * @param l2Key1 The key for the first network. - * @param l2Key2 The key for the second network. - * @param listener The listener that will be invoked to return the answer. - * @return (through the listener) A SameL3NetworkResponse containing the answer and confidence. - */ - void isSameNetwork(String l2Key1, String l2Key2, IOnSameL3NetworkResponseListener listener); - - /** - * Retrieve the network attributes for a key. - * If no record is present for this key, this will return null attributes. - * - * @param l2Key The key of the network to query. - * @param listener The listener that will be invoked to return the answer. - * @return (through the listener) The network attributes and the L2 key associated with - * the query. - */ - void retrieveNetworkAttributes(String l2Key, IOnNetworkAttributesRetrievedListener listener); - - /** - * Retrieve previously stored private data. - * If no data was stored for this L2 key and name this will return null. - * - * @param l2Key The L2 key. - * @param clientId The id of the client that stored this data. - * @param name The name of the data. - * @param listener The listener that will be invoked to return the answer. - * @return (through the listener) The private data (or null), with the L2 key - * and the name of the data associated with the query. - */ - void retrieveBlob(String l2Key, String clientId, String name, - IOnBlobRetrievedListener listener); - - /** - * Delete all data because a factory reset operation is in progress. - */ - void factoryReset(); -} diff --git a/services/net/java/android/net/INetworkMonitor.aidl b/services/net/java/android/net/INetworkMonitor.aidl deleted file mode 100644 index 3fc81a3dadc5..000000000000 --- a/services/net/java/android/net/INetworkMonitor.aidl +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright (c) 2018, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing perNmissions and - * limitations under the License. - */ -package android.net; - -import android.net.LinkProperties; -import android.net.NetworkCapabilities; -import android.net.PrivateDnsConfigParcel; - -/** @hide */ -oneway interface INetworkMonitor { - // After a network has been tested this result can be sent with EVENT_NETWORK_TESTED. - // The network should be used as a default internet connection. It was found to be: - // 1. a functioning network providing internet access, or - // 2. a captive portal and the user decided to use it as is. - const int NETWORK_TEST_RESULT_VALID = 0; - - // After a network has been tested this result can be sent with EVENT_NETWORK_TESTED. - // The network should not be used as a default internet connection. It was found to be: - // 1. a captive portal and the user is prompted to sign-in, or - // 2. a captive portal and the user did not want to use it, or - // 3. a broken network (e.g. DNS failed, connect failed, HTTP request failed). - const int NETWORK_TEST_RESULT_INVALID = 1; - - // After a network has been tested, this result can be sent with EVENT_NETWORK_TESTED. - // The network may be used as a default internet connection, but it was found to be a partial - // connectivity network which can get the pass result for http probe but get the failed result - // for https probe. - const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2; - - // Network validation flags indicate probe result and types. If no NETWORK_VALIDATION_RESULT_* - // are set, then it's equal to NETWORK_TEST_RESULT_INVALID. If NETWORK_VALIDATION_RESULT_VALID - // is set, then the network validates and equal to NETWORK_TEST_RESULT_VALID. If - // NETWORK_VALIDATION_RESULT_PARTIAL is set, then the network has partial connectivity which - // is equal to NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY. NETWORK_VALIDATION_PROBE_* is set - // when the specific probe result of the network is resolved. - const int NETWORK_VALIDATION_RESULT_VALID = 0x01; - const int NETWORK_VALIDATION_RESULT_PARTIAL = 0x02; - const int NETWORK_VALIDATION_PROBE_DNS = 0x04; - const int NETWORK_VALIDATION_PROBE_HTTP = 0x08; - const int NETWORK_VALIDATION_PROBE_HTTPS = 0x10; - const int NETWORK_VALIDATION_PROBE_FALLBACK = 0x20; - const int NETWORK_VALIDATION_PROBE_PRIVDNS = 0x40; - - void start(); - void launchCaptivePortalApp(); - void notifyCaptivePortalAppFinished(int response); - void setAcceptPartialConnectivity(); - void forceReevaluation(int uid); - void notifyPrivateDnsChanged(in PrivateDnsConfigParcel config); - void notifyDnsResponse(int returnCode); - void notifyNetworkConnected(in LinkProperties lp, in NetworkCapabilities nc); - void notifyNetworkDisconnected(); - void notifyLinkPropertiesChanged(in LinkProperties lp); - void notifyNetworkCapabilitiesChanged(in NetworkCapabilities nc); -} diff --git a/services/net/java/android/net/INetworkMonitorCallbacks.aidl b/services/net/java/android/net/INetworkMonitorCallbacks.aidl deleted file mode 100644 index 2c61511feb72..000000000000 --- a/services/net/java/android/net/INetworkMonitorCallbacks.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net; - -import android.net.INetworkMonitor; -import android.net.PrivateDnsConfigParcel; - -/** @hide */ -oneway interface INetworkMonitorCallbacks { - void onNetworkMonitorCreated(in INetworkMonitor networkMonitor); - void notifyNetworkTested(int testResult, @nullable String redirectUrl); - void notifyPrivateDnsConfigResolved(in PrivateDnsConfigParcel config); - void showProvisioningNotification(String action, String packageName); - void hideProvisioningNotification(); -}
\ No newline at end of file diff --git a/services/net/java/android/net/INetworkStackConnector.aidl b/services/net/java/android/net/INetworkStackConnector.aidl deleted file mode 100644 index 3751c36d6ee9..000000000000 --- a/services/net/java/android/net/INetworkStackConnector.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) 2018, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing perNmissions and - * limitations under the License. - */ -package android.net; - -import android.net.IIpMemoryStoreCallbacks; -import android.net.INetworkMonitorCallbacks; -import android.net.Network; -import android.net.dhcp.DhcpServingParamsParcel; -import android.net.dhcp.IDhcpServerCallbacks; -import android.net.ip.IIpClientCallbacks; - -/** @hide */ -oneway interface INetworkStackConnector { - void makeDhcpServer(in String ifName, in DhcpServingParamsParcel params, - in IDhcpServerCallbacks cb); - void makeNetworkMonitor(in Network network, String name, in INetworkMonitorCallbacks cb); - void makeIpClient(in String ifName, in IIpClientCallbacks callbacks); - void fetchIpMemoryStore(in IIpMemoryStoreCallbacks cb); -} diff --git a/services/net/java/android/net/INetworkStackStatusCallback.aidl b/services/net/java/android/net/INetworkStackStatusCallback.aidl deleted file mode 100644 index 51032d80a172..000000000000 --- a/services/net/java/android/net/INetworkStackStatusCallback.aidl +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net; - -/** @hide */ -oneway interface INetworkStackStatusCallback { - void onStatusAvailable(int statusCode); -}
\ No newline at end of file diff --git a/services/net/java/android/net/InitialConfigurationParcelable.aidl b/services/net/java/android/net/InitialConfigurationParcelable.aidl deleted file mode 100644 index 3fa88c377a64..000000000000 --- a/services/net/java/android/net/InitialConfigurationParcelable.aidl +++ /dev/null @@ -1,27 +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 android.net; - -import android.net.IpPrefix; -import android.net.LinkAddress; - -parcelable InitialConfigurationParcelable { - LinkAddress[] ipAddresses; - IpPrefix[] directlyConnectedRoutes; - String[] dnsServers; - String gateway; -}
\ No newline at end of file diff --git a/services/net/java/android/net/IpMemoryStoreClient.java b/services/net/java/android/net/IpMemoryStoreClient.java deleted file mode 100644 index 014b5289bace..000000000000 --- a/services/net/java/android/net/IpMemoryStoreClient.java +++ /dev/null @@ -1,227 +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 android.net; - -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.content.Context; -import android.net.ipmemorystore.Blob; -import android.net.ipmemorystore.NetworkAttributes; -import android.net.ipmemorystore.OnBlobRetrievedListener; -import android.net.ipmemorystore.OnL2KeyResponseListener; -import android.net.ipmemorystore.OnNetworkAttributesRetrievedListener; -import android.net.ipmemorystore.OnSameL3NetworkResponseListener; -import android.net.ipmemorystore.OnStatusListener; -import android.net.ipmemorystore.Status; -import android.os.RemoteException; -import android.util.Log; - -import java.util.concurrent.ExecutionException; -import java.util.function.Consumer; - -/** - * service used to communicate with the ip memory store service in network stack, - * which is running in a separate module. - * @hide - */ -public abstract class IpMemoryStoreClient { - private static final String TAG = IpMemoryStoreClient.class.getSimpleName(); - private final Context mContext; - - public IpMemoryStoreClient(@NonNull final Context context) { - if (context == null) throw new IllegalArgumentException("missing context"); - mContext = context; - } - - protected abstract void runWhenServiceReady(Consumer<IIpMemoryStore> cb) - throws ExecutionException; - - @FunctionalInterface - private interface ThrowingRunnable { - void run() throws RemoteException; - } - - private void ignoringRemoteException(ThrowingRunnable r) { - ignoringRemoteException("Failed to execute remote procedure call", r); - } - - private void ignoringRemoteException(String message, ThrowingRunnable r) { - try { - r.run(); - } catch (RemoteException e) { - Log.e(TAG, message, e); - } - } - - /** - * Store network attributes for a given L2 key. - * If L2Key is null, choose automatically from the attributes ; passing null is equivalent to - * calling findL2Key with the attributes and storing in the returned value. - * - * @param l2Key The L2 key for the L2 network. Clients that don't know or care about the L2 - * key and only care about grouping can pass a unique ID here like the ones - * generated by {@code java.util.UUID.randomUUID()}, but keep in mind the low - * relevance of such a network will lead to it being evicted soon if it's not - * refreshed. Use findL2Key to try and find a similar L2Key to these attributes. - * @param attributes The attributes for this network. - * @param listener A listener that will be invoked to inform of the completion of this call, - * or null if the client is not interested in learning about success/failure. - * Through the listener, returns the L2 key. This is useful if the L2 key was not specified. - * If the call failed, the L2 key will be null. - */ - public void storeNetworkAttributes(@NonNull final String l2Key, - @NonNull final NetworkAttributes attributes, - @Nullable final OnStatusListener listener) { - try { - runWhenServiceReady(service -> ignoringRemoteException( - () -> service.storeNetworkAttributes(l2Key, attributes.toParcelable(), - OnStatusListener.toAIDL(listener)))); - } catch (ExecutionException m) { - ignoringRemoteException("Error storing network attributes", - () -> listener.onComplete(new Status(Status.ERROR_UNKNOWN))); - } - } - - /** - * Store a binary blob associated with an L2 key and a name. - * - * @param l2Key The L2 key for this network. - * @param clientId The ID of the client. - * @param name The name of this data. - * @param data The data to store. - * @param listener A listener to inform of the completion of this call, or null if the client - * is not interested in learning about success/failure. - * Through the listener, returns a status to indicate success or failure. - */ - public void storeBlob(@NonNull final String l2Key, @NonNull final String clientId, - @NonNull final String name, @NonNull final Blob data, - @Nullable final OnStatusListener listener) { - try { - runWhenServiceReady(service -> ignoringRemoteException( - () -> service.storeBlob(l2Key, clientId, name, data, - OnStatusListener.toAIDL(listener)))); - } catch (ExecutionException m) { - ignoringRemoteException("Error storing blob", - () -> listener.onComplete(new Status(Status.ERROR_UNKNOWN))); - } - } - - /** - * Returns the best L2 key associated with the attributes. - * - * This will find a record that would be in the same group as the passed attributes. This is - * useful to choose the key for storing a sample or private data when the L2 key is not known. - * If multiple records are group-close to these attributes, the closest match is returned. - * If multiple records have the same closeness, the one with the smaller (unicode codepoint - * order) L2 key is returned. - * If no record matches these attributes, null is returned. - * - * @param attributes The attributes of the network to find. - * @param listener The listener that will be invoked to return the answer. - * Through the listener, returns the L2 key if one matched, or null. - */ - public void findL2Key(@NonNull final NetworkAttributes attributes, - @NonNull final OnL2KeyResponseListener listener) { - try { - runWhenServiceReady(service -> ignoringRemoteException( - () -> service.findL2Key(attributes.toParcelable(), - OnL2KeyResponseListener.toAIDL(listener)))); - } catch (ExecutionException m) { - ignoringRemoteException("Error finding L2 Key", - () -> listener.onL2KeyResponse(new Status(Status.ERROR_UNKNOWN), null)); - } - } - - /** - * Returns whether, to the best of the store's ability to tell, the two specified L2 keys point - * to the same L3 network. Group-closeness is used to determine this. - * - * @param l2Key1 The key for the first network. - * @param l2Key2 The key for the second network. - * @param listener The listener that will be invoked to return the answer. - * Through the listener, a SameL3NetworkResponse containing the answer and confidence. - */ - public void isSameNetwork(@NonNull final String l2Key1, @NonNull final String l2Key2, - @NonNull final OnSameL3NetworkResponseListener listener) { - try { - runWhenServiceReady(service -> ignoringRemoteException( - () -> service.isSameNetwork(l2Key1, l2Key2, - OnSameL3NetworkResponseListener.toAIDL(listener)))); - } catch (ExecutionException m) { - ignoringRemoteException("Error checking for network sameness", - () -> listener.onSameL3NetworkResponse(new Status(Status.ERROR_UNKNOWN), null)); - } - } - - /** - * Retrieve the network attributes for a key. - * If no record is present for this key, this will return null attributes. - * - * @param l2Key The key of the network to query. - * @param listener The listener that will be invoked to return the answer. - * Through the listener, returns the network attributes and the L2 key associated with - * the query. - */ - public void retrieveNetworkAttributes(@NonNull final String l2Key, - @NonNull final OnNetworkAttributesRetrievedListener listener) { - try { - runWhenServiceReady(service -> ignoringRemoteException( - () -> service.retrieveNetworkAttributes(l2Key, - OnNetworkAttributesRetrievedListener.toAIDL(listener)))); - } catch (ExecutionException m) { - ignoringRemoteException("Error retrieving network attributes", - () -> listener.onNetworkAttributesRetrieved(new Status(Status.ERROR_UNKNOWN), - null, null)); - } - } - - /** - * Retrieve previously stored private data. - * If no data was stored for this L2 key and name this will return null. - * - * @param l2Key The L2 key. - * @param clientId The id of the client that stored this data. - * @param name The name of the data. - * @param listener The listener that will be invoked to return the answer. - * Through the listener, returns the private data (or null), with the L2 key - * and the name of the data associated with the query. - */ - public void retrieveBlob(@NonNull final String l2Key, @NonNull final String clientId, - @NonNull final String name, @NonNull final OnBlobRetrievedListener listener) { - try { - runWhenServiceReady(service -> ignoringRemoteException( - () -> service.retrieveBlob(l2Key, clientId, name, - OnBlobRetrievedListener.toAIDL(listener)))); - } catch (ExecutionException m) { - ignoringRemoteException("Error retrieving blob", - () -> listener.onBlobRetrieved(new Status(Status.ERROR_UNKNOWN), - null, null, null)); - } - } - - /** - * Wipe the data in the database upon network factory reset. - */ - public void factoryReset() { - try { - runWhenServiceReady(service -> ignoringRemoteException( - () -> service.factoryReset())); - } catch (ExecutionException m) { - Log.e(TAG, "Error executing factory reset", m); - } - } -} diff --git a/services/net/java/android/net/PrivateDnsConfigParcel.aidl b/services/net/java/android/net/PrivateDnsConfigParcel.aidl deleted file mode 100644 index b52fce643302..000000000000 --- a/services/net/java/android/net/PrivateDnsConfigParcel.aidl +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net; - -parcelable PrivateDnsConfigParcel { - String hostname; - String[] ips; -} diff --git a/services/net/java/android/net/ProvisioningConfigurationParcelable.aidl b/services/net/java/android/net/ProvisioningConfigurationParcelable.aidl deleted file mode 100644 index 99606fb4b7a2..000000000000 --- a/services/net/java/android/net/ProvisioningConfigurationParcelable.aidl +++ /dev/null @@ -1,38 +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 android.net; - -import android.net.InitialConfigurationParcelable; -import android.net.Network; -import android.net.StaticIpConfiguration; -import android.net.apf.ApfCapabilities; - -parcelable ProvisioningConfigurationParcelable { - boolean enableIPv4; - boolean enableIPv6; - boolean usingMultinetworkPolicyTracker; - boolean usingIpReachabilityMonitor; - int requestedPreDhcpActionMs; - InitialConfigurationParcelable initialConfig; - StaticIpConfiguration staticIpConfig; - ApfCapabilities apfCapabilities; - int provisioningTimeoutMs; - int ipv6AddrGenMode; - Network network; - String displayName; -} diff --git a/services/net/java/android/net/dhcp/DhcpServingParamsParcel.aidl b/services/net/java/android/net/dhcp/DhcpServingParamsParcel.aidl deleted file mode 100644 index 7b8b9ee324bc..000000000000 --- a/services/net/java/android/net/dhcp/DhcpServingParamsParcel.aidl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.dhcp; - -parcelable DhcpServingParamsParcel { - int serverAddr; - int serverAddrPrefixLength; - int[] defaultRouters; - int[] dnsServers; - int[] excludedAddrs; - long dhcpLeaseTimeSecs; - int linkMtu; - boolean metered; -} - diff --git a/services/net/java/android/net/dhcp/IDhcpServer.aidl b/services/net/java/android/net/dhcp/IDhcpServer.aidl deleted file mode 100644 index 559433b13962..000000000000 --- a/services/net/java/android/net/dhcp/IDhcpServer.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) 2018, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing perNmissions and - * limitations under the License. - */ - -package android.net.dhcp; - -import android.net.INetworkStackStatusCallback; -import android.net.dhcp.DhcpServingParamsParcel; - -/** @hide */ -oneway interface IDhcpServer { - const int STATUS_UNKNOWN = 0; - const int STATUS_SUCCESS = 1; - const int STATUS_INVALID_ARGUMENT = 2; - const int STATUS_UNKNOWN_ERROR = 3; - - void start(in INetworkStackStatusCallback cb); - void updateParams(in DhcpServingParamsParcel params, in INetworkStackStatusCallback cb); - void stop(in INetworkStackStatusCallback cb); -} diff --git a/services/net/java/android/net/dhcp/IDhcpServerCallbacks.aidl b/services/net/java/android/net/dhcp/IDhcpServerCallbacks.aidl deleted file mode 100644 index 7ab4dcdbe584..000000000000 --- a/services/net/java/android/net/dhcp/IDhcpServerCallbacks.aidl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2018, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing perNmissions and - * limitations under the License. - */ - -package android.net.dhcp; - -import android.net.dhcp.IDhcpServer; - -/** @hide */ -oneway interface IDhcpServerCallbacks { - void onDhcpServerCreated(int statusCode, in IDhcpServer server); -} diff --git a/services/net/java/android/net/ip/IIpClient.aidl b/services/net/java/android/net/ip/IIpClient.aidl deleted file mode 100644 index 9989c52fc403..000000000000 --- a/services/net/java/android/net/ip/IIpClient.aidl +++ /dev/null @@ -1,38 +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 perNmissions and - * limitations under the License. - */ -package android.net.ip; - -import android.net.ProxyInfo; -import android.net.ProvisioningConfigurationParcelable; -import android.net.NattKeepalivePacketDataParcelable; -import android.net.TcpKeepalivePacketDataParcelable; - -/** @hide */ -oneway interface IIpClient { - void completedPreDhcpAction(); - void confirmConfiguration(); - void readPacketFilterComplete(in byte[] data); - void shutdown(); - void startProvisioning(in ProvisioningConfigurationParcelable req); - void stop(); - void setTcpBufferSizes(in String tcpBufferSizes); - void setHttpProxy(in ProxyInfo proxyInfo); - void setMulticastFilter(boolean enabled); - void addKeepalivePacketFilter(int slot, in TcpKeepalivePacketDataParcelable pkt); - void removeKeepalivePacketFilter(int slot); - void setL2KeyAndGroupHint(in String l2Key, in String groupHint); - void addNattKeepalivePacketFilter(int slot, in NattKeepalivePacketDataParcelable pkt); -} diff --git a/services/net/java/android/net/ip/IIpClientCallbacks.aidl b/services/net/java/android/net/ip/IIpClientCallbacks.aidl deleted file mode 100644 index 3681416611a9..000000000000 --- a/services/net/java/android/net/ip/IIpClientCallbacks.aidl +++ /dev/null @@ -1,66 +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 perNmissions and - * limitations under the License. - */ -package android.net.ip; - -import android.net.LinkProperties; -import android.net.ip.IIpClient; -import android.net.DhcpResultsParcelable; - -/** @hide */ -oneway interface IIpClientCallbacks { - void onIpClientCreated(in IIpClient ipClient); - - void onPreDhcpAction(); - void onPostDhcpAction(); - - // This is purely advisory and not an indication of provisioning - // success or failure. This is only here for callers that want to - // expose DHCPv4 results to other APIs (e.g., WifiInfo#setInetAddress). - // DHCPv4 or static IPv4 configuration failure or success can be - // determined by whether or not the passed-in DhcpResults object is - // null or not. - void onNewDhcpResults(in DhcpResultsParcelable dhcpResults); - - void onProvisioningSuccess(in LinkProperties newLp); - void onProvisioningFailure(in LinkProperties newLp); - - // Invoked on LinkProperties changes. - void onLinkPropertiesChange(in LinkProperties newLp); - - // Called when the internal IpReachabilityMonitor (if enabled) has - // detected the loss of a critical number of required neighbors. - void onReachabilityLost(in String logMsg); - - // Called when the IpClient state machine terminates. - void onQuit(); - - // Install an APF program to filter incoming packets. - void installPacketFilter(in byte[] filter); - - // Asynchronously read back the APF program & data buffer from the wifi driver. - // Due to Wifi HAL limitations, the current implementation only supports dumping the entire - // buffer. In response to this request, the driver returns the data buffer asynchronously - // by sending an IpClient#EVENT_READ_PACKET_FILTER_COMPLETE message. - void startReadPacketFilter(); - - // If multicast filtering cannot be accomplished with APF, this function will be called to - // actuate multicast filtering using another means. - void setFallbackMulticastFilter(boolean enabled); - - // Enabled/disable Neighbor Discover offload functionality. This is - // called, for example, whenever 464xlat is being started or stopped. - void setNeighborDiscoveryOffload(boolean enable); -}
\ No newline at end of file diff --git a/services/net/java/android/net/ipmemorystore/Blob.aidl b/services/net/java/android/net/ipmemorystore/Blob.aidl deleted file mode 100644 index 9dbef117f8a4..000000000000 --- a/services/net/java/android/net/ipmemorystore/Blob.aidl +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -/** - * A blob of data opaque to the memory store. The client mutates this at its own risk, - * and it is strongly suggested to never do it at all and treat this as immutable. - * {@hide} - */ -parcelable Blob { - byte[] data; -} diff --git a/services/net/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/services/net/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl deleted file mode 100644 index 4926feb06e55..000000000000 --- a/services/net/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.net.ipmemorystore.Blob; -import android.net.ipmemorystore.StatusParcelable; - -/** {@hide} */ -oneway interface IOnBlobRetrievedListener { - /** - * Private data was retrieved for the L2 key and name specified. - * Note this does not return the client ID, as clients are expected to only ever use one ID. - */ - void onBlobRetrieved(in StatusParcelable status, in String l2Key, in String name, - in Blob data); -} diff --git a/services/net/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/services/net/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl deleted file mode 100644 index dea0cc4e2586..000000000000 --- a/services/net/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.net.ipmemorystore.StatusParcelable; - -/** {@hide} */ -oneway interface IOnL2KeyResponseListener { - /** - * The operation completed with the specified L2 key. - */ - void onL2KeyResponse(in StatusParcelable status, in String l2Key); -} diff --git a/services/net/java/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/services/net/java/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl deleted file mode 100644 index 870e217eb5b7..000000000000 --- a/services/net/java/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.net.ipmemorystore.NetworkAttributesParcelable; -import android.net.ipmemorystore.StatusParcelable; - -/** {@hide} */ -oneway interface IOnNetworkAttributesRetrievedListener { - /** - * Network attributes were fetched for the specified L2 key. While the L2 key will never - * be null, the attributes may be if no data is stored about this L2 key. - */ - void onNetworkAttributesRetrieved(in StatusParcelable status, in String l2Key, - in NetworkAttributesParcelable attributes); -} diff --git a/services/net/java/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/services/net/java/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl deleted file mode 100644 index b8ccfb99fddd..000000000000 --- a/services/net/java/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.net.ipmemorystore.SameL3NetworkResponseParcelable; -import android.net.ipmemorystore.StatusParcelable; - -/** {@hide} */ -oneway interface IOnSameL3NetworkResponseListener { - /** - * The memory store has come up with the answer to a query that was sent. - */ - void onSameL3NetworkResponse(in StatusParcelable status, - in SameL3NetworkResponseParcelable response); -} diff --git a/services/net/java/android/net/ipmemorystore/IOnStatusListener.aidl b/services/net/java/android/net/ipmemorystore/IOnStatusListener.aidl deleted file mode 100644 index 5d0750449ec5..000000000000 --- a/services/net/java/android/net/ipmemorystore/IOnStatusListener.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.net.ipmemorystore.StatusParcelable; - -/** {@hide} */ -oneway interface IOnStatusListener { - /** - * The operation has completed with the specified status. - */ - void onComplete(in StatusParcelable status); -} diff --git a/services/net/java/android/net/ipmemorystore/NetworkAttributes.java b/services/net/java/android/net/ipmemorystore/NetworkAttributes.java deleted file mode 100644 index 818515ac9af1..000000000000 --- a/services/net/java/android/net/ipmemorystore/NetworkAttributes.java +++ /dev/null @@ -1,371 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.annotation.NonNull; -import android.annotation.Nullable; - -import com.android.internal.annotations.VisibleForTesting; - -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.StringJoiner; - -/** - * A POD object to represent attributes of a single L2 network entry. - * @hide - */ -public class NetworkAttributes { - private static final boolean DBG = true; - - // Weight cutoff for grouping. To group, a similarity score is computed with the following - // algorithm : if both fields are non-null and equals() then add their assigned weight, else if - // both are null then add a portion of their assigned weight (see NULL_MATCH_WEIGHT), - // otherwise add nothing. - // As a guideline, this should be something like 60~75% of the total weights in this class. The - // design states "in essence a reader should imagine that if two important columns don't match, - // or one important and several unimportant columns don't match then the two records are - // considered a different group". - private static final float TOTAL_WEIGHT_CUTOFF = 520.0f; - // The portion of the weight that is earned when scoring group-sameness by having both columns - // being null. This is because some networks rightfully don't have some attributes (e.g. a - // V6-only network won't have an assigned V4 address) and both being null should count for - // something, but attributes may also be null just because data is unavailable. - private static final float NULL_MATCH_WEIGHT = 0.25f; - - // The v4 address that was assigned to this device the last time it joined this network. - // This typically comes from DHCP but could be something else like static configuration. - // This does not apply to IPv6. - // TODO : add a list of v6 prefixes for the v6 case. - @Nullable - public final Inet4Address assignedV4Address; - private static final float WEIGHT_ASSIGNEDV4ADDR = 300.0f; - - // The lease expiry timestamp of v4 address allocated from DHCP server, in milliseconds. - @Nullable - public final Long assignedV4AddressExpiry; - // lease expiry doesn't imply any correlation between "the same lease expiry value" and "the - // same L3 network". - private static final float WEIGHT_ASSIGNEDV4ADDREXPIRY = 0.0f; - - // Optionally supplied by the client if it has an opinion on L3 network. For example, this - // could be a hash of the SSID + security type on WiFi. - @Nullable - public final String groupHint; - private static final float WEIGHT_GROUPHINT = 300.0f; - - // The list of DNS server addresses. - @Nullable - public final List<InetAddress> dnsAddresses; - private static final float WEIGHT_DNSADDRESSES = 200.0f; - - // The mtu on this network. - @Nullable - public final Integer mtu; - private static final float WEIGHT_MTU = 50.0f; - - // The sum of all weights in this class. Tests ensure that this stays equal to the total of - // all weights. - /** @hide */ - @VisibleForTesting - public static final float TOTAL_WEIGHT = WEIGHT_ASSIGNEDV4ADDR - + WEIGHT_ASSIGNEDV4ADDREXPIRY - + WEIGHT_GROUPHINT - + WEIGHT_DNSADDRESSES - + WEIGHT_MTU; - - /** @hide */ - @VisibleForTesting - public NetworkAttributes( - @Nullable final Inet4Address assignedV4Address, - @Nullable final Long assignedV4AddressExpiry, - @Nullable final String groupHint, - @Nullable final List<InetAddress> dnsAddresses, - @Nullable final Integer mtu) { - if (mtu != null && mtu < 0) throw new IllegalArgumentException("MTU can't be negative"); - if (assignedV4AddressExpiry != null && assignedV4AddressExpiry <= 0) { - throw new IllegalArgumentException("lease expiry can't be negative or zero"); - } - this.assignedV4Address = assignedV4Address; - this.assignedV4AddressExpiry = assignedV4AddressExpiry; - this.groupHint = groupHint; - this.dnsAddresses = null == dnsAddresses ? null : - Collections.unmodifiableList(new ArrayList<>(dnsAddresses)); - this.mtu = mtu; - } - - @VisibleForTesting - public NetworkAttributes(@NonNull final NetworkAttributesParcelable parcelable) { - // The call to the other constructor must be the first statement of this constructor, - // so everything has to be inline - this((Inet4Address) getByAddressOrNull(parcelable.assignedV4Address), - parcelable.assignedV4AddressExpiry > 0 - ? parcelable.assignedV4AddressExpiry : null, - parcelable.groupHint, - blobArrayToInetAddressList(parcelable.dnsAddresses), - parcelable.mtu >= 0 ? parcelable.mtu : null); - } - - @Nullable - private static InetAddress getByAddressOrNull(@Nullable final byte[] address) { - if (null == address) return null; - try { - return InetAddress.getByAddress(address); - } catch (UnknownHostException e) { - return null; - } - } - - @Nullable - private static List<InetAddress> blobArrayToInetAddressList(@Nullable final Blob[] blobs) { - if (null == blobs) return null; - final ArrayList<InetAddress> list = new ArrayList<>(blobs.length); - for (final Blob b : blobs) { - final InetAddress addr = getByAddressOrNull(b.data); - if (null != addr) list.add(addr); - } - return list; - } - - @Nullable - private static Blob[] inetAddressListToBlobArray(@Nullable final List<InetAddress> addresses) { - if (null == addresses) return null; - final ArrayList<Blob> blobs = new ArrayList<>(); - for (int i = 0; i < addresses.size(); ++i) { - final InetAddress addr = addresses.get(i); - if (null == addr) continue; - final Blob b = new Blob(); - b.data = addr.getAddress(); - blobs.add(b); - } - return blobs.toArray(new Blob[0]); - } - - /** Converts this NetworkAttributes to a parcelable object */ - @NonNull - public NetworkAttributesParcelable toParcelable() { - final NetworkAttributesParcelable parcelable = new NetworkAttributesParcelable(); - parcelable.assignedV4Address = - (null == assignedV4Address) ? null : assignedV4Address.getAddress(); - parcelable.assignedV4AddressExpiry = - (null == assignedV4AddressExpiry) ? 0 : assignedV4AddressExpiry; - parcelable.groupHint = groupHint; - parcelable.dnsAddresses = inetAddressListToBlobArray(dnsAddresses); - parcelable.mtu = (null == mtu) ? -1 : mtu; - return parcelable; - } - - private float samenessContribution(final float weight, - @Nullable final Object o1, @Nullable final Object o2) { - if (null == o1) { - return (null == o2) ? weight * NULL_MATCH_WEIGHT : 0f; - } - return Objects.equals(o1, o2) ? weight : 0f; - } - - /** @hide */ - public float getNetworkGroupSamenessConfidence(@NonNull final NetworkAttributes o) { - final float samenessScore = - samenessContribution(WEIGHT_ASSIGNEDV4ADDR, assignedV4Address, o.assignedV4Address) - + samenessContribution(WEIGHT_ASSIGNEDV4ADDREXPIRY, assignedV4AddressExpiry, - o.assignedV4AddressExpiry) - + samenessContribution(WEIGHT_GROUPHINT, groupHint, o.groupHint) - + samenessContribution(WEIGHT_DNSADDRESSES, dnsAddresses, o.dnsAddresses) - + samenessContribution(WEIGHT_MTU, mtu, o.mtu); - // The minimum is 0, the max is TOTAL_WEIGHT and should be represented by 1.0, and - // TOTAL_WEIGHT_CUTOFF should represent 0.5, but there is no requirement that - // TOTAL_WEIGHT_CUTOFF would be half of TOTAL_WEIGHT (indeed, it should not be). - // So scale scores under the cutoff between 0 and 0.5, and the scores over the cutoff - // between 0.5 and 1.0. - if (samenessScore < TOTAL_WEIGHT_CUTOFF) { - return samenessScore / (TOTAL_WEIGHT_CUTOFF * 2); - } else { - return (samenessScore - TOTAL_WEIGHT_CUTOFF) / (TOTAL_WEIGHT - TOTAL_WEIGHT_CUTOFF) / 2 - + 0.5f; - } - } - - /** @hide */ - public static class Builder { - @Nullable - private Inet4Address mAssignedAddress; - @Nullable - private Long mAssignedAddressExpiry; - @Nullable - private String mGroupHint; - @Nullable - private List<InetAddress> mDnsAddresses; - @Nullable - private Integer mMtu; - - /** - * Set the assigned address. - * @param assignedV4Address The assigned address. - * @return This builder. - */ - public Builder setAssignedV4Address(@Nullable final Inet4Address assignedV4Address) { - mAssignedAddress = assignedV4Address; - return this; - } - - /** - * Set the lease expiry timestamp of assigned v4 address. Long.MAX_VALUE is used - * to represent "infinite lease". - * - * @param assignedV4AddressExpiry The lease expiry timestamp of assigned v4 address. - * @return This builder. - */ - public Builder setAssignedV4AddressExpiry( - @Nullable final Long assignedV4AddressExpiry) { - if (null != assignedV4AddressExpiry && assignedV4AddressExpiry <= 0) { - throw new IllegalArgumentException("lease expiry can't be negative or zero"); - } - mAssignedAddressExpiry = assignedV4AddressExpiry; - return this; - } - - /** - * Set the group hint. - * @param groupHint The group hint. - * @return This builder. - */ - public Builder setGroupHint(@Nullable final String groupHint) { - mGroupHint = groupHint; - return this; - } - - /** - * Set the DNS addresses. - * @param dnsAddresses The DNS addresses. - * @return This builder. - */ - public Builder setDnsAddresses(@Nullable final List<InetAddress> dnsAddresses) { - if (DBG && null != dnsAddresses) { - // Parceling code crashes if one of the addresses is null, therefore validate - // them when running in debug. - for (final InetAddress address : dnsAddresses) { - if (null == address) throw new IllegalArgumentException("Null DNS address"); - } - } - this.mDnsAddresses = dnsAddresses; - return this; - } - - /** - * Set the MTU. - * @param mtu The MTU. - * @return This builder. - */ - public Builder setMtu(@Nullable final Integer mtu) { - if (null != mtu && mtu < 0) throw new IllegalArgumentException("MTU can't be negative"); - mMtu = mtu; - return this; - } - - /** - * Return the built NetworkAttributes object. - * @return The built NetworkAttributes object. - */ - public NetworkAttributes build() { - return new NetworkAttributes(mAssignedAddress, mAssignedAddressExpiry, - mGroupHint, mDnsAddresses, mMtu); - } - } - - /** @hide */ - public boolean isEmpty() { - return (null == assignedV4Address) && (null == assignedV4AddressExpiry) - && (null == groupHint) && (null == dnsAddresses) && (null == mtu); - } - - @Override - public boolean equals(@Nullable final Object o) { - if (!(o instanceof NetworkAttributes)) return false; - final NetworkAttributes other = (NetworkAttributes) o; - return Objects.equals(assignedV4Address, other.assignedV4Address) - && Objects.equals(assignedV4AddressExpiry, other.assignedV4AddressExpiry) - && Objects.equals(groupHint, other.groupHint) - && Objects.equals(dnsAddresses, other.dnsAddresses) - && Objects.equals(mtu, other.mtu); - } - - @Override - public int hashCode() { - return Objects.hash(assignedV4Address, assignedV4AddressExpiry, - groupHint, dnsAddresses, mtu); - } - - /** Pretty print */ - @Override - public String toString() { - final StringJoiner resultJoiner = new StringJoiner(" ", "{", "}"); - final ArrayList<String> nullFields = new ArrayList<>(); - - if (null != assignedV4Address) { - resultJoiner.add("assignedV4Addr :"); - resultJoiner.add(assignedV4Address.toString()); - } else { - nullFields.add("assignedV4Addr"); - } - - if (null != assignedV4AddressExpiry) { - resultJoiner.add("assignedV4AddressExpiry :"); - resultJoiner.add(assignedV4AddressExpiry.toString()); - } else { - nullFields.add("assignedV4AddressExpiry"); - } - - if (null != groupHint) { - resultJoiner.add("groupHint :"); - resultJoiner.add(groupHint); - } else { - nullFields.add("groupHint"); - } - - if (null != dnsAddresses) { - resultJoiner.add("dnsAddr : ["); - for (final InetAddress addr : dnsAddresses) { - resultJoiner.add(addr.getHostAddress()); - } - resultJoiner.add("]"); - } else { - nullFields.add("dnsAddr"); - } - - if (null != mtu) { - resultJoiner.add("mtu :"); - resultJoiner.add(mtu.toString()); - } else { - nullFields.add("mtu"); - } - - if (!nullFields.isEmpty()) { - resultJoiner.add("; Null fields : ["); - for (final String field : nullFields) { - resultJoiner.add(field); - } - resultJoiner.add("]"); - } - - return resultJoiner.toString(); - } -} diff --git a/services/net/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/services/net/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl deleted file mode 100644 index 997eb2b5128b..000000000000 --- a/services/net/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -// Blob[] is used to represent an array of byte[], as structured AIDL does not support arrays -// of arrays. -import android.net.ipmemorystore.Blob; - -/** - * An object to represent attributes of a single L2 network entry. - * See NetworkAttributes.java for a description of each field. The types used in this class - * are structured parcelable types instead of the richer types of the NetworkAttributes object, - * but they have the same purpose. The NetworkAttributes.java file also contains the code - * to convert the richer types to the parcelable types and back. - * @hide - */ -parcelable NetworkAttributesParcelable { - byte[] assignedV4Address; - long assignedV4AddressExpiry; - String groupHint; - Blob[] dnsAddresses; - int mtu; -} diff --git a/services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java b/services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java deleted file mode 100644 index a17483a84e78..000000000000 --- a/services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java +++ /dev/null @@ -1,50 +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 android.net.ipmemorystore; - -import android.annotation.NonNull; - -/** - * A listener for the IpMemoryStore to return a blob. - * @hide - */ -public interface OnBlobRetrievedListener { - /** - * The memory store has come up with the answer to a query that was sent. - */ - void onBlobRetrieved(Status status, String l2Key, String name, Blob blob); - - /** Converts this OnBlobRetrievedListener to a parcelable object */ - @NonNull - static IOnBlobRetrievedListener toAIDL(@NonNull final OnBlobRetrievedListener listener) { - return new IOnBlobRetrievedListener.Stub() { - @Override - public void onBlobRetrieved(final StatusParcelable statusParcelable, final String l2Key, - final String name, final Blob blob) { - // NonNull, but still don't crash the system server if null - if (null != listener) { - listener.onBlobRetrieved(new Status(statusParcelable), l2Key, name, blob); - } - } - - @Override - public int getInterfaceVersion() { - return this.VERSION; - } - }; - } -} diff --git a/services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java b/services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java deleted file mode 100644 index e608aecbf498..000000000000 --- a/services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java +++ /dev/null @@ -1,50 +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 android.net.ipmemorystore; - -import android.annotation.NonNull; - -/** - * A listener for the IpMemoryStore to return a L2 key. - * @hide - */ -public interface OnL2KeyResponseListener { - /** - * The operation has completed with the specified status. - */ - void onL2KeyResponse(Status status, String l2Key); - - /** Converts this OnL2KeyResponseListener to a parcelable object */ - @NonNull - static IOnL2KeyResponseListener toAIDL(@NonNull final OnL2KeyResponseListener listener) { - return new IOnL2KeyResponseListener.Stub() { - @Override - public void onL2KeyResponse(final StatusParcelable statusParcelable, - final String l2Key) { - // NonNull, but still don't crash the system server if null - if (null != listener) { - listener.onL2KeyResponse(new Status(statusParcelable), l2Key); - } - } - - @Override - public int getInterfaceVersion() { - return this.VERSION; - } - }; - } -} diff --git a/services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java b/services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java deleted file mode 100644 index 395ad98f38e0..000000000000 --- a/services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java +++ /dev/null @@ -1,54 +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 android.net.ipmemorystore; - -import android.annotation.NonNull; - -/** - * A listener for the IpMemoryStore to return network attributes. - * @hide - */ -public interface OnNetworkAttributesRetrievedListener { - /** - * The memory store has come up with the answer to a query that was sent. - */ - void onNetworkAttributesRetrieved(Status status, String l2Key, NetworkAttributes attributes); - - /** Converts this OnNetworkAttributesRetrievedListener to a parcelable object */ - @NonNull - static IOnNetworkAttributesRetrievedListener toAIDL( - @NonNull final OnNetworkAttributesRetrievedListener listener) { - return new IOnNetworkAttributesRetrievedListener.Stub() { - @Override - public void onNetworkAttributesRetrieved(final StatusParcelable statusParcelable, - final String l2Key, - final NetworkAttributesParcelable networkAttributesParcelable) { - // NonNull, but still don't crash the system server if null - if (null != listener) { - listener.onNetworkAttributesRetrieved( - new Status(statusParcelable), l2Key, null == networkAttributesParcelable - ? null : new NetworkAttributes(networkAttributesParcelable)); - } - } - - @Override - public int getInterfaceVersion() { - return this.VERSION; - } - }; - } -} diff --git a/services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.java b/services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.java deleted file mode 100644 index 67f8da81c3f2..000000000000 --- a/services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.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 android.net.ipmemorystore; - -import android.annotation.NonNull; - -/** - * A listener for the IpMemoryStore to return a response about network sameness. - * @hide - */ -public interface OnSameL3NetworkResponseListener { - /** - * The memory store has come up with the answer to a query that was sent. - */ - void onSameL3NetworkResponse(Status status, SameL3NetworkResponse response); - - /** Converts this OnSameL3NetworkResponseListener to a parcelable object */ - @NonNull - static IOnSameL3NetworkResponseListener toAIDL( - @NonNull final OnSameL3NetworkResponseListener listener) { - return new IOnSameL3NetworkResponseListener.Stub() { - @Override - public void onSameL3NetworkResponse(final StatusParcelable statusParcelable, - final SameL3NetworkResponseParcelable sameL3NetworkResponseParcelable) { - // NonNull, but still don't crash the system server if null - if (null != listener) { - listener.onSameL3NetworkResponse( - new Status(statusParcelable), - new SameL3NetworkResponse(sameL3NetworkResponseParcelable)); - } - } - - @Override - public int getInterfaceVersion() { - return this.VERSION; - } - }; - } -} diff --git a/services/net/java/android/net/ipmemorystore/OnStatusListener.java b/services/net/java/android/net/ipmemorystore/OnStatusListener.java deleted file mode 100644 index 4262efde8843..000000000000 --- a/services/net/java/android/net/ipmemorystore/OnStatusListener.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 android.net.ipmemorystore; - -import android.annotation.NonNull; -import android.annotation.Nullable; - -/** - * A listener for the IpMemoryStore to return a status to a client. - * @hide - */ -public interface OnStatusListener { - /** - * The operation has completed with the specified status. - */ - void onComplete(Status status); - - /** Converts this OnStatusListener to a parcelable object */ - @NonNull - static IOnStatusListener toAIDL(@Nullable final OnStatusListener listener) { - return new IOnStatusListener.Stub() { - @Override - public void onComplete(final StatusParcelable statusParcelable) { - if (null != listener) { - listener.onComplete(new Status(statusParcelable)); - } - } - - @Override - public int getInterfaceVersion() { - return this.VERSION; - } - }; - } -} diff --git a/services/net/java/android/net/ipmemorystore/SameL3NetworkResponse.java b/services/net/java/android/net/ipmemorystore/SameL3NetworkResponse.java deleted file mode 100644 index 291aca8fc611..000000000000 --- a/services/net/java/android/net/ipmemorystore/SameL3NetworkResponse.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.annotation.IntDef; -import android.annotation.NonNull; -import android.annotation.Nullable; - -import com.android.internal.annotations.VisibleForTesting; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.Objects; - -/** - * An object representing the answer to a query whether two given L2 networks represent the - * same L3 network. Parcels as a SameL3NetworkResponseParceled object. - * @hide - */ -public class SameL3NetworkResponse { - @IntDef(prefix = "NETWORK_", - value = {NETWORK_SAME, NETWORK_DIFFERENT, NETWORK_NEVER_CONNECTED}) - @Retention(RetentionPolicy.SOURCE) - public @interface NetworkSameness {} - - /** - * Both L2 networks represent the same L3 network. - */ - public static final int NETWORK_SAME = 1; - - /** - * The two L2 networks represent a different L3 network. - */ - public static final int NETWORK_DIFFERENT = 2; - - /** - * The device has never connected to at least one of these two L2 networks, or data - * has been wiped. Therefore the device has never seen the L3 network behind at least - * one of these two L2 networks, and can't evaluate whether it's the same as the other. - */ - public static final int NETWORK_NEVER_CONNECTED = 3; - - /** - * The first L2 key specified in the query. - */ - @NonNull - public final String l2Key1; - - /** - * The second L2 key specified in the query. - */ - @NonNull - public final String l2Key2; - - /** - * A confidence value indicating whether the two L2 networks represent the same L3 network. - * - * If both L2 networks were known, this value will be between 0.0 and 1.0, with 0.0 - * representing complete confidence that the given L2 networks represent a different - * L3 network, and 1.0 representing complete confidence that the given L2 networks - * represent the same L3 network. - * If at least one of the L2 networks was not known, this value will be outside of the - * 0.0~1.0 range. - * - * Most apps should not be interested in this, and are encouraged to use the collapsing - * {@link #getNetworkSameness()} function below. - */ - public final float confidence; - - /** - * @return whether the two L2 networks represent the same L3 network. Either - * {@code NETWORK_SAME}, {@code NETWORK_DIFFERENT} or {@code NETWORK_NEVER_CONNECTED}. - */ - @NetworkSameness - public final int getNetworkSameness() { - if (confidence > 1.0 || confidence < 0.0) return NETWORK_NEVER_CONNECTED; - return confidence > 0.5 ? NETWORK_SAME : NETWORK_DIFFERENT; - } - - /** @hide */ - public SameL3NetworkResponse(@NonNull final String l2Key1, @NonNull final String l2Key2, - final float confidence) { - this.l2Key1 = l2Key1; - this.l2Key2 = l2Key2; - this.confidence = confidence; - } - - /** Builds a SameL3NetworkResponse from a parcelable object */ - @VisibleForTesting - public SameL3NetworkResponse(@NonNull final SameL3NetworkResponseParcelable parceled) { - this(parceled.l2Key1, parceled.l2Key2, parceled.confidence); - } - - /** Converts this SameL3NetworkResponse to a parcelable object */ - @NonNull - public SameL3NetworkResponseParcelable toParcelable() { - final SameL3NetworkResponseParcelable parcelable = new SameL3NetworkResponseParcelable(); - parcelable.l2Key1 = l2Key1; - parcelable.l2Key2 = l2Key2; - parcelable.confidence = confidence; - return parcelable; - } - - // Note key1 and key2 have to match each other for this to return true. If - // key1 matches o.key2 and the other way around this returns false. - @Override - public boolean equals(@Nullable final Object o) { - if (!(o instanceof SameL3NetworkResponse)) return false; - final SameL3NetworkResponse other = (SameL3NetworkResponse) o; - return l2Key1.equals(other.l2Key1) && l2Key2.equals(other.l2Key2) - && confidence == other.confidence; - } - - @Override - public int hashCode() { - return Objects.hash(l2Key1, l2Key2, confidence); - } - - @Override - /** Pretty print */ - public String toString() { - switch (getNetworkSameness()) { - case NETWORK_SAME: - return "\"" + l2Key1 + "\" same L3 network as \"" + l2Key2 + "\""; - case NETWORK_DIFFERENT: - return "\"" + l2Key1 + "\" different L3 network from \"" + l2Key2 + "\""; - case NETWORK_NEVER_CONNECTED: - return "\"" + l2Key1 + "\" can't be tested against \"" + l2Key2 + "\""; - default: - return "Buggy sameness value ? \"" + l2Key1 + "\", \"" + l2Key2 + "\""; - } - } -} diff --git a/services/net/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/services/net/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl deleted file mode 100644 index 71966998a68a..000000000000 --- a/services/net/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -/** {@hide} */ -parcelable SameL3NetworkResponseParcelable { - String l2Key1; - String l2Key2; - float confidence; -} diff --git a/services/net/java/android/net/ipmemorystore/Status.java b/services/net/java/android/net/ipmemorystore/Status.java deleted file mode 100644 index 13242c03ce01..000000000000 --- a/services/net/java/android/net/ipmemorystore/Status.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -import android.annotation.NonNull; - -import com.android.internal.annotations.VisibleForTesting; - -/** - * A parcelable status representing the result of an operation. - * Parcels as StatusParceled. - * @hide - */ -public class Status { - public static final int SUCCESS = 0; - - public static final int ERROR_GENERIC = -1; - public static final int ERROR_ILLEGAL_ARGUMENT = -2; - public static final int ERROR_DATABASE_CANNOT_BE_OPENED = -3; - public static final int ERROR_STORAGE = -4; - public static final int ERROR_UNKNOWN = -5; - - public final int resultCode; - - public Status(final int resultCode) { - this.resultCode = resultCode; - } - - @VisibleForTesting - public Status(@NonNull final StatusParcelable parcelable) { - this(parcelable.resultCode); - } - - /** Converts this Status to a parcelable object */ - @NonNull - public StatusParcelable toParcelable() { - final StatusParcelable parcelable = new StatusParcelable(); - parcelable.resultCode = resultCode; - return parcelable; - } - - public boolean isSuccess() { - return SUCCESS == resultCode; - } - - /** Pretty print */ - @Override - public String toString() { - switch (resultCode) { - case SUCCESS: return "SUCCESS"; - case ERROR_GENERIC: return "GENERIC ERROR"; - case ERROR_ILLEGAL_ARGUMENT: return "ILLEGAL ARGUMENT"; - case ERROR_DATABASE_CANNOT_BE_OPENED: return "DATABASE CANNOT BE OPENED"; - // "DB storage error" is not very helpful but SQLite does not provide specific error - // codes upon store failure. Thus this indicates SQLite returned some error upon store - case ERROR_STORAGE: return "DATABASE STORAGE ERROR"; - default: return "Unknown value ?!"; - } - } -} diff --git a/services/net/java/android/net/ipmemorystore/StatusParcelable.aidl b/services/net/java/android/net/ipmemorystore/StatusParcelable.aidl deleted file mode 100644 index fb36ef4a56ff..000000000000 --- a/services/net/java/android/net/ipmemorystore/StatusParcelable.aidl +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.ipmemorystore; - -/** {@hide} */ -parcelable StatusParcelable { - int resultCode; -} diff --git a/services/tests/servicestests/src/com/android/server/SystemConfigTest.java b/services/tests/servicestests/src/com/android/server/SystemConfigTest.java new file mode 100644 index 000000000000..ff03391ea031 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/SystemConfigTest.java @@ -0,0 +1,180 @@ +/* + * 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; + +import static org.junit.Assert.assertEquals; + +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.Log; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.Map; +import java.util.Scanner; +import java.util.Set; + +/** + * Tests for {@link SystemConfig}. + * + * Build/Install/Run: + * atest FrameworksServicesTests:SystemConfigTest + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class SystemConfigTest { + private static final String LOG_TAG = "SystemConfigTest"; + + private SystemConfig mSysConfig; + + @Rule public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); + + @Before + public void setUp() throws Exception { + mSysConfig = new SystemConfigTestClass(); + } + + /** + * Subclass of SystemConfig without running the constructor. + */ + private class SystemConfigTestClass extends SystemConfig { + SystemConfigTestClass() { + super(false); + } + } + + /** + * Tests that readPermissions works correctly for the tag: install-in-user-type + */ + @Test + public void testInstallInUserType() throws Exception { + final String contents1 = + "<permissions>\n" + + " <install-in-user-type package=\"com.android.package1\">\n" + + " <install-in user-type=\"FULL\" />\n" + + " <install-in user-type=\"PROFILE\" />\n" + + " </install-in-user-type>\n" + + " <install-in-user-type package=\"com.android.package2\">\n" + + " <install-in user-type=\"FULL\" />\n" + + " <install-in user-type=\"PROFILE\" />\n" + + " <do-not-install-in user-type=\"GUEST\" />\n" + + " </install-in-user-type>\n" + + "</permissions>"; + + final String contents2 = + "<permissions>\n" + + " <install-in-user-type package=\"com.android.package2\">\n" + + " <install-in user-type=\"SYSTEM\" />\n" + + " <do-not-install-in user-type=\"PROFILE\" />\n" + + " </install-in-user-type>\n" + + "</permissions>"; + + final String contents3 = + "<permissions>\n" + + " <install-in-user-type package=\"com.android.package2\">\n" + + " <install-in invalid-attribute=\"ADMIN\" />\n" // Ignore invalid attribute + + " </install-in-user-type>\n" + + " <install-in-user-type package=\"com.android.package2\">\n" + + " <install-in user-type=\"RESTRICTED\" />\n" // Valid + + " </install-in-user-type>\n" + + " <install-in-user-type>\n" // Ignored since missing package name + + " <install-in user-type=\"ADMIN\" />\n" + + " </install-in-user-type>\n" + + "</permissions>"; + + Map<String, Set<String>> expectedWhite = new ArrayMap<>(); + expectedWhite.put("com.android.package1", + new ArraySet<>(Arrays.asList("FULL", "PROFILE"))); + expectedWhite.put("com.android.package2", + new ArraySet<>(Arrays.asList("FULL", "PROFILE", "RESTRICTED", "SYSTEM"))); + + Map<String, Set<String>> expectedBlack = new ArrayMap<>(); + expectedBlack.put("com.android.package2", + new ArraySet<>(Arrays.asList("GUEST", "PROFILE"))); + + final File folder1 = createTempSubfolder("folder1"); + createTempFile(folder1, "permFile1.xml", contents1); + + final File folder2 = createTempSubfolder("folder2"); + createTempFile(folder2, "permFile2.xml", contents2); + + // Also, make a third file, but with the name folder1/permFile2.xml, to prove no conflicts. + createTempFile(folder1, "permFile2.xml", contents3); + + mSysConfig.readPermissions(folder1, /* No permission needed anyway */ 0); + mSysConfig.readPermissions(folder2, /* No permission needed anyway */ 0); + + Map<String, Set<String>> actualWhite = mSysConfig.getAndClearPackageToUserTypeWhitelist(); + Map<String, Set<String>> actualBlack = mSysConfig.getAndClearPackageToUserTypeBlacklist(); + + assertEquals("Whitelist was not cleared", 0, + mSysConfig.getAndClearPackageToUserTypeWhitelist().size()); + assertEquals("Blacklist was not cleared", 0, + mSysConfig.getAndClearPackageToUserTypeBlacklist().size()); + + assertEquals("Incorrect whitelist.", expectedWhite, actualWhite); + assertEquals("Incorrect blacklist", expectedBlack, actualBlack); + } + + /** + * Creates folderName/fileName in the mTemporaryFolder and fills it with the contents. + * @param folderName subdirectory of mTemporaryFolder to put the file, creating if needed + * @return the folder + */ + private File createTempSubfolder(String folderName) + throws IOException { + File folder = new File(mTemporaryFolder.getRoot(), folderName); + folder.mkdir(); + return folder; + } + + /** + * Creates folderName/fileName in the mTemporaryFolder and fills it with the contents. + * @param folder pre-existing subdirectory of mTemporaryFolder to put the file + * @param fileName name of the file (e.g. filename.xml) to create + * @param contents contents to write to the file + * @return the folder containing the newly created file (not the file itself!) + */ + private File createTempFile(File folder, String fileName, String contents) + throws IOException { + File file = new File(folder, fileName); + BufferedWriter bw = new BufferedWriter(new FileWriter(file)); + bw.write(contents); + bw.close(); + + // Print to logcat for test debugging. + Log.d(LOG_TAG, "Contents of file " + file.getAbsolutePath()); + Scanner input = new Scanner(file); + while (input.hasNextLine()) { + Log.d(LOG_TAG, input.nextLine()); + } + + return folder; + } +} 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 d90091017116..a25e40f8cc13 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -1212,6 +1212,45 @@ public class DevicePolicyManagerTest extends DpmTestBase { assertTrue(dpm.isDeviceManaged()); } + /** + * Test for: {@link DevicePolicyManager#clearDeviceOwnerApp(String)} + * + * Validates that when the device owner is removed, the reset password token is cleared + */ + public void testClearDeviceOwner_clearResetPasswordToken() throws Exception { + mContext.callerPermissions.add(android.Manifest.permission.MANAGE_DEVICE_ADMINS); + mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS); + mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; + + // Install admin1 on system user + setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID); + + // Set admin1 to active admin and device owner + dpm.setActiveAdmin(admin1, /* replace =*/ false); + dpm.setDeviceOwner(admin1, null, UserHandle.USER_SYSTEM); + + // Add reset password token + final long handle = 12000; + final byte[] token = new byte[32]; + when(getServices().lockPatternUtils.addEscrowToken(eq(token), eq(UserHandle.USER_SYSTEM), + nullable(EscrowTokenStateChangeCallback.class))) + .thenReturn(handle); + assertTrue(dpm.setResetPasswordToken(admin1, token)); + + // Assert reset password token is active + when(getServices().lockPatternUtils.isEscrowTokenActive(eq(handle), + eq(UserHandle.USER_SYSTEM))) + .thenReturn(true); + assertTrue(dpm.isResetPasswordTokenActive(admin1)); + + // Remove the device owner + dpm.clearDeviceOwnerApp(admin1.getPackageName()); + + // Verify password reset password token was removed + verify(getServices().lockPatternUtils).removeEscrowToken(eq(handle), + eq(UserHandle.USER_SYSTEM)); + } + public void testSetProfileOwner() throws Exception { setAsProfileOwner(admin1); diff --git a/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientFilterTest.java b/services/tests/servicestests/src/com/android/server/display/utils/AmbientFilterTest.java index 78164939aa49..9b76b13d2ede 100644 --- a/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientFilterTest.java +++ b/services/tests/servicestests/src/com/android/server/display/utils/AmbientFilterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.display.whitebalance; +package com.android.server.display.utils; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -38,6 +38,7 @@ import org.junit.runners.JUnit4; public final class AmbientFilterTest { private ContextWrapper mContextSpy; private Resources mResourcesSpy; + private static String TAG = "AmbientFilterTest"; @Before public void setUp() throws Exception { @@ -54,7 +55,7 @@ public final class AmbientFilterTest { final int prediction_time = 100; // Hardcoded in AmbientFilter: prediction of how long the // latest prediction will last before a new prediction. setMockValues(mResourcesSpy, horizon, intercept); - AmbientFilter filter = DisplayWhiteBalanceFactory.createBrightnessFilter(mResourcesSpy); + AmbientFilter filter = AmbientFilterFactory.createBrightnessFilter(TAG, mResourcesSpy); // Add first value and verify filter.addValue(time_start, 30); @@ -85,7 +86,7 @@ public final class AmbientFilterTest { final int prediction_time = 100; setMockValues(mResourcesSpy, horizon, intercept); - AmbientFilter filter = DisplayWhiteBalanceFactory.createBrightnessFilter(mResourcesSpy); + AmbientFilter filter = AmbientFilterFactory.createBrightnessFilter(TAG, mResourcesSpy); // Add first value and verify filter.addValue(time_start, 30); diff --git a/services/net/java/android/net/IIpMemoryStoreCallbacks.aidl b/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientFilterStubber.java index 53108dbca097..4d2551087c59 100644 --- a/services/net/java/android/net/IIpMemoryStoreCallbacks.aidl +++ b/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientFilterStubber.java @@ -14,11 +14,14 @@ * limitations under the License. */ -package android.net; +package com.android.server.display.utils; -import android.net.IIpMemoryStore; +public class AmbientFilterStubber extends AmbientFilter { + public AmbientFilterStubber() { + super(null, 1); + } -/** {@hide} */ -oneway interface IIpMemoryStoreCallbacks { - void onIpMemoryStoreFetched(in IIpMemoryStore ipMemoryStore); + protected float filter(long time, RollingBuffer buffer) { + return 0f; + } } diff --git a/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java b/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java index 6b0798bdce22..0d5a7d6c1952 100644 --- a/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java +++ b/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java @@ -17,6 +17,8 @@ package com.android.server.display.whitebalance; import com.android.internal.R; +import com.android.server.display.utils.AmbientFilter; +import com.android.server.display.utils.AmbientFilterStubber; import com.google.common.collect.ImmutableList; import static org.junit.Assert.assertEquals; @@ -132,7 +134,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float luxOverride = 0.1f; luxOverride <= 10000; luxOverride *= 10) { setEstimatedBrightnessAndUpdate(controller, luxOverride); @@ -152,7 +154,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float t = 0.0f; t <= 1.0f; t += 0.1f) { setEstimatedBrightnessAndUpdate(controller, @@ -184,7 +186,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float t = 0.0f; t <= 1.0f; t += 0.1f) { float luxOverride = mix(brightness0, brightness1, t); @@ -221,7 +223,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); setEstimatedBrightnessAndUpdate(controller, 0.0f); assertEquals(controller.mPendingAmbientColorTemperature, @@ -240,7 +242,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float luxOverride = 0.1f; luxOverride <= 10000; luxOverride *= 10) { setEstimatedBrightnessAndUpdate(controller, luxOverride); @@ -258,7 +260,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float luxOverride = 0.1f; luxOverride <= 10000; luxOverride *= 10) { setEstimatedBrightnessAndUpdate(controller, luxOverride); @@ -278,7 +280,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float t = 0.0f; t <= 1.0f; t += 0.1f) { setEstimatedBrightnessAndUpdate(controller, @@ -311,7 +313,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 6000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float t = 0.0f; t <= 1.0f; t += 0.1f) { float luxOverride = mix(brightness0, brightness1, t); @@ -350,7 +352,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = 8000.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float luxOverride = 0.1f; luxOverride <= 10000; luxOverride *= 10) { setEstimatedBrightnessAndUpdate(controller, luxOverride); @@ -370,7 +372,7 @@ public final class AmbientLuxTest { DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); final float ambientColorTemperature = -1.0f; setEstimatedColorTemperature(controller, ambientColorTemperature); - controller.mBrightnessFilter = spy(controller.mBrightnessFilter); + controller.mBrightnessFilter = spy(new AmbientFilterStubber()); for (float t = 0.0f; t <= 1.0f; t += 0.1f) { setEstimatedBrightnessAndUpdate(controller, @@ -426,7 +428,7 @@ public final class AmbientLuxTest { private void setEstimatedColorTemperature(DisplayWhiteBalanceController controller, float ambientColorTemperature) { - AmbientFilter colorTemperatureFilter = spy(controller.mColorTemperatureFilter); + AmbientFilter colorTemperatureFilter = spy(new AmbientFilterStubber()); controller.mColorTemperatureFilter = colorTemperatureFilter; when(colorTemperatureFilter.getEstimate(anyLong())).thenReturn(ambientColorTemperature); } diff --git a/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java new file mode 100644 index 000000000000..f0b0328ff7d4 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java @@ -0,0 +1,396 @@ +/* + * 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_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_SYSTEM; + +import static com.android.server.pm.UserSystemPackageInstaller.PACKAGE_WHITELIST_MODE_PROP; +import static com.android.server.pm.UserSystemPackageInstaller.USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT; +import static com.android.server.pm.UserSystemPackageInstaller.USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE; +import static com.android.server.pm.UserSystemPackageInstaller.USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE; +import static com.android.server.pm.UserSystemPackageInstaller.USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST; +import static com.android.server.pm.UserSystemPackageInstaller.USER_TYPE_PACKAGE_WHITELIST_MODE_LOG; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageParser; +import android.content.pm.UserInfo; +import android.os.Looper; +import android.os.SystemProperties; +import android.os.UserManager; +import android.os.UserManagerInternal; +import android.support.test.uiautomator.UiDevice; +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.Log; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; + +import com.android.server.LocalServices; +import com.android.server.SystemConfig; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; + +/** + * Tests for UserSystemPackageInstaller. + * + * <p>Run with:<pre> + * atest com.android.server.pm.UserSystemPackageInstallerTest + * </pre> + */ +@RunWith(AndroidJUnit4.class) +@MediumTest +public class UserSystemPackageInstallerTest { + private static final String TAG = "UserSystemPackageInstallerTest"; + + private UserSystemPackageInstaller mUserSystemPackageInstaller; + + private Context mContext; + + /** Any users created during this test, for them to be removed when it's done. */ + private final List<Integer> mRemoveUsers = new ArrayList<>(); + /** Original value of PACKAGE_WHITELIST_MODE_PROP before the test, to reset at end. */ + private final int mOriginalWhitelistMode = SystemProperties.getInt( + PACKAGE_WHITELIST_MODE_PROP, USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT); + + @Before + public void setup() { + // Currently UserManagerService cannot be instantiated twice inside a VM without a cleanup + // TODO: Remove once UMS supports proper dependency injection + if (Looper.myLooper() == null) { + Looper.prepare(); + } + LocalServices.removeServiceForTest(UserManagerInternal.class); + UserManagerService ums = new UserManagerService(InstrumentationRegistry.getContext()); + + mUserSystemPackageInstaller = new UserSystemPackageInstaller(ums); + mContext = InstrumentationRegistry.getTargetContext(); + } + + @After + public void tearDown() { + UserManager um = UserManager.get(mContext); + for (int userId : mRemoveUsers) { + um.removeUser(userId); + } + setUserTypePackageWhitelistMode(mOriginalWhitelistMode); + } + + /** + * Subclass of SystemConfig without running the constructor. + */ + private class SystemConfigTestClass extends SystemConfig { + SystemConfigTestClass(boolean readPermissions) { + super(readPermissions); + } + } + + /** + * Test that determineWhitelistedPackagesForUserTypes reads SystemConfig information properly. + */ + @Test + public void testDetermineWhitelistedPackagesForUserTypes() { + SystemConfig sysConfig = new SystemConfigTestClass(false) { + @Override + public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeWhitelist() { + ArrayMap<String, Set<String>> r = new ArrayMap<>(); + r.put("com.android.package1", new ArraySet<>(Arrays.asList( + "PROFILE", "SYSTEM", "GUEST", "FULL", "invalid-garbage1"))); + r.put("com.android.package2", new ArraySet<>(Arrays.asList( + "MANAGED_PROFILE"))); + return r; + } + + @Override + public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeBlacklist() { + ArrayMap<String, Set<String>> r = new ArrayMap<>(); + r.put("com.android.package1", new ArraySet<>(Arrays.asList( + "FULL", "RESTRICTED", "invalid-garbage2"))); + return r; + } + }; + + final ArrayMap<String, Integer> expectedOutput = getNewPackageToWhitelistedFlagsMap(); + expectedOutput.put("com.android.package1", + UserInfo.PROFILE_FLAGS_MASK | FLAG_SYSTEM | FLAG_GUEST); + expectedOutput.put("com.android.package2", + UserInfo.FLAG_MANAGED_PROFILE); + + final ArrayMap<String, Integer> actualOutput = + mUserSystemPackageInstaller.determineWhitelistedPackagesForUserTypes(sysConfig); + + assertEquals("Incorrect package-to-user mapping.", expectedOutput, actualOutput); + } + + /** + * Test that determineWhitelistedPackagesForUserTypes does not include packages that were never + * whitelisted properly, but does include packages that were whitelisted but then blacklisted. + */ + @Test + public void testDetermineWhitelistedPackagesForUserTypes_noNetWhitelisting() { + SystemConfig sysConfig = new SystemConfigTestClass(false) { + @Override + public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeWhitelist() { + ArrayMap<String, Set<String>> r = new ArrayMap<>(); + r.put("com.android.package1", new ArraySet<>(Arrays.asList("invalid1"))); + // com.android.package2 has no whitelisting + r.put("com.android.package3", new ArraySet<>(Arrays.asList("PROFILE", "FULL"))); + r.put("com.android.package4", new ArraySet<>(Arrays.asList("PROFILE"))); + r.put("com.android.package5", new ArraySet<>()); + // com.android.package6 has no whitelisting + return r; + } + + @Override + public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeBlacklist() { + ArrayMap<String, Set<String>> r = new ArrayMap<>(); + // com.android.package1 has no blacklisting + r.put("com.android.package2", new ArraySet<>(Arrays.asList("FULL"))); + r.put("com.android.package3", new ArraySet<>(Arrays.asList("PROFILE", "FULL"))); + r.put("com.android.package4", new ArraySet<>(Arrays.asList("PROFILE", "invalid4"))); + // com.android.package5 has no blacklisting + r.put("com.android.package6", new ArraySet<>(Arrays.asList("invalid6"))); + return r; + } + }; + + final ArrayMap<String, Integer> expectedOutput = getNewPackageToWhitelistedFlagsMap(); + expectedOutput.put("com.android.package3", 0); + expectedOutput.put("com.android.package4", 0); + + final ArrayMap<String, Integer> actualOutput = + mUserSystemPackageInstaller.determineWhitelistedPackagesForUserTypes(sysConfig); + + assertEquals("Incorrect package-to-user mapping.", expectedOutput, actualOutput); + } + + /** + * Tests that shouldInstallPackage correctly determines which packages should be installed. + */ + @Test + public void testShouldInstallPackage() { + final String packageName1 = "pkg1"; // whitelisted + final String packageName2 = "pkg2"; // whitelisted and blacklisted + final String packageName3 = "pkg3"; // whitelisted for a different user type + final String packageName4 = "pkg4"; // not whitelisted nor blacklisted at all + + final ArrayMap<String, Integer> pkgFlgMap = new ArrayMap<>(); // Whitelist: pkgs per flags + pkgFlgMap.put(packageName1, FLAG_FULL); + pkgFlgMap.put(packageName2, 0); + pkgFlgMap.put(packageName3, FLAG_MANAGED_PROFILE); + + // Whitelist of pkgs for this specific user, i.e. subset of pkgFlagMap for this user. + final Set<String> userWhitelist = new ArraySet<>(); + userWhitelist.add(packageName1); + + final UserSystemPackageInstaller uspi = new UserSystemPackageInstaller(null, pkgFlgMap); + + final PackageParser.Package pkg1 = new PackageParser.Package(packageName1); + final PackageParser.Package pkg2 = new PackageParser.Package(packageName2); + final PackageParser.Package pkg3 = new PackageParser.Package(packageName3); + final PackageParser.Package pkg4 = new PackageParser.Package(packageName4); + + // No implicit whitelist, so only install pkg1. + boolean implicit = false; + boolean isSysUser = false; + assertTrue(uspi.shouldInstallPackage(pkg1, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertFalse(uspi.shouldInstallPackage(pkg2, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertFalse(uspi.shouldInstallPackage(pkg3, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertFalse(uspi.shouldInstallPackage(pkg4, pkgFlgMap, userWhitelist, implicit, isSysUser)); + + // Use implicit whitelist, so install pkg1 and pkg4 + implicit = true; + isSysUser = false; + assertTrue(uspi.shouldInstallPackage(pkg1, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertFalse(uspi.shouldInstallPackage(pkg2, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertFalse(uspi.shouldInstallPackage(pkg3, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertTrue(uspi.shouldInstallPackage(pkg4, pkgFlgMap, userWhitelist, implicit, isSysUser)); + + // For user 0 specifically, we always implicitly whitelist. + implicit = false; + isSysUser = true; + assertTrue(uspi.shouldInstallPackage(pkg1, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertFalse(uspi.shouldInstallPackage(pkg2, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertFalse(uspi.shouldInstallPackage(pkg3, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertTrue(uspi.shouldInstallPackage(pkg4, pkgFlgMap, userWhitelist, implicit, isSysUser)); + } + + /** + * Tests that getWhitelistedPackagesForUserType works properly, assuming that + * mWhitelistedPackagesForUserTypes (i.e. determineWhitelistedPackagesForUserTypes) is correct. + */ + @Test + public void testGetWhitelistedPackagesForUserType() { + final String packageName1 = "pkg1"; // whitelisted for FULL + final String packageName2 = "pkg2"; // blacklisted whenever whitelisted + final String packageName3 = "pkg3"; // whitelisted for SYSTEM + final String packageName4 = "pkg4"; // whitelisted for FULL + + final ArrayMap<String, Integer> pkgFlagMap = new ArrayMap<>(); // Whitelist: pkgs per flags + pkgFlagMap.put(packageName1, FLAG_FULL); + pkgFlagMap.put(packageName2, 0); + pkgFlagMap.put(packageName3, FLAG_SYSTEM); + pkgFlagMap.put(packageName4, FLAG_FULL); + + // Whitelist of pkgs for this specific user, i.e. subset of pkgFlagMap for this user. + final Set<String> expectedUserWhitelist = new ArraySet<>(); + expectedUserWhitelist.add(packageName1); + + UserSystemPackageInstaller uspi = new UserSystemPackageInstaller(null, pkgFlagMap); + + Set<String> output = uspi.getWhitelistedPackagesForUserType(FLAG_FULL); + assertEquals("Whitelist for FULL is the wrong size", 2, output.size()); + assertTrue("Whitelist for FULL doesn't contain pkg1", output.contains(packageName1)); + assertTrue("Whitelist for FULL doesn't contain pkg4", output.contains(packageName4)); + + output = uspi.getWhitelistedPackagesForUserType(FLAG_SYSTEM); + assertEquals("Whitelist for SYSTEM is the wrong size", 1, output.size()); + assertTrue("Whitelist for SYSTEM doesn't contain pkg1", output.contains(packageName3)); + } + + /** + * Test that a newly created FULL user has the expected system packages. + * + * Assumes that SystemConfig and UserManagerService.determineWhitelistedPackagesForUserTypes + * work correctly (they are tested separately). + */ + @Test + public void testPackagesForCreateUser_full() { + final int userFlags = UserInfo.FLAG_FULL; + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE); + PackageManager pm = mContext.getPackageManager(); + + final SystemConfig sysConfig = new SystemConfigTestClass(true); + final ArrayMap<String, Integer> packageMap = + mUserSystemPackageInstaller.determineWhitelistedPackagesForUserTypes(sysConfig); + final Set<String> expectedPackages = new ArraySet<>(packageMap.size()); + for (int i = 0; i < packageMap.size(); i++) { + if ((userFlags & packageMap.valueAt(i)) != 0) { + expectedPackages.add(packageMap.keyAt(i)); + } + } + + final UserManager um = UserManager.get(mContext); + final UserInfo user = um.createUser("Test User", userFlags); + assertNotNull(user); + mRemoveUsers.add(user.id); + + final List<PackageInfo> packageInfos = pm.getInstalledPackagesAsUser( + PackageManager.MATCH_SYSTEM_ONLY + | PackageManager.MATCH_DISABLED_COMPONENTS + | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS, + user.id); + final Set<String> actualPackages = new ArraySet<>(packageInfos.size()); + for (PackageInfo p : packageInfos) { + actualPackages.add(p.packageName); + } + checkPackageDifferences(expectedPackages, actualPackages); + } + + /** Asserts that actual is a subset of expected. */ + private void checkPackageDifferences(Set<String> expected, Set<String> actual) { + final Set<String> uniqueToExpected = new ArraySet<>(expected); + uniqueToExpected.removeAll(actual); + final Set<String> uniqueToActual = new ArraySet<>(actual); + uniqueToActual.removeAll(expected); + + Log.v(TAG, "Expected list uniquely has " + uniqueToExpected); + Log.v(TAG, "Actual list uniquely has " + uniqueToActual); + + assertTrue("User's system packages includes non-whitelisted packages: " + uniqueToActual, + uniqueToActual.isEmpty()); + } + + /** + * Test that setEnableUserTypePackageWhitelist() has the correct effect. + */ + @Test + public void testSetWhitelistEnabledMode() { + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE); + assertFalse(mUserSystemPackageInstaller.isLogMode()); + assertFalse(mUserSystemPackageInstaller.isEnforceMode()); + assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode()); + + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_LOG); + assertTrue(mUserSystemPackageInstaller.isLogMode()); + assertFalse(mUserSystemPackageInstaller.isEnforceMode()); + assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode()); + + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE); + assertFalse(mUserSystemPackageInstaller.isLogMode()); + assertTrue(mUserSystemPackageInstaller.isEnforceMode()); + assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode()); + + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST); + assertFalse(mUserSystemPackageInstaller.isLogMode()); + assertFalse(mUserSystemPackageInstaller.isEnforceMode()); + assertTrue(mUserSystemPackageInstaller.isImplicitWhitelistMode()); + + setUserTypePackageWhitelistMode( + USER_TYPE_PACKAGE_WHITELIST_MODE_LOG | USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE); + assertTrue(mUserSystemPackageInstaller.isLogMode()); + assertTrue(mUserSystemPackageInstaller.isEnforceMode()); + assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode()); + + setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST + | USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE); + assertFalse(mUserSystemPackageInstaller.isLogMode()); + assertTrue(mUserSystemPackageInstaller.isEnforceMode()); + assertTrue(mUserSystemPackageInstaller.isImplicitWhitelistMode()); + } + + /** Sets the whitelist mode to the desired value via adb's setprop. */ + private void setUserTypePackageWhitelistMode(int mode) { + UiDevice mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); + try { + String result = mUiDevice.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")); + } catch (IOException e) { + fail("Failed to set sysprop " + PACKAGE_WHITELIST_MODE_PROP + ":\n" + e); + } + } + + 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); + return pkgFlagMap; + } +} diff --git a/services/tests/servicestests/src/com/android/server/protolog/ProtoLogImplTest.java b/services/tests/servicestests/src/com/android/server/protolog/ProtoLogImplTest.java index 7aa3d0dfdd1f..3e9f625ecdd9 100644 --- a/services/tests/servicestests/src/com/android/server/protolog/ProtoLogImplTest.java +++ b/services/tests/servicestests/src/com/android/server/protolog/ProtoLogImplTest.java @@ -351,7 +351,7 @@ public class ProtoLogImplTest { ProtoLogData data = readProtoLogSingle(ip); assertNotNull(data); assertEquals(1234, data.mMessageHash.longValue()); - assertTrue(before < data.mElapsedTime && data.mElapsedTime < after); + assertTrue(before <= data.mElapsedTime && data.mElapsedTime <= after); assertArrayEquals(new String[]{"test"}, data.mStrParams.toArray()); assertArrayEquals(new Long[]{1L, 2L, 3L}, data.mSint64Params.toArray()); assertArrayEquals(new Double[]{0.4, 0.5, 0.6}, data.mDoubleParams.toArray()); @@ -376,7 +376,7 @@ public class ProtoLogImplTest { ProtoLogData data = readProtoLogSingle(ip); assertNotNull(data); assertEquals(1234, data.mMessageHash.longValue()); - assertTrue(before < data.mElapsedTime && data.mElapsedTime < after); + assertTrue(before <= data.mElapsedTime && data.mElapsedTime <= after); assertArrayEquals(new String[]{"test", "(INVALID PARAMS_MASK) true"}, data.mStrParams.toArray()); assertArrayEquals(new Long[]{1L}, data.mSint64Params.toArray()); diff --git a/services/tests/servicestests/src/com/android/server/stats/ProcfsMemoryUtilTest.java b/services/tests/servicestests/src/com/android/server/stats/ProcfsMemoryUtilTest.java index ae5777403528..dd2ee5cce13b 100644 --- a/services/tests/servicestests/src/com/android/server/stats/ProcfsMemoryUtilTest.java +++ b/services/tests/servicestests/src/com/android/server/stats/ProcfsMemoryUtilTest.java @@ -16,7 +16,6 @@ package com.android.server.stats; import static com.android.server.stats.ProcfsMemoryUtil.parseMemorySnapshotFromStatus; -import static com.android.server.stats.ProcfsMemoryUtil.parseVmHWMFromStatus; import static com.google.common.truth.Truth.assertThat; @@ -80,45 +79,25 @@ public class ProcfsMemoryUtilTest { + "nonvoluntary_ctxt_switches:\t104\n"; @Test - public void testParseVmHWMFromStatus_parsesCorrectValue() { - assertThat(parseVmHWMFromStatus(STATUS_CONTENTS)).isEqualTo(137668); - } - - @Test - public void testParseVmHWMFromStatus_invalidValue() { - assertThat(parseVmHWMFromStatus("test\nVmHWM: x0x0x\ntest")).isEqualTo(0); - } - - @Test - public void testParseVmHWMFromStatus_emptyContents() { - assertThat(parseVmHWMFromStatus("")).isEqualTo(0); - } - - @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); - assertThat(snapshot.isEmpty()).isFalse(); } @Test public void testParseMemorySnapshotFromStatus_invalidValue() { MemorySnapshot snapshot = parseMemorySnapshotFromStatus("test\nVmRSS:\tx0x0x\nVmSwap:\t1 kB\ntest"); - assertThat(snapshot.rssInKilobytes).isEqualTo(0); - assertThat(snapshot.anonRssInKilobytes).isEqualTo(0); - assertThat(snapshot.swapInKilobytes).isEqualTo(1); - assertThat(snapshot.isEmpty()).isFalse(); + assertThat(snapshot).isNull(); } @Test public void testParseMemorySnapshotFromStatus_emptyContents() { MemorySnapshot snapshot = parseMemorySnapshotFromStatus(""); - assertThat(snapshot.rssInKilobytes).isEqualTo(0); - assertThat(snapshot.anonRssInKilobytes).isEqualTo(0); - assertThat(snapshot.swapInKilobytes).isEqualTo(0); - assertThat(snapshot.isEmpty()).isTrue(); + assertThat(snapshot).isNull(); } } diff --git a/services/tests/wmtests/src/com/android/server/wm/PinnedStackControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/PinnedStackControllerTest.java deleted file mode 100644 index e9c226340164..000000000000 --- a/services/tests/wmtests/src/com/android/server/wm/PinnedStackControllerTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm; - -import static android.view.Display.DEFAULT_DISPLAY; - -import static com.android.dx.mockito.inline.extended.ExtendedMockito.never; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.reset; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; - -import android.os.RemoteException; -import android.platform.test.annotations.Presubmit; -import android.view.IPinnedStackListener; - -import androidx.test.filters.SmallTest; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -/** - * Build/Install/Run: - * atest FrameworksServicesTests:PinnedStackControllerTest - */ -@SmallTest -@Presubmit -public class PinnedStackControllerTest extends WindowTestsBase { - - private static final int SHELF_HEIGHT = 300; - - @Mock private IPinnedStackListener mIPinnedStackListener; - @Mock private IPinnedStackListener.Stub mIPinnedStackListenerStub; - - @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - - when(mIPinnedStackListener.asBinder()).thenReturn(mIPinnedStackListenerStub); - } - - @Test - public void setShelfHeight_shelfVisibilityChangedTriggered() throws RemoteException { - mWm.mAtmService.mSupportsPictureInPicture = true; - mWm.registerPinnedStackListener(DEFAULT_DISPLAY, mIPinnedStackListener); - - verify(mIPinnedStackListener).onImeVisibilityChanged(false, 0); - verify(mIPinnedStackListener).onShelfVisibilityChanged(false, 0); - verify(mIPinnedStackListener).onMovementBoundsChanged(any(), eq(false), - eq(false)); - verify(mIPinnedStackListener).onActionsChanged(any()); - verify(mIPinnedStackListener).onMinimizedStateChanged(anyBoolean()); - - reset(mIPinnedStackListener); - - mWm.setShelfHeight(true, SHELF_HEIGHT); - verify(mIPinnedStackListener).onShelfVisibilityChanged(true, SHELF_HEIGHT); - verify(mIPinnedStackListener).onMovementBoundsChanged(any(), eq(false), - eq(true)); - verify(mIPinnedStackListener, never()).onImeVisibilityChanged(anyBoolean(), anyInt()); - } -} diff --git a/services/tests/wmtests/src/com/android/server/wm/ProtoLogIntegrationTest.java b/services/tests/wmtests/src/com/android/server/wm/ProtoLogIntegrationTest.java index 8eecff532ad9..acbbc461e4dd 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ProtoLogIntegrationTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/ProtoLogIntegrationTest.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -47,7 +48,7 @@ public class ProtoLogIntegrationTest { ProtoLogGroup.testProtoLog(); verify(mockedProtoLog).log(eq(ProtoLogImpl.LogLevel.ERROR), eq( ProtoLogGroup.TEST_GROUP), - eq(485522692), eq(0b0010101001010111), + anyInt(), eq(0b0010101001010111), eq(ProtoLogGroup.TEST_GROUP.isLogToLogcat() ? "Test completed successfully: %b %d %o %x %e %g %f %% %s" : null), diff --git a/services/wifi/Android.bp b/services/wifi/Android.bp index 608fc2c7a55e..3c916a6d00cd 100644 --- a/services/wifi/Android.bp +++ b/services/wifi/Android.bp @@ -5,9 +5,6 @@ java_library_static { "java/**/*.java", "java/**/*.aidl", ], - aidl: { - local_include_dirs: ["java"] - }, libs: [ "services.net", ], diff --git a/services/wifi/java/android/net/wifi/IWifiStackConnector.aidl b/services/wifi/java/android/net/wifi/IWifiStackConnector.aidl index 3af4666b8d9c..eadc7260e81b 100644 --- a/services/wifi/java/android/net/wifi/IWifiStackConnector.aidl +++ b/services/wifi/java/android/net/wifi/IWifiStackConnector.aidl @@ -15,9 +15,8 @@ */ package android.net.wifi; -import android.net.wifi.WifiApiServiceInfo; - /** @hide */ interface IWifiStackConnector { - List<WifiApiServiceInfo> getWifiApiServiceInfos(); + IBinder retrieveApiServiceImpl(String serviceName); + boolean startApiService(String serviceName); } diff --git a/services/wifi/java/android/net/wifi/WifiStackClient.java b/services/wifi/java/android/net/wifi/WifiStackClient.java index dcdfbc54687c..64af7a8845a7 100644 --- a/services/wifi/java/android/net/wifi/WifiStackClient.java +++ b/services/wifi/java/android/net/wifi/WifiStackClient.java @@ -21,13 +21,12 @@ import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL; import android.annotation.NonNull; import android.content.Context; import android.net.ConnectivityModuleConnector; +import android.os.HandlerThread; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; -import java.util.List; - /** * Service used to communicate with the wifi stack, which could be running in a separate * module. @@ -57,23 +56,21 @@ public class WifiStackClient { @Override public void onModuleServiceConnected(IBinder service) { Log.i(TAG, "Wifi stack connected"); - registerWifiStackService(service); - - IWifiStackConnector connector = IWifiStackConnector.Stub.asInterface(service); - List<WifiApiServiceInfo> wifiApiServiceInfos; - try { - wifiApiServiceInfos = connector.getWifiApiServiceInfos(); - } catch (RemoteException e) { - throw new RuntimeException("Failed to getWifiApiServiceInfos()", e); - } + // spin up a new thread to not block system_server main thread + HandlerThread thread = new HandlerThread("InitWifiServicesThread"); + thread.start(); + thread.getThreadHandler().post(() -> { + registerWifiStackService(service); + IWifiStackConnector connector = IWifiStackConnector.Stub.asInterface(service); + registerApiServiceAndStart(connector, Context.WIFI_SCANNING_SERVICE); + registerApiServiceAndStart(connector, Context.WIFI_SERVICE); + registerApiServiceAndStart(connector, Context.WIFI_P2P_SERVICE); + registerApiServiceAndStart(connector, Context.WIFI_AWARE_SERVICE); + registerApiServiceAndStart(connector, Context.WIFI_RTT_RANGING_SERVICE); - for (WifiApiServiceInfo wifiApiServiceInfo : wifiApiServiceInfos) { - String serviceName = wifiApiServiceInfo.name; - IBinder binder = wifiApiServiceInfo.binder; - Log.i(TAG, "Registering " + serviceName); - ServiceManager.addService(serviceName, binder); - } + thread.quitSafely(); + }); } } @@ -84,6 +81,32 @@ public class WifiStackClient { Log.i(TAG, "Wifi stack service registered"); } + private void registerApiServiceAndStart( + IWifiStackConnector stackConnector, String serviceName) { + IBinder service = null; + try { + service = stackConnector.retrieveApiServiceImpl(serviceName); + } catch (RemoteException e) { + throw new RuntimeException("Failed to retrieve service impl " + serviceName, e); + } + if (service == null) { + Log.i(TAG, "Service " + serviceName + " not available"); + return; + } + Log.i(TAG, "Registering " + serviceName); + ServiceManager.addService(serviceName, service); + + boolean success = false; + try { + success = stackConnector.startApiService(serviceName); + } catch (RemoteException e) { + throw new RuntimeException("Failed to start service " + serviceName, e); + } + if (!success) { + throw new RuntimeException("Service " + serviceName + " start failed"); + } + } + /** * Start the wifi stack. Should be called only once on device startup. * diff --git a/startop/view_compiler/dex_builder.cc b/startop/view_compiler/dex_builder.cc index 499c42e2888b..48b44d0fc99b 100644 --- a/startop/view_compiler/dex_builder.cc +++ b/startop/view_compiler/dex_builder.cc @@ -161,7 +161,7 @@ void WriteTestDexFile(const string& filename) { MethodBuilder method{cbuilder.CreateMethod("foo", Prototype{TypeDescriptor::Int(), string_type})}; - Value result = method.MakeRegister(); + LiveRegister result = method.AllocRegister(); MethodDeclData string_length = dex_file.GetOrDeclareMethod(string_type, "length", Prototype{TypeDescriptor::Int()}); @@ -314,7 +314,7 @@ ir::EncodedMethod* MethodBuilder::Encode() { CHECK(decl_->prototype != nullptr); size_t const num_args = decl_->prototype->param_types != nullptr ? decl_->prototype->param_types->types.size() : 0; - code->registers = num_registers_ + num_args + kMaxScratchRegisters; + code->registers = NumRegisters() + num_args + kMaxScratchRegisters; code->ins_count = num_args; EncodeInstructions(); code->instructions = slicer::ArrayView<const ::dex::u2>(buffer_.data(), buffer_.size()); @@ -327,7 +327,20 @@ ir::EncodedMethod* MethodBuilder::Encode() { return method; } -Value MethodBuilder::MakeRegister() { return Value::Local(num_registers_++); } +LiveRegister MethodBuilder::AllocRegister() { + // Find a free register + for (size_t i = 0; i < register_liveness_.size(); ++i) { + if (!register_liveness_[i]) { + register_liveness_[i] = true; + return LiveRegister{®ister_liveness_, i}; + } + } + + // If we get here, all the registers are in use, so we have to allocate a new + // one. + register_liveness_.push_back(true); + return LiveRegister{®ister_liveness_, register_liveness_.size() - 1}; +} Value MethodBuilder::MakeLabel() { labels_.push_back({}); @@ -600,7 +613,7 @@ size_t MethodBuilder::RegisterValue(const Value& value) const { if (value.is_register()) { return value.value(); } else if (value.is_parameter()) { - return value.value() + num_registers_ + kMaxScratchRegisters; + return value.value() + NumRegisters() + kMaxScratchRegisters; } CHECK(false && "Must be either a parameter or a register"); return 0; diff --git a/startop/view_compiler/dex_builder.h b/startop/view_compiler/dex_builder.h index 292d6599c115..3924e77fab59 100644 --- a/startop/view_compiler/dex_builder.h +++ b/startop/view_compiler/dex_builder.h @@ -140,6 +140,29 @@ class Value { constexpr Value(size_t value, Kind kind) : value_{value}, kind_{kind} {} }; +// Represents an allocated register returned by MethodBuilder::AllocRegister +class LiveRegister { + friend class MethodBuilder; + + public: + LiveRegister(LiveRegister&& other) : liveness_{other.liveness_}, index_{other.index_} { + other.index_ = {}; + }; + ~LiveRegister() { + if (index_.has_value()) { + (*liveness_)[*index_] = false; + } + }; + + operator const Value() const { return Value::Local(*index_); } + + private: + LiveRegister(std::vector<bool>* liveness, size_t index) : liveness_{liveness}, index_{index} {} + + std::vector<bool>* const liveness_; + std::optional<size_t> index_; +}; + // A virtual instruction. We convert these to real instructions in MethodBuilder::Encode. // Virtual instructions are needed to keep track of information that is not known until all of the // code is generated. This information includes things like how many local registers are created and @@ -178,7 +201,8 @@ class Instruction { } // For most instructions, which take some number of arguments and have an optional return value. template <typename... T> - static inline Instruction OpWithArgs(Op opcode, std::optional<const Value> dest, T... args) { + static inline Instruction OpWithArgs(Op opcode, std::optional<const Value> dest, + const T&... args) { return Instruction{opcode, /*index_argument=*/0, /*result_is_object=*/false, dest, args...}; } @@ -199,14 +223,14 @@ class Instruction { template <typename... T> static inline Instruction InvokeVirtualObject(size_t index_argument, std::optional<const Value> dest, Value this_arg, - T... args) { + const T&... args) { return Instruction{ Op::kInvokeVirtual, index_argument, /*result_is_object=*/true, dest, this_arg, args...}; } // For direct calls (basically, constructors). template <typename... T> static inline Instruction InvokeDirect(size_t index_argument, std::optional<const Value> dest, - Value this_arg, T... args) { + Value this_arg, const T&... args) { return Instruction{ Op::kInvokeDirect, index_argument, /*result_is_object=*/false, dest, this_arg, args...}; } @@ -234,7 +258,7 @@ class Instruction { // For static calls. template <typename... T> static inline Instruction InvokeInterface(size_t index_argument, std::optional<const Value> dest, - T... args) { + const T&... args) { return Instruction{ Op::kInvokeInterface, index_argument, /*result_is_object=*/false, dest, args...}; } @@ -277,7 +301,7 @@ class Instruction { template <typename... T> inline Instruction(Op opcode, size_t index_argument, bool result_is_object, - std::optional<const Value> dest, T... args) + std::optional<const Value> dest, const T&... args) : opcode_{opcode}, index_argument_{index_argument}, result_is_object_{result_is_object}, @@ -309,10 +333,8 @@ class MethodBuilder { // Encode the method into DEX format. ir::EncodedMethod* Encode(); - // Create a new register to be used to storing values. Note that these are not SSA registers, like - // might be expected in similar code generators. This does no liveness tracking or anything, so - // it's up to the caller to reuse registers as appropriate. - Value MakeRegister(); + // Create a new register to be used to storing values. + LiveRegister AllocRegister(); Value MakeLabel(); @@ -329,7 +351,7 @@ class MethodBuilder { void BuildConst4(Value target, int value); void BuildConstString(Value target, const std::string& value); template <typename... T> - void BuildNew(Value target, TypeDescriptor type, Prototype constructor, T... args); + void BuildNew(Value target, TypeDescriptor type, Prototype constructor, const T&... args); // TODO: add builders for more instructions @@ -427,7 +449,7 @@ class MethodBuilder { static_assert(num_regs <= kMaxScratchRegisters); std::array<Value, num_regs> regs; for (size_t i = 0; i < num_regs; ++i) { - regs[i] = std::move(Value::Local(num_registers_ + i)); + regs[i] = std::move(Value::Local(NumRegisters() + i)); } return regs; } @@ -457,8 +479,9 @@ class MethodBuilder { // around to make legal DEX code. static constexpr size_t kMaxScratchRegisters = 5; - // How many registers we've allocated - size_t num_registers_{0}; + size_t NumRegisters() const { + return register_liveness_.size(); + } // Stores information needed to back-patch a label once it is bound. We need to know the start of // the instruction that refers to the label, and the offset to where the actual label value should @@ -478,6 +501,8 @@ class MethodBuilder { // During encoding, keep track of the largest number of arguments needed, so we can use it for our // outs count size_t max_args_{0}; + + std::vector<bool> register_liveness_; }; // A helper to build class definitions. @@ -576,7 +601,8 @@ class DexBuilder { }; template <typename... T> -void MethodBuilder::BuildNew(Value target, TypeDescriptor type, Prototype constructor, T... args) { +void MethodBuilder::BuildNew(Value target, TypeDescriptor type, Prototype constructor, + const T&... args) { MethodDeclData constructor_data{dex_->GetOrDeclareMethod(type, "<init>", constructor)}; // allocate the object ir::Type* type_def = dex_->GetOrAddType(type.descriptor()); diff --git a/startop/view_compiler/dex_layout_compiler.cc b/startop/view_compiler/dex_layout_compiler.cc index 8febfb71ecd1..cb820f8f20fb 100644 --- a/startop/view_compiler/dex_layout_compiler.cc +++ b/startop/view_compiler/dex_layout_compiler.cc @@ -22,76 +22,94 @@ namespace startop { using android::base::StringPrintf; +using dex::Instruction; +using dex::LiveRegister; +using dex::Prototype; +using dex::TypeDescriptor; +using dex::Value; + +namespace { +// TODO: these are a bunch of static initializers, which we should avoid. See if +// we can make them constexpr. +const TypeDescriptor kAttributeSet = TypeDescriptor::FromClassname("android.util.AttributeSet"); +const TypeDescriptor kContext = TypeDescriptor::FromClassname("android.content.Context"); +const TypeDescriptor kLayoutInflater = TypeDescriptor::FromClassname("android.view.LayoutInflater"); +const TypeDescriptor kResources = TypeDescriptor::FromClassname("android.content.res.Resources"); +const TypeDescriptor kString = TypeDescriptor::FromClassname("java.lang.String"); +const TypeDescriptor kView = TypeDescriptor::FromClassname("android.view.View"); +const TypeDescriptor kViewGroup = TypeDescriptor::FromClassname("android.view.ViewGroup"); +const TypeDescriptor kXmlResourceParser = + TypeDescriptor::FromClassname("android.content.res.XmlResourceParser"); +} // namespace DexViewBuilder::DexViewBuilder(dex::MethodBuilder* method) : method_{method}, - context_{dex::Value::Parameter(0)}, - resid_{dex::Value::Parameter(1)}, - inflater_{method->MakeRegister()}, - xml_{method->MakeRegister()}, - attrs_{method->MakeRegister()}, - classname_tmp_{method->MakeRegister()}, - xml_next_{method->dex_file()->GetOrDeclareMethod( - dex::TypeDescriptor::FromClassname("android.content.res.XmlResourceParser"), "next", - dex::Prototype{dex::TypeDescriptor::Int()})}, + context_{Value::Parameter(0)}, + resid_{Value::Parameter(1)}, + inflater_{method->AllocRegister()}, + xml_{method->AllocRegister()}, + attrs_{method->AllocRegister()}, + classname_tmp_{method->AllocRegister()}, + xml_next_{method->dex_file()->GetOrDeclareMethod(kXmlResourceParser, "next", + Prototype{TypeDescriptor::Int()})}, try_create_view_{method->dex_file()->GetOrDeclareMethod( - dex::TypeDescriptor::FromClassname("android.view.LayoutInflater"), "tryCreateView", - dex::Prototype{dex::TypeDescriptor::FromClassname("android.view.View"), - dex::TypeDescriptor::FromClassname("android.view.View"), - dex::TypeDescriptor::FromClassname("java.lang.String"), - dex::TypeDescriptor::FromClassname("android.content.Context"), - dex::TypeDescriptor::FromClassname("android.util.AttributeSet")})}, + kLayoutInflater, "tryCreateView", + Prototype{kView, kView, kString, kContext, kAttributeSet})}, generate_layout_params_{method->dex_file()->GetOrDeclareMethod( - dex::TypeDescriptor::FromClassname("android.view.ViewGroup"), "generateLayoutParams", - dex::Prototype{dex::TypeDescriptor::FromClassname("android.view.ViewGroup$LayoutParams"), - dex::TypeDescriptor::FromClassname("android.util.AttributeSet")})}, + kViewGroup, "generateLayoutParams", + Prototype{TypeDescriptor::FromClassname("android.view.ViewGroup$LayoutParams"), + kAttributeSet})}, add_view_{method->dex_file()->GetOrDeclareMethod( - dex::TypeDescriptor::FromClassname("android.view.ViewGroup"), "addView", - dex::Prototype{ - dex::TypeDescriptor::Void(), - dex::TypeDescriptor::FromClassname("android.view.View"), - dex::TypeDescriptor::FromClassname("android.view.ViewGroup$LayoutParams")})}, - // The register stack starts with one register, which will be null for the root view. - register_stack_{{method->MakeRegister()}} {} - -void DexViewBuilder::Start() { - dex::DexBuilder* const dex = method_->dex_file(); - - // LayoutInflater inflater = LayoutInflater.from(context); - auto layout_inflater_from = dex->GetOrDeclareMethod( - dex::TypeDescriptor::FromClassname("android.view.LayoutInflater"), - "from", - dex::Prototype{dex::TypeDescriptor::FromClassname("android.view.LayoutInflater"), - dex::TypeDescriptor::FromClassname("android.content.Context")}); - method_->AddInstruction( - dex::Instruction::InvokeStaticObject(layout_inflater_from.id, /*dest=*/inflater_, context_)); + kViewGroup, "addView", + Prototype{TypeDescriptor::Void(), + kView, + TypeDescriptor::FromClassname("android.view.ViewGroup$LayoutParams")})} {} + +void DexViewBuilder::BuildGetLayoutInflater(Value dest) { + // dest = LayoutInflater.from(context); + auto layout_inflater_from = method_->dex_file()->GetOrDeclareMethod( + kLayoutInflater, "from", Prototype{kLayoutInflater, kContext}); + method_->AddInstruction(Instruction::InvokeStaticObject(layout_inflater_from.id, dest, context_)); +} - // Resources res = context.getResources(); - auto context_type = dex::TypeDescriptor::FromClassname("android.content.Context"); - auto resources_type = dex::TypeDescriptor::FromClassname("android.content.res.Resources"); +void DexViewBuilder::BuildGetResources(Value dest) { + // dest = context.getResources(); auto get_resources = - dex->GetOrDeclareMethod(context_type, "getResources", dex::Prototype{resources_type}); - method_->AddInstruction(dex::Instruction::InvokeVirtualObject(get_resources.id, xml_, context_)); - - // XmlResourceParser xml = res.getLayout(resid); - auto xml_resource_parser_type = - dex::TypeDescriptor::FromClassname("android.content.res.XmlResourceParser"); - auto get_layout = - dex->GetOrDeclareMethod(resources_type, - "getLayout", - dex::Prototype{xml_resource_parser_type, dex::TypeDescriptor::Int()}); - method_->AddInstruction(dex::Instruction::InvokeVirtualObject(get_layout.id, xml_, xml_, resid_)); - - // AttributeSet attrs = Xml.asAttributeSet(xml); - auto as_attribute_set = dex->GetOrDeclareMethod( - dex::TypeDescriptor::FromClassname("android.util.Xml"), + method_->dex_file()->GetOrDeclareMethod(kContext, "getResources", Prototype{kResources}); + method_->AddInstruction(Instruction::InvokeVirtualObject(get_resources.id, dest, context_)); +} + +void DexViewBuilder::BuildGetLayoutResource(Value dest, Value resources, Value resid) { + // dest = resources.getLayout(resid); + auto get_layout = method_->dex_file()->GetOrDeclareMethod( + kResources, "getLayout", Prototype{kXmlResourceParser, TypeDescriptor::Int()}); + method_->AddInstruction(Instruction::InvokeVirtualObject(get_layout.id, dest, resources, resid)); +} + +void DexViewBuilder::BuildLayoutResourceToAttributeSet(dex::Value dest, + dex::Value layout_resource) { + // dest = Xml.asAttributeSet(layout_resource); + auto as_attribute_set = method_->dex_file()->GetOrDeclareMethod( + TypeDescriptor::FromClassname("android.util.Xml"), "asAttributeSet", - dex::Prototype{dex::TypeDescriptor::FromClassname("android.util.AttributeSet"), - dex::TypeDescriptor::FromClassname("org.xmlpull.v1.XmlPullParser")}); - method_->AddInstruction(dex::Instruction::InvokeStaticObject(as_attribute_set.id, attrs_, xml_)); + Prototype{kAttributeSet, TypeDescriptor::FromClassname("org.xmlpull.v1.XmlPullParser")}); + method_->AddInstruction( + Instruction::InvokeStaticObject(as_attribute_set.id, dest, layout_resource)); +} - // xml.next(); // start document - method_->AddInstruction(dex::Instruction::InvokeInterface(xml_next_.id, {}, xml_)); +void DexViewBuilder::BuildXmlNext() { + // xml_.next(); + method_->AddInstruction(Instruction::InvokeInterface(xml_next_.id, {}, xml_)); +} + +void DexViewBuilder::Start() { + BuildGetLayoutInflater(/*dest=*/inflater_); + BuildGetResources(/*dest=*/xml_); + BuildGetLayoutResource(/*dest=*/xml_, /*resources=*/xml_, resid_); + BuildLayoutResourceToAttributeSet(/*dest=*/attrs_, /*layout_resource=*/xml_); + + // Advance past start document tag + BuildXmlNext(); } void DexViewBuilder::Finish() {} @@ -107,58 +125,57 @@ std::string ResolveName(const std::string& name) { } } // namespace +void DexViewBuilder::BuildTryCreateView(Value dest, Value parent, Value classname) { + // dest = inflater_.tryCreateView(parent, classname, context_, attrs_); + method_->AddInstruction(Instruction::InvokeVirtualObject( + try_create_view_.id, dest, inflater_, parent, classname, context_, attrs_)); +} + void DexViewBuilder::StartView(const std::string& name, bool is_viewgroup) { bool const is_root_view = view_stack_.empty(); - // xml.next(); // start tag - method_->AddInstruction(dex::Instruction::InvokeInterface(xml_next_.id, {}, xml_)); + // Advance to start tag + BuildXmlNext(); - dex::Value view = AcquireRegister(); + LiveRegister view = AcquireRegister(); // try to create the view using the factories method_->BuildConstString(classname_tmp_, name); // TODO: the need to fully qualify the classname if (is_root_view) { - dex::Value null = AcquireRegister(); + LiveRegister null = AcquireRegister(); method_->BuildConst4(null, 0); - method_->AddInstruction(dex::Instruction::InvokeVirtualObject( - try_create_view_.id, view, inflater_, null, classname_tmp_, context_, attrs_)); - ReleaseRegister(); + BuildTryCreateView(/*dest=*/view, /*parent=*/null, classname_tmp_); } else { - method_->AddInstruction(dex::Instruction::InvokeVirtualObject( - try_create_view_.id, view, inflater_, GetCurrentView(), classname_tmp_, context_, attrs_)); + BuildTryCreateView(/*dest=*/view, /*parent=*/GetCurrentView(), classname_tmp_); } auto label = method_->MakeLabel(); // branch if not null method_->AddInstruction( - dex::Instruction::OpWithArgs(dex::Instruction::Op::kBranchNEqz, /*dest=*/{}, view, label)); + Instruction::OpWithArgs(Instruction::Op::kBranchNEqz, /*dest=*/{}, view, label)); // If null, create the class directly. method_->BuildNew(view, - dex::TypeDescriptor::FromClassname(ResolveName(name)), - dex::Prototype{dex::TypeDescriptor::Void(), - dex::TypeDescriptor::FromClassname("android.content.Context"), - dex::TypeDescriptor::FromClassname("android.util.AttributeSet")}, + TypeDescriptor::FromClassname(ResolveName(name)), + Prototype{TypeDescriptor::Void(), kContext, kAttributeSet}, context_, attrs_); - method_->AddInstruction( - dex::Instruction::OpWithArgs(dex::Instruction::Op::kBindLabel, /*dest=*/{}, label)); + method_->AddInstruction(Instruction::OpWithArgs(Instruction::Op::kBindLabel, /*dest=*/{}, label)); if (is_viewgroup) { // Cast to a ViewGroup so we can add children later. - const ir::Type* view_group_def = method_->dex_file()->GetOrAddType( - dex::TypeDescriptor::FromClassname("android.view.ViewGroup").descriptor()); - method_->AddInstruction(dex::Instruction::Cast(view, dex::Value::Type(view_group_def->orig_index))); + const ir::Type* view_group_def = method_->dex_file()->GetOrAddType(kViewGroup.descriptor()); + method_->AddInstruction(Instruction::Cast(view, Value::Type(view_group_def->orig_index))); } if (!is_root_view) { // layout_params = parent.generateLayoutParams(attrs); - dex::Value layout_params{AcquireRegister()}; - method_->AddInstruction(dex::Instruction::InvokeVirtualObject( + LiveRegister layout_params{AcquireRegister()}; + method_->AddInstruction(Instruction::InvokeVirtualObject( generate_layout_params_.id, layout_params, GetCurrentView(), attrs_)); - view_stack_.push_back({view, layout_params}); + view_stack_.push_back({std::move(view), std::move(layout_params)}); } else { - view_stack_.push_back({view, {}}); + view_stack_.push_back({std::move(view), {}}); } } @@ -167,40 +184,24 @@ void DexViewBuilder::FinishView() { method_->BuildReturn(GetCurrentView(), /*is_object=*/true); } else { // parent.add(view, layout_params) - method_->AddInstruction(dex::Instruction::InvokeVirtual( + method_->AddInstruction(Instruction::InvokeVirtual( add_view_.id, /*dest=*/{}, GetParentView(), GetCurrentView(), GetCurrentLayoutParams())); // xml.next(); // end tag - method_->AddInstruction(dex::Instruction::InvokeInterface(xml_next_.id, {}, xml_)); + method_->AddInstruction(Instruction::InvokeInterface(xml_next_.id, {}, xml_)); } PopViewStack(); } -dex::Value DexViewBuilder::AcquireRegister() { - top_register_++; - if (register_stack_.size() == top_register_) { - register_stack_.push_back(method_->MakeRegister()); - } - return register_stack_[top_register_]; -} - -void DexViewBuilder::ReleaseRegister() { top_register_--; } +LiveRegister DexViewBuilder::AcquireRegister() { return method_->AllocRegister(); } -dex::Value DexViewBuilder::GetCurrentView() const { return view_stack_.back().view; } -dex::Value DexViewBuilder::GetCurrentLayoutParams() const { +Value DexViewBuilder::GetCurrentView() const { return view_stack_.back().view; } +Value DexViewBuilder::GetCurrentLayoutParams() const { return view_stack_.back().layout_params.value(); } -dex::Value DexViewBuilder::GetParentView() const { - return view_stack_[view_stack_.size() - 2].view; -} +Value DexViewBuilder::GetParentView() const { return view_stack_[view_stack_.size() - 2].view; } void DexViewBuilder::PopViewStack() { - const auto& top = view_stack_.back(); - // release the layout params if we have them - if (top.layout_params.has_value()) { - ReleaseRegister(); - } // Unconditionally release the view register. - ReleaseRegister(); view_stack_.pop_back(); } diff --git a/startop/view_compiler/dex_layout_compiler.h b/startop/view_compiler/dex_layout_compiler.h index 170a1a610297..a34ed1f0168e 100644 --- a/startop/view_compiler/dex_layout_compiler.h +++ b/startop/view_compiler/dex_layout_compiler.h @@ -79,36 +79,41 @@ class DexViewBuilder { private: // Accessors for the stack of views that are under construction. - dex::Value AcquireRegister(); - void ReleaseRegister(); + dex::LiveRegister AcquireRegister(); dex::Value GetCurrentView() const; dex::Value GetCurrentLayoutParams() const; dex::Value GetParentView() const; void PopViewStack(); + // Methods to simplify building different code fragments. + void BuildGetLayoutInflater(dex::Value dest); + void BuildGetResources(dex::Value dest); + void BuildGetLayoutResource(dex::Value dest, dex::Value resources, dex::Value resid); + void BuildLayoutResourceToAttributeSet(dex::Value dest, dex::Value layout_resource); + void BuildXmlNext(); + void BuildTryCreateView(dex::Value dest, dex::Value parent, dex::Value classname); + dex::MethodBuilder* method_; - // Registers used for code generation + // Parameters to the generated method dex::Value const context_; dex::Value const resid_; - const dex::Value inflater_; - const dex::Value xml_; - const dex::Value attrs_; - const dex::Value classname_tmp_; + + // Registers used for code generation + const dex::LiveRegister inflater_; + const dex::LiveRegister xml_; + const dex::LiveRegister attrs_; + const dex::LiveRegister classname_tmp_; const dex::MethodDeclData xml_next_; const dex::MethodDeclData try_create_view_; const dex::MethodDeclData generate_layout_params_; const dex::MethodDeclData add_view_; - // used for keeping track of which registers are in use - size_t top_register_{0}; - std::vector<dex::Value> register_stack_; - // Keep track of the views currently in progress. struct ViewEntry { - dex::Value view; - std::optional<dex::Value> layout_params; + dex::LiveRegister view; + std::optional<dex::LiveRegister> layout_params; }; std::vector<ViewEntry> view_stack_; }; diff --git a/startop/view_compiler/dex_testcase_generator.cc b/startop/view_compiler/dex_testcase_generator.cc index 6dedf24e290d..5dda59e3473f 100644 --- a/startop/view_compiler/dex_testcase_generator.cc +++ b/startop/view_compiler/dex_testcase_generator.cc @@ -47,7 +47,7 @@ void GenerateSimpleTestCases(const string& outdir) { // int return5() { return 5; } auto return5{cbuilder.CreateMethod("return5", Prototype{TypeDescriptor::Int()})}; { - Value r{return5.MakeRegister()}; + LiveRegister r{return5.AllocRegister()}; return5.BuildConst4(r, 5); return5.BuildReturn(r); } @@ -57,9 +57,9 @@ void GenerateSimpleTestCases(const string& outdir) { auto integer_type{TypeDescriptor::FromClassname("java.lang.Integer")}; auto returnInteger5{cbuilder.CreateMethod("returnInteger5", Prototype{integer_type})}; [&](MethodBuilder& method) { - Value five{method.MakeRegister()}; + LiveRegister five{method.AllocRegister()}; method.BuildConst4(five, 5); - Value object{method.MakeRegister()}; + LiveRegister object{method.AllocRegister()}; method.BuildNew( object, integer_type, Prototype{TypeDescriptor::Void(), TypeDescriptor::Int()}, five); method.BuildReturn(object, /*is_object=*/true); @@ -80,7 +80,7 @@ void GenerateSimpleTestCases(const string& outdir) { auto returnStringLength{ cbuilder.CreateMethod("returnStringLength", Prototype{TypeDescriptor::Int(), string_type})}; { - Value result = returnStringLength.MakeRegister(); + LiveRegister result = returnStringLength.AllocRegister(); returnStringLength.AddInstruction( Instruction::InvokeVirtual(string_length.id, result, Value::Parameter(0))); returnStringLength.BuildReturn(result); @@ -91,7 +91,7 @@ void GenerateSimpleTestCases(const string& outdir) { MethodBuilder returnIfZero{cbuilder.CreateMethod( "returnIfZero", Prototype{TypeDescriptor::Int(), TypeDescriptor::Int()})}; { - Value resultIfZero{returnIfZero.MakeRegister()}; + LiveRegister resultIfZero{returnIfZero.AllocRegister()}; Value else_target{returnIfZero.MakeLabel()}; returnIfZero.AddInstruction(Instruction::OpWithArgs( Instruction::Op::kBranchEqz, /*dest=*/{}, Value::Parameter(0), else_target)); @@ -112,7 +112,7 @@ void GenerateSimpleTestCases(const string& outdir) { MethodBuilder returnIfNotZero{cbuilder.CreateMethod( "returnIfNotZero", Prototype{TypeDescriptor::Int(), TypeDescriptor::Int()})}; { - Value resultIfNotZero{returnIfNotZero.MakeRegister()}; + LiveRegister resultIfNotZero{returnIfNotZero.AllocRegister()}; Value else_target{returnIfNotZero.MakeLabel()}; returnIfNotZero.AddInstruction(Instruction::OpWithArgs( Instruction::Op::kBranchNEqz, /*dest=*/{}, Value::Parameter(0), else_target)); @@ -148,8 +148,8 @@ void GenerateSimpleTestCases(const string& outdir) { MethodBuilder backwardsBranch{ cbuilder.CreateMethod("backwardsBranch", Prototype{TypeDescriptor::Int()})}; [](MethodBuilder& method) { - Value zero = method.MakeRegister(); - Value result = method.MakeRegister(); + LiveRegister zero = method.AllocRegister(); + LiveRegister result = method.AllocRegister(); Value labelA = method.MakeLabel(); Value labelB = method.MakeLabel(); method.BuildConst4(zero, 0); @@ -177,7 +177,7 @@ void GenerateSimpleTestCases(const string& outdir) { // public static String returnNull() { return null; } MethodBuilder returnNull{cbuilder.CreateMethod("returnNull", Prototype{string_type})}; [](MethodBuilder& method) { - Value zero = method.MakeRegister(); + LiveRegister zero = method.AllocRegister(); method.BuildConst4(zero, 0); method.BuildReturn(zero, /*is_object=*/true); }(returnNull); @@ -188,7 +188,7 @@ void GenerateSimpleTestCases(const string& outdir) { // public static String makeString() { return "Hello, World!"; } MethodBuilder makeString{cbuilder.CreateMethod("makeString", Prototype{string_type})}; [](MethodBuilder& method) { - Value string = method.MakeRegister(); + LiveRegister string = method.AllocRegister(); method.BuildConstString(string, "Hello, World!"); method.BuildReturn(string, /*is_object=*/true); }(makeString); @@ -200,7 +200,7 @@ void GenerateSimpleTestCases(const string& outdir) { MethodBuilder returnStringIfZeroAB{ cbuilder.CreateMethod("returnStringIfZeroAB", Prototype{string_type, TypeDescriptor::Int()})}; [&](MethodBuilder& method) { - Value resultIfZero{method.MakeRegister()}; + LiveRegister resultIfZero{method.AllocRegister()}; Value else_target{method.MakeLabel()}; method.AddInstruction(Instruction::OpWithArgs( Instruction::Op::kBranchEqz, /*dest=*/{}, Value::Parameter(0), else_target)); @@ -220,7 +220,7 @@ void GenerateSimpleTestCases(const string& outdir) { MethodBuilder returnStringIfZeroBA{ cbuilder.CreateMethod("returnStringIfZeroBA", Prototype{string_type, TypeDescriptor::Int()})}; [&](MethodBuilder& method) { - Value resultIfZero{method.MakeRegister()}; + LiveRegister resultIfZero{method.AllocRegister()}; Value else_target{method.MakeLabel()}; method.AddInstruction(Instruction::OpWithArgs( Instruction::Op::kBranchEqz, /*dest=*/{}, Value::Parameter(0), else_target)); @@ -244,7 +244,7 @@ void GenerateSimpleTestCases(const string& outdir) { cbuilder.CreateMethod("invokeStaticReturnObject", Prototype{string_type, TypeDescriptor::Int(), TypeDescriptor::Int()})}; [&](MethodBuilder& method) { - Value result{method.MakeRegister()}; + LiveRegister result{method.AllocRegister()}; MethodDeclData to_string{dex_file.GetOrDeclareMethod( TypeDescriptor::FromClassname("java.lang.Integer"), "toString", @@ -260,7 +260,7 @@ void GenerateSimpleTestCases(const string& outdir) { MethodBuilder invokeVirtualReturnObject{cbuilder.CreateMethod( "invokeVirtualReturnObject", Prototype{string_type, string_type, TypeDescriptor::Int()})}; [&](MethodBuilder& method) { - Value result{method.MakeRegister()}; + LiveRegister result{method.AllocRegister()}; MethodDeclData substring{dex_file.GetOrDeclareMethod( string_type, "substring", Prototype{string_type, TypeDescriptor::Int()})}; method.AddInstruction(Instruction::InvokeVirtualObject( @@ -291,7 +291,7 @@ void GenerateSimpleTestCases(const string& outdir) { [&](MethodBuilder& method) { const ir::FieldDecl* field = dex_file.GetOrAddField(test_class, "staticInteger", TypeDescriptor::Int()); - Value result{method.MakeRegister()}; + LiveRegister result{method.AllocRegister()}; method.AddInstruction(Instruction::GetStaticField(field->orig_index, result)); method.BuildReturn(result, /*is_object=*/false); method.Encode(); @@ -304,7 +304,7 @@ void GenerateSimpleTestCases(const string& outdir) { [&](MethodBuilder& method) { const ir::FieldDecl* field = dex_file.GetOrAddField(test_class, "staticInteger", TypeDescriptor::Int()); - Value number{method.MakeRegister()}; + LiveRegister number{method.AllocRegister()}; method.BuildConst4(number, 7); method.AddInstruction(Instruction::SetStaticField(field->orig_index, number)); method.BuildReturn(); @@ -318,7 +318,7 @@ void GenerateSimpleTestCases(const string& outdir) { [&](MethodBuilder& method) { const ir::FieldDecl* field = dex_file.GetOrAddField(test_class, "instanceField", TypeDescriptor::Int()); - Value result{method.MakeRegister()}; + LiveRegister result{method.AllocRegister()}; method.AddInstruction(Instruction::GetField(field->orig_index, result, Value::Parameter(0))); method.BuildReturn(result, /*is_object=*/false); method.Encode(); @@ -331,7 +331,7 @@ void GenerateSimpleTestCases(const string& outdir) { [&](MethodBuilder& method) { const ir::FieldDecl* field = dex_file.GetOrAddField(test_class, "instanceField", TypeDescriptor::Int()); - Value number{method.MakeRegister()}; + LiveRegister number{method.AllocRegister()}; method.BuildConst4(number, 7); method.AddInstruction(Instruction::SetField(field->orig_index, Value::Parameter(0), number)); method.BuildReturn(); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 51de903ed37e..dcd35fdc4e16 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -896,6 +896,11 @@ public class SubscriptionManager { */ public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; + /** + * Integer extra to specify SIM slot index. + */ + public static final String EXTRA_SLOT_INDEX = "android.telephony.extra.SLOT_INDEX"; + private final Context mContext; private volatile INetworkPolicyManager mNetworkPolicy; @@ -2123,6 +2128,7 @@ public class SubscriptionManager { if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); intent.putExtra(EXTRA_SUBSCRIPTION_INDEX, subId); + intent.putExtra(EXTRA_SLOT_INDEX, phoneId); intent.putExtra(PhoneConstants.PHONE_KEY, phoneId); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 4fb9903a10be..4f276bc845ca 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2449,41 +2449,37 @@ public class TelephonyManager { * @return the lowercase 2 character ISO-3166 country code, or empty string if not available. */ public String getNetworkCountryIso() { - return getNetworkCountryIsoForPhone(getPhoneId()); + return getNetworkCountryIso(getPhoneId()); } /** - * Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current + * Returns the ISO-3166 country code equivalent of the MCC (Mobile Country Code) of the current * registered operator or the cell nearby, if available. * <p> + * The ISO-3166 country code is provided in lowercase 2 character format. + * <p> + * Note: In multi-sim, this returns a shared emergency network country iso from other + * subscription if the subscription used to create the TelephonyManager doesn't camp on + * a network due to some reason (e.g. pin/puk locked), or sim is absent in the corresponding + * slot. * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine * if on a CDMA network). - * - * @param subId for which Network CountryIso is returned - * @hide - */ - @UnsupportedAppUsage - public String getNetworkCountryIso(int subId) { - return getNetworkCountryIsoForPhone(getPhoneId(subId)); - } - - /** - * Returns the ISO country code equivalent of the current registered - * operator's MCC (Mobile Country Code) of a subscription. * <p> - * Availability: Only when user is registered to a network. Result may be - * unreliable on CDMA networks (use {@link #getPhoneType()} to determine if - * on a CDMA network). * - * @param phoneId for which Network CountryIso is returned + * @param slotIndex the SIM slot index to get network country ISO. + * + * @return the lowercase 2 character ISO-3166 country code, or empty string if not available. + * + * {@hide} */ - /** {@hide} */ - @UnsupportedAppUsage - public String getNetworkCountryIsoForPhone(int phoneId) { + @SystemApi + @TestApi + @NonNull + public String getNetworkCountryIso(int slotIndex) { try { ITelephony telephony = getITelephony(); if (telephony == null) return ""; - return telephony.getNetworkCountryIsoForPhone(phoneId); + return telephony.getNetworkCountryIsoForPhone(slotIndex); } catch (RemoteException ex) { return ""; } diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java index 28b331b17b91..da32c8c45a73 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -1496,7 +1496,7 @@ public class SmsMessage extends SmsMessageBase { * * @return true if this is a USIM data download message; false otherwise */ - public boolean isUsimDataDownload() { + boolean isUsimDataDownload() { return messageClass == MessageClass.CLASS_2 && (mProtocolIdentifier == 0x7f || mProtocolIdentifier == 0x7c); } diff --git a/tests/ApkVerityTest/Android.bp b/tests/ApkVerityTest/Android.bp new file mode 100644 index 000000000000..adcbb4287dd0 --- /dev/null +++ b/tests/ApkVerityTest/Android.bp @@ -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. + +java_test_host { + name: "ApkVerityTests", + srcs: ["src/**/*.java"], + libs: ["tradefed", "compatibility-tradefed", "compatibility-host-util"], + test_suites: ["general-tests"], + target_required: [ + "block_device_writer_module", + "ApkVerityTestApp", + "ApkVerityTestAppSplit", + ], + data: [ + ":ApkVerityTestCertDer", + ":ApkVerityTestAppFsvSig", + ":ApkVerityTestAppDm", + ":ApkVerityTestAppDmFsvSig", + ":ApkVerityTestAppSplitFsvSig", + ":ApkVerityTestAppSplitDm", + ":ApkVerityTestAppSplitDmFsvSig", + ], +} diff --git a/tests/ApkVerityTest/AndroidTest.xml b/tests/ApkVerityTest/AndroidTest.xml new file mode 100644 index 000000000000..73779cbd1a87 --- /dev/null +++ b/tests/ApkVerityTest/AndroidTest.xml @@ -0,0 +1,41 @@ +<?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. +--> +<configuration description="APK fs-verity integration/regression test"> + <option name="test-suite-tag" value="apct" /> + + <!-- This test requires root to write against block device. --> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + + <target_preparer class="com.android.tradefed.targetprep.DeviceSetup"> + <!-- Disable package verifier prevents it holding the target APK's fd that prevents cache + eviction. --> + <option name="set-global-setting" key="package_verifier_enable" value="0" /> + <option name="restore-settings" value="true" /> + + <!-- Skip in order to prevent reboot that confuses the test flow. --> + <option name="force-skip-system-props" value="true" /> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push" value="block_device_writer->/data/local/tmp/block_device_writer" /> + <option name="push" value="ApkVerityTestCert.der->/data/local/tmp/ApkVerityTestCert.der" /> + </target_preparer> + + <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" > + <option name="jar" value="ApkVerityTests.jar" /> + </test> +</configuration> diff --git a/tests/FlickerTests/lib/test/Android.bp b/tests/ApkVerityTest/ApkVerityTestApp/Android.bp index bfeb75b23469..69632b215822 100644 --- a/tests/FlickerTests/lib/test/Android.bp +++ b/tests/ApkVerityTest/ApkVerityTestApp/Android.bp @@ -1,5 +1,4 @@ -// -// 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. @@ -12,22 +11,19 @@ // 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: "FlickerLibTest", - // sign this with platform cert, so this test is allowed to call private platform apis - certificate: "platform", - platform_apis: true, - test_suites: ["tests"], - srcs: ["src/**/*.java"], - libs: ["android.test.runner"], - static_libs: [ - "androidx.test.rules", - "platform-test-annotations", - "truth-prebuilt", - "platformprotosnano", - "layersprotosnano", - "flickerlib", - ], +android_test_helper_app { + name: "ApkVerityTestApp", + manifest: "AndroidManifest.xml", + srcs: ["src/**/*.java"], +} + +android_test_helper_app { + name: "ApkVerityTestAppSplit", + manifest: "feature_split/AndroidManifest.xml", + srcs: ["src/**/*.java"], + aaptflags: [ + "--custom-package com.android.apkverity.feature_x", + "--package-id 0x80", + ], } diff --git a/tests/ApkVerityTest/ApkVerityTestApp/AndroidManifest.xml b/tests/ApkVerityTest/ApkVerityTestApp/AndroidManifest.xml new file mode 100644 index 000000000000..0b3ff77c2cdf --- /dev/null +++ b/tests/ApkVerityTest/ApkVerityTestApp/AndroidManifest.xml @@ -0,0 +1,23 @@ +<?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. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.apkverity"> + <application> + <activity android:name=".DummyActivity"/> + </application> +</manifest> diff --git a/tests/ApkVerityTest/ApkVerityTestApp/feature_split/AndroidManifest.xml b/tests/ApkVerityTest/ApkVerityTestApp/feature_split/AndroidManifest.xml new file mode 100644 index 000000000000..3f1a4f3a26a1 --- /dev/null +++ b/tests/ApkVerityTest/ApkVerityTestApp/feature_split/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?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. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.apkverity" + android:isFeatureSplit="true" + split="feature_x"> + <application> + <activity android:name=".feature_x.DummyActivity"/> + </application> +</manifest> diff --git a/services/wifi/java/android/net/wifi/WifiApiServiceInfo.aidl b/tests/ApkVerityTest/ApkVerityTestApp/feature_split/src/com/android/apkverity/feature_x/DummyActivity.java index 45e4c69102f0..0f694c293330 100644 --- a/services/wifi/java/android/net/wifi/WifiApiServiceInfo.aidl +++ b/tests/ApkVerityTest/ApkVerityTestApp/feature_split/src/com/android/apkverity/feature_x/DummyActivity.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package android.net.wifi; +package com.android.apkverity.feature_x; -/** @hide */ -parcelable WifiApiServiceInfo { - String name; - IBinder binder; -} +import android.app.Activity; + +/** Dummy class just to generate some dex */ +public class DummyActivity extends Activity {} diff --git a/services/net/java/android/net/NattKeepalivePacketDataParcelable.aidl b/tests/ApkVerityTest/ApkVerityTestApp/src/com/android/apkverity/DummyActivity.java index 6f006d4971fb..837c7be37504 100644 --- a/services/net/java/android/net/NattKeepalivePacketDataParcelable.aidl +++ b/tests/ApkVerityTest/ApkVerityTestApp/src/com/android/apkverity/DummyActivity.java @@ -14,12 +14,9 @@ * limitations under the License. */ -package android.net; +package com.android.apkverity; -parcelable NattKeepalivePacketDataParcelable { - byte[] srcAddress; - int srcPort; - byte[] dstAddress; - int dstPort; -} +import android.app.Activity; +/** Dummy class just to generate some dex */ +public class DummyActivity extends Activity {} diff --git a/tests/ApkVerityTest/block_device_writer/Android.bp b/tests/ApkVerityTest/block_device_writer/Android.bp new file mode 100644 index 000000000000..deed3a00d2fe --- /dev/null +++ b/tests/ApkVerityTest/block_device_writer/Android.bp @@ -0,0 +1,30 @@ +// 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. + +// This is a cc_test just because it supports test_suites. This should be converted to something +// like cc_binary_test_helper once supported. +cc_test { + // Depending on how the test runs, the executable may be uploaded to different location. + // Before the bug in the file pusher is fixed, workaround by making the name unique. + // See b/124718249#comment12. + name: "block_device_writer_module", + stem: "block_device_writer", + + srcs: ["block_device_writer.cpp"], + cflags: ["-Wall", "-Werror", "-Wextra", "-g"], + shared_libs: ["libbase", "libutils"], + + test_suites: ["general-tests"], + gtest: false, +} diff --git a/tests/ApkVerityTest/block_device_writer/block_device_writer.cpp b/tests/ApkVerityTest/block_device_writer/block_device_writer.cpp new file mode 100644 index 000000000000..b0c7251e77f5 --- /dev/null +++ b/tests/ApkVerityTest/block_device_writer/block_device_writer.cpp @@ -0,0 +1,189 @@ +/* + * 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 <cassert> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <memory> + +#include <errno.h> +#include <fcntl.h> +#include <linux/fiemap.h> +#include <linux/fs.h> +#include <sys/ioctl.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> + +#include <android-base/unique_fd.h> + +// This program modifies a file at given offset, but directly against the block +// device, purposely to bypass the filesystem. Note that the change on block +// device may not reflect the same way when read from filesystem, for example, +// when the file is encrypted on disk. +// +// Only one byte is supported for now just so that we don't need to handle the +// case when the range crosses different "extents". +// +// References: +// https://www.kernel.org/doc/Documentation/filesystems/fiemap.txt +// https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/io/fiemap.c + +ssize_t get_logical_block_size(const char* block_device) { + android::base::unique_fd fd(open(block_device, O_RDONLY)); + if (fd.get() < 0) { + fprintf(stderr, "open %s failed\n", block_device); + return -1; + } + + int size; + if (ioctl(fd, BLKSSZGET, &size) < 0) { + fprintf(stderr, "ioctl(BLKSSZGET) failed: %s\n", strerror(errno)); + return -1; + } + return size; +} + +int64_t get_physical_offset(const char* file_name, uint64_t byte_offset) { + android::base::unique_fd fd(open(file_name, O_RDONLY)); + if (fd.get() < 0) { + fprintf(stderr, "open %s failed\n", file_name); + return -1; + } + + const int map_size = sizeof(struct fiemap) + sizeof(struct fiemap_extent); + char fiemap_buffer[map_size] = {0}; + struct fiemap* fiemap = reinterpret_cast<struct fiemap*>(&fiemap_buffer); + + fiemap->fm_flags = FIEMAP_FLAG_SYNC; + fiemap->fm_start = byte_offset; + fiemap->fm_length = 1; + fiemap->fm_extent_count = 1; + + int ret = ioctl(fd.get(), FS_IOC_FIEMAP, fiemap); + if (ret < 0) { + fprintf(stderr, "ioctl(FS_IOC_FIEMAP) failed: %s\n", strerror(errno)); + return -1; + } + + if (fiemap->fm_mapped_extents != 1) { + fprintf(stderr, "fm_mapped_extents != 1 (is %d)\n", + fiemap->fm_mapped_extents); + return -1; + } + + struct fiemap_extent* extent = &fiemap->fm_extents[0]; + printf( + "logical offset: %llu, physical offset: %llu, length: %llu, " + "flags: %x\n", + extent->fe_logical, extent->fe_physical, extent->fe_length, + extent->fe_flags); + if (extent->fe_flags & (FIEMAP_EXTENT_UNKNOWN | + FIEMAP_EXTENT_UNWRITTEN)) { + fprintf(stderr, "Failed to locate physical offset safely\n"); + return -1; + } + + return extent->fe_physical + (byte_offset - extent->fe_logical); +} + +int read_block_from_device(const char* device_path, uint64_t block_offset, + ssize_t block_size, char* block_buffer) { + assert(block_offset % block_size == 0); + android::base::unique_fd fd(open(device_path, O_RDONLY | O_DIRECT)); + if (fd.get() < 0) { + fprintf(stderr, "open %s failed\n", device_path); + return -1; + } + + ssize_t retval = + TEMP_FAILURE_RETRY(pread(fd, block_buffer, block_size, block_offset)); + if (retval != block_size) { + fprintf(stderr, "read returns error or incomplete result (%zu): %s\n", + retval, strerror(errno)); + return -1; + } + return 0; +} + +int write_block_to_device(const char* device_path, uint64_t block_offset, + ssize_t block_size, char* block_buffer) { + assert(block_offset % block_size == 0); + android::base::unique_fd fd(open(device_path, O_WRONLY | O_DIRECT)); + if (fd.get() < 0) { + fprintf(stderr, "open %s failed\n", device_path); + return -1; + } + + ssize_t retval = TEMP_FAILURE_RETRY( + pwrite(fd.get(), block_buffer, block_size, block_offset)); + if (retval != block_size) { + fprintf(stderr, "write returns error or incomplete result (%zu): %s\n", + retval, strerror(errno)); + return -1; + } + return 0; +} + +int main(int argc, const char** argv) { + if (argc != 4) { + fprintf(stderr, + "Usage: %s block_dev filename byte_offset\n" + "\n" + "This program bypasses filesystem and damages the specified byte\n" + "at the physical position on <block_dev> corresponding to the\n" + "logical byte location in <filename>.\n", + argv[0]); + return -1; + } + + const char* block_device = argv[1]; + const char* file_name = argv[2]; + uint64_t byte_offset = strtoull(argv[3], nullptr, 10); + + ssize_t block_size = get_logical_block_size(block_device); + if (block_size < 0) { + return -1; + } + + int64_t physical_offset_signed = get_physical_offset(file_name, byte_offset); + if (physical_offset_signed < 0) { + return -1; + } + + uint64_t physical_offset = static_cast<uint64_t>(physical_offset_signed); + uint64_t offset_within_block = physical_offset % block_size; + uint64_t physical_block_offset = physical_offset - offset_within_block; + + // Direct I/O requires aligned buffer + std::unique_ptr<char> buf(static_cast<char*>( + aligned_alloc(block_size /* alignment */, block_size /* size */))); + + if (read_block_from_device(block_device, physical_block_offset, block_size, + buf.get()) < 0) { + return -1; + } + char* p = buf.get() + offset_within_block; + printf("before: %hhx\n", *p); + *p ^= 0xff; + printf("after: %hhx\n", *p); + if (write_block_to_device(block_device, physical_block_offset, block_size, + buf.get()) < 0) { + return -1; + } + + return 0; +} diff --git a/tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java b/tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java new file mode 100644 index 000000000000..761c5ceb2413 --- /dev/null +++ b/tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java @@ -0,0 +1,496 @@ +/* + * 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.apkverity; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; + +import android.platform.test.annotations.RootPermissionTest; + +import com.android.tradefed.device.DeviceNotAvailableException; +import com.android.tradefed.device.ITestDevice; +import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; +import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; +import com.android.tradefed.util.CommandResult; +import com.android.tradefed.util.CommandStatus; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.FileNotFoundException; +import java.util.Arrays; +import java.util.HashSet; + +/** + * This test makes sure app installs with fs-verity signature, and on-access verification works. + * + * <p>When an app is installed, all or none of the files should have their corresponding .fsv_sig + * signature file. Otherwise, install will fail. + * + * <p>Once installed, file protected by fs-verity is verified by kernel every time a block is loaded + * from disk to memory. The file is immutable by design, enforced by filesystem. + * + * <p>In order to make sure a block of the file is readable only if the underlying block on disk + * stay intact, the test needs to bypass the filesystem and tampers with the corresponding physical + * address against the block device. + * + * <p>Requirements to run this test: + * <ul> + * <li>Device is rootable</li> + * <li>The filesystem supports fs-verity</li> + * <li>The feature flag is enabled</li> + * </ul> + */ +@RootPermissionTest +@RunWith(DeviceJUnit4ClassRunner.class) +public class ApkVerityTest extends BaseHostJUnit4Test { + private static final String TARGET_PACKAGE = "com.android.apkverity"; + + private static final String BASE_APK = "ApkVerityTestApp.apk"; + private static final String BASE_APK_DM = "ApkVerityTestApp.dm"; + private static final String SPLIT_APK = "ApkVerityTestAppSplit.apk"; + private static final String SPLIT_APK_DM = "ApkVerityTestAppSplit.dm"; + + private static final String INSTALLED_BASE_APK = "base.apk"; + private static final String INSTALLED_BASE_DM = "base.dm"; + private static final String INSTALLED_SPLIT_APK = "split_feature_x.apk"; + private static final String INSTALLED_SPLIT_DM = "split_feature_x.dm"; + private static final String INSTALLED_BASE_APK_FSV_SIG = "base.apk.fsv_sig"; + private static final String INSTALLED_BASE_DM_FSV_SIG = "base.dm.fsv_sig"; + private static final String INSTALLED_SPLIT_APK_FSV_SIG = "split_feature_x.apk.fsv_sig"; + private static final String INSTALLED_SPLIT_DM_FSV_SIG = "split_feature_x.dm.fsv_sig"; + + private static final String DAMAGING_EXECUTABLE = "/data/local/tmp/block_device_writer"; + private static final String CERT_PATH = "/data/local/tmp/ApkVerityTestCert.der"; + + private static final String APK_VERITY_STANDARD_MODE = "2"; + + /** Only 4K page is supported by fs-verity currently. */ + private static final int FSVERITY_PAGE_SIZE = 4096; + + private ITestDevice mDevice; + private String mKeyId; + + @Before + public void setUp() throws DeviceNotAvailableException { + mDevice = getDevice(); + + String apkVerityMode = mDevice.getProperty("ro.apk_verity.mode"); + assumeTrue(APK_VERITY_STANDARD_MODE.equals(apkVerityMode)); + + mKeyId = expectRemoteCommandToSucceed( + "mini-keyctl padd asymmetric fsv_test .fs-verity < " + CERT_PATH).trim(); + if (!mKeyId.matches("^\\d+$")) { + String keyId = mKeyId; + mKeyId = null; + fail("Key ID is not decimal: " + keyId); + } + + uninstallPackage(TARGET_PACKAGE); + } + + @After + public void tearDown() throws DeviceNotAvailableException { + uninstallPackage(TARGET_PACKAGE); + + if (mKeyId != null) { + expectRemoteCommandToSucceed("mini-keyctl unlink " + mKeyId + " .fs-verity"); + } + } + + @Test + public void testFsverityKernelSupports() throws DeviceNotAvailableException { + ITestDevice.MountPointInfo mountPoint = mDevice.getMountPointInfo("/data"); + expectRemoteCommandToSucceed("test -f /sys/fs/" + mountPoint.type + "/features/verity"); + } + + @Test + public void testInstallBase() throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG); + verifyInstalledFilesHaveFsverity(); + } + + @Test + public void testInstallBaseWithWrongSignature() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFile(BASE_APK) + .addFile(SPLIT_APK_DM + ".fsv_sig", + BASE_APK + ".fsv_sig") + .runExpectingFailure(); + } + + @Test + public void testInstallBaseWithSplit() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .addFileAndSignature(SPLIT_APK) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG, + INSTALLED_SPLIT_APK, + INSTALLED_SPLIT_APK_FSV_SIG); + verifyInstalledFilesHaveFsverity(); + } + + @Test + public void testInstallBaseWithDm() throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .addFileAndSignature(BASE_APK_DM) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG, + INSTALLED_BASE_DM, + INSTALLED_BASE_DM_FSV_SIG); + verifyInstalledFilesHaveFsverity(); + } + + @Test + public void testInstallEverything() throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .addFileAndSignature(BASE_APK_DM) + .addFileAndSignature(SPLIT_APK) + .addFileAndSignature(SPLIT_APK_DM) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG, + INSTALLED_BASE_DM, + INSTALLED_BASE_DM_FSV_SIG, + INSTALLED_SPLIT_APK, + INSTALLED_SPLIT_APK_FSV_SIG, + INSTALLED_SPLIT_DM, + INSTALLED_SPLIT_DM_FSV_SIG); + verifyInstalledFilesHaveFsverity(); + } + + @Test + public void testInstallSplitOnly() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG); + + new InstallMultiple() + .inheritFrom(TARGET_PACKAGE) + .addFileAndSignature(SPLIT_APK) + .run(); + + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG, + INSTALLED_SPLIT_APK, + INSTALLED_SPLIT_APK_FSV_SIG); + verifyInstalledFilesHaveFsverity(); + } + + @Test + public void testInstallSplitOnlyMissingSignature() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG); + + new InstallMultiple() + .inheritFrom(TARGET_PACKAGE) + .addFile(SPLIT_APK) + .runExpectingFailure(); + } + + @Test + public void testInstallSplitOnlyWithoutBaseSignature() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFile(BASE_APK) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + verifyInstalledFiles(INSTALLED_BASE_APK); + + new InstallMultiple() + .inheritFrom(TARGET_PACKAGE) + .addFileAndSignature(SPLIT_APK) + .run(); + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_SPLIT_APK, + INSTALLED_SPLIT_APK_FSV_SIG); + + } + + @Test + public void testInstallOnlyBaseHasFsvSig() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .addFile(BASE_APK_DM) + .addFile(SPLIT_APK) + .addFile(SPLIT_APK_DM) + .runExpectingFailure(); + } + + @Test + public void testInstallOnlyDmHasFsvSig() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFile(BASE_APK) + .addFileAndSignature(BASE_APK_DM) + .addFile(SPLIT_APK) + .addFile(SPLIT_APK_DM) + .runExpectingFailure(); + } + + @Test + public void testInstallOnlySplitHasFsvSig() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFile(BASE_APK) + .addFile(BASE_APK_DM) + .addFileAndSignature(SPLIT_APK) + .addFile(SPLIT_APK_DM) + .runExpectingFailure(); + } + + @Test + public void testInstallBaseWithFsvSigThenSplitWithout() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFileAndSignature(BASE_APK) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + verifyInstalledFiles( + INSTALLED_BASE_APK, + INSTALLED_BASE_APK_FSV_SIG); + + new InstallMultiple() + .addFile(SPLIT_APK) + .runExpectingFailure(); + } + + @Test + public void testInstallBaseWithoutFsvSigThenSplitWith() + throws DeviceNotAvailableException, FileNotFoundException { + new InstallMultiple() + .addFile(BASE_APK) + .run(); + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + verifyInstalledFiles(INSTALLED_BASE_APK); + + new InstallMultiple() + .addFileAndSignature(SPLIT_APK) + .runExpectingFailure(); + } + + @Test + public void testFsverityFileIsImmutableAndReadable() throws DeviceNotAvailableException { + new InstallMultiple().addFileAndSignature(BASE_APK).run(); + String apkPath = getApkPath(TARGET_PACKAGE); + + assertNotNull(getDevice().getAppPackageInfo(TARGET_PACKAGE)); + expectRemoteCommandToFail("echo -n '' >> " + apkPath); + expectRemoteCommandToSucceed("cat " + apkPath + " > /dev/null"); + } + + @Test + public void testFsverityFailToReadModifiedBlockAtFront() throws DeviceNotAvailableException { + new InstallMultiple().addFileAndSignature(BASE_APK).run(); + String apkPath = getApkPath(TARGET_PACKAGE); + + long apkSize = getFileSizeInBytes(apkPath); + long offsetFirstByte = 0; + + // The first two pages should be both readable at first. + assertTrue(canReadByte(apkPath, offsetFirstByte)); + if (apkSize > offsetFirstByte + FSVERITY_PAGE_SIZE) { + assertTrue(canReadByte(apkPath, offsetFirstByte + FSVERITY_PAGE_SIZE)); + } + + // Damage the file directly against the block device. + damageFileAgainstBlockDevice(apkPath, offsetFirstByte); + + // Expect actual read from disk to fail but only at damaged page. + dropCaches(); + assertFalse(canReadByte(apkPath, offsetFirstByte)); + if (apkSize > offsetFirstByte + FSVERITY_PAGE_SIZE) { + long lastByteOfTheSamePage = + offsetFirstByte % FSVERITY_PAGE_SIZE + FSVERITY_PAGE_SIZE - 1; + assertFalse(canReadByte(apkPath, lastByteOfTheSamePage)); + assertTrue(canReadByte(apkPath, lastByteOfTheSamePage + 1)); + } + } + + @Test + public void testFsverityFailToReadModifiedBlockAtBack() throws DeviceNotAvailableException { + new InstallMultiple().addFileAndSignature(BASE_APK).run(); + String apkPath = getApkPath(TARGET_PACKAGE); + + long apkSize = getFileSizeInBytes(apkPath); + long offsetOfLastByte = apkSize - 1; + + // The first two pages should be both readable at first. + assertTrue(canReadByte(apkPath, offsetOfLastByte)); + if (offsetOfLastByte - FSVERITY_PAGE_SIZE > 0) { + assertTrue(canReadByte(apkPath, offsetOfLastByte - FSVERITY_PAGE_SIZE)); + } + + // Damage the file directly against the block device. + damageFileAgainstBlockDevice(apkPath, offsetOfLastByte); + + // Expect actual read from disk to fail but only at damaged page. + dropCaches(); + assertFalse(canReadByte(apkPath, offsetOfLastByte)); + if (offsetOfLastByte - FSVERITY_PAGE_SIZE > 0) { + long firstByteOfTheSamePage = offsetOfLastByte - offsetOfLastByte % FSVERITY_PAGE_SIZE; + assertFalse(canReadByte(apkPath, firstByteOfTheSamePage)); + assertTrue(canReadByte(apkPath, firstByteOfTheSamePage - 1)); + } + } + + private void verifyInstalledFilesHaveFsverity() throws DeviceNotAvailableException { + // Verify that all files are protected by fs-verity + String apkPath = getApkPath(TARGET_PACKAGE); + String appDir = apkPath.substring(0, apkPath.lastIndexOf("/")); + long kTargetOffset = 0; + for (String basename : expectRemoteCommandToSucceed("ls " + appDir).split("\n")) { + if (basename.endsWith(".apk") || basename.endsWith(".dm")) { + String path = appDir + "/" + basename; + damageFileAgainstBlockDevice(path, kTargetOffset); + + // Retry is sometimes needed to pass the test. Package manager may have FD leaks + // (see b/122744005 as example) that prevents the file in question to be evicted + // from filesystem cache. Forcing GC workarounds the problem. + int retry = 5; + for (; retry > 0; retry--) { + dropCaches(); + if (!canReadByte(path, kTargetOffset)) { + break; + } + try { + Thread.sleep(1000); + String pid = expectRemoteCommandToSucceed("pidof system_server"); + mDevice.executeShellV2Command("kill -10 " + pid); // force GC + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + } + assertTrue("Read from " + path + " should fail", retry > 0); + } + } + } + + private void verifyInstalledFiles(String... filenames) throws DeviceNotAvailableException { + String apkPath = getApkPath(TARGET_PACKAGE); + String appDir = apkPath.substring(0, apkPath.lastIndexOf("/")); + HashSet<String> actualFiles = new HashSet<>(Arrays.asList( + expectRemoteCommandToSucceed("ls " + appDir).split("\n"))); + assertTrue(actualFiles.remove("lib")); + assertTrue(actualFiles.remove("oat")); + + HashSet<String> expectedFiles = new HashSet<>(Arrays.asList(filenames)); + assertEquals(expectedFiles, actualFiles); + } + + private void damageFileAgainstBlockDevice(String path, long offsetOfTargetingByte) + throws DeviceNotAvailableException { + assertTrue(path.startsWith("/data/")); + ITestDevice.MountPointInfo mountPoint = mDevice.getMountPointInfo("/data"); + expectRemoteCommandToSucceed(String.join(" ", DAMAGING_EXECUTABLE, + mountPoint.filesystem, path, Long.toString(offsetOfTargetingByte))); + } + + private String getApkPath(String packageName) throws DeviceNotAvailableException { + String line = expectRemoteCommandToSucceed("pm path " + packageName + " | grep base.apk"); + int index = line.trim().indexOf(":"); + assertTrue(index >= 0); + return line.substring(index + 1); + } + + private long getFileSizeInBytes(String packageName) throws DeviceNotAvailableException { + return Long.parseLong(expectRemoteCommandToSucceed("stat -c '%s' " + packageName).trim()); + } + + private void dropCaches() throws DeviceNotAvailableException { + expectRemoteCommandToSucceed("sync && echo 1 > /proc/sys/vm/drop_caches"); + } + + private boolean canReadByte(String filePath, long offset) throws DeviceNotAvailableException { + CommandResult result = mDevice.executeShellV2Command( + "dd if=" + filePath + " bs=1 count=1 skip=" + Long.toString(offset)); + return result.getStatus() == CommandStatus.SUCCESS; + } + + private String expectRemoteCommandToSucceed(String cmd) throws DeviceNotAvailableException { + CommandResult result = mDevice.executeShellV2Command(cmd); + assertEquals("`" + cmd + "` failed: " + result.getStderr(), CommandStatus.SUCCESS, + result.getStatus()); + return result.getStdout(); + } + + private void expectRemoteCommandToFail(String cmd) throws DeviceNotAvailableException { + CommandResult result = mDevice.executeShellV2Command(cmd); + assertTrue("Unexpected success from `" + cmd + "`: " + result.getStderr(), + result.getStatus() != CommandStatus.SUCCESS); + } + + private class InstallMultiple extends BaseInstallMultiple<InstallMultiple> { + InstallMultiple() { + super(getDevice(), getBuild()); + } + + InstallMultiple addFileAndSignature(String filename) { + try { + addFile(filename); + addFile(filename + ".fsv_sig"); + } catch (FileNotFoundException e) { + fail("Missing test file: " + e); + } + return this; + } + } +} diff --git a/tests/ApkVerityTest/src/com/android/apkverity/BaseInstallMultiple.java b/tests/ApkVerityTest/src/com/android/apkverity/BaseInstallMultiple.java new file mode 100644 index 000000000000..02e73d157dde --- /dev/null +++ b/tests/ApkVerityTest/src/com/android/apkverity/BaseInstallMultiple.java @@ -0,0 +1,140 @@ +/* + * 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.apkverity; + +import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper; +import com.android.tradefed.build.IBuildInfo; +import com.android.tradefed.device.DeviceNotAvailableException; +import com.android.tradefed.device.ITestDevice; + +import junit.framework.TestCase; + +import java.io.File; +import java.io.FileNotFoundException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Base class for invoking the install-multiple command via ADB. Subclass this for less typing: + * + * <code> private class InstallMultiple extends BaseInstallMultiple<InstallMultiple> { public + * InstallMultiple() { super(getDevice(), null); } } </code> + */ +/*package*/ class BaseInstallMultiple<T extends BaseInstallMultiple<?>> { + + private final ITestDevice mDevice; + private final IBuildInfo mBuild; + + private final List<String> mArgs = new ArrayList<>(); + private final Map<File, String> mFileToRemoteMap = new HashMap<>(); + + /*package*/ BaseInstallMultiple(ITestDevice device, IBuildInfo buildInfo) { + mDevice = device; + mBuild = buildInfo; + addArg("-g"); + } + + T addArg(String arg) { + mArgs.add(arg); + return (T) this; + } + + T addFile(String filename) throws FileNotFoundException { + return addFile(filename, filename); + } + + T addFile(String filename, String remoteName) throws FileNotFoundException { + CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild); + mFileToRemoteMap.put(buildHelper.getTestFile(filename), remoteName); + return (T) this; + } + + T inheritFrom(String packageName) { + addArg("-r"); + addArg("-p " + packageName); + return (T) this; + } + + void run() throws DeviceNotAvailableException { + run(true); + } + + void runExpectingFailure() throws DeviceNotAvailableException { + run(false); + } + + private void run(boolean expectingSuccess) throws DeviceNotAvailableException { + final ITestDevice device = mDevice; + + // Create an install session + final StringBuilder cmd = new StringBuilder(); + cmd.append("pm install-create"); + for (String arg : mArgs) { + cmd.append(' ').append(arg); + } + + String result = device.executeShellCommand(cmd.toString()); + TestCase.assertTrue(result, result.startsWith("Success")); + + final int start = result.lastIndexOf("["); + final int end = result.lastIndexOf("]"); + int sessionId = -1; + try { + if (start != -1 && end != -1 && start < end) { + sessionId = Integer.parseInt(result.substring(start + 1, end)); + } + } catch (NumberFormatException e) { + throw new IllegalStateException("Failed to parse install session: " + result); + } + if (sessionId == -1) { + throw new IllegalStateException("Failed to create install session: " + result); + } + + // Push our files into session. Ideally we'd use stdin streaming, + // but ddmlib doesn't support it yet. + for (final Map.Entry<File, String> entry : mFileToRemoteMap.entrySet()) { + final File file = entry.getKey(); + final String remoteName = entry.getValue(); + final String remotePath = "/data/local/tmp/" + file.getName(); + if (!device.pushFile(file, remotePath)) { + throw new IllegalStateException("Failed to push " + file); + } + + cmd.setLength(0); + cmd.append("pm install-write"); + cmd.append(' ').append(sessionId); + cmd.append(' ').append(remoteName); + cmd.append(' ').append(remotePath); + + result = device.executeShellCommand(cmd.toString()); + TestCase.assertTrue(result, result.startsWith("Success")); + } + + // Everything staged; let's pull trigger + cmd.setLength(0); + cmd.append("pm install-commit"); + cmd.append(' ').append(sessionId); + + result = device.executeShellCommand(cmd.toString()); + if (expectingSuccess) { + TestCase.assertTrue(result, result.contains("Success")); + } else { + TestCase.assertFalse(result, result.contains("Success")); + } + } +} diff --git a/tests/ApkVerityTest/testdata/Android.bp b/tests/ApkVerityTest/testdata/Android.bp new file mode 100644 index 000000000000..c10b0cef21d7 --- /dev/null +++ b/tests/ApkVerityTest/testdata/Android.bp @@ -0,0 +1,77 @@ +// 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. + +filegroup { + name: "ApkVerityTestKeyPem", + srcs: ["ApkVerityTestKey.pem"], +} + +filegroup { + name: "ApkVerityTestCertPem", + srcs: ["ApkVerityTestCert.pem"], +} + +filegroup { + name: "ApkVerityTestCertDer", + srcs: ["ApkVerityTestCert.der"], +} + +filegroup { + name: "ApkVerityTestAppDm", + srcs: ["ApkVerityTestApp.dm"], +} + +filegroup { + name: "ApkVerityTestAppSplitDm", + srcs: ["ApkVerityTestAppSplit.dm"], +} + +genrule_defaults { + name: "apk_verity_sig_gen_default", + tools: ["fsverity"], + tool_files: [":ApkVerityTestKeyPem", ":ApkVerityTestCertPem"], + cmd: "$(location fsverity) sign $(in) $(out) " + + "--key=$(location :ApkVerityTestKeyPem) " + + "--cert=$(location :ApkVerityTestCertPem) " + + "> /dev/null", +} + +genrule { + name: "ApkVerityTestAppFsvSig", + defaults: ["apk_verity_sig_gen_default"], + srcs: [":ApkVerityTestApp"], + out: ["ApkVerityTestApp.apk.fsv_sig"], +} + +genrule { + name: "ApkVerityTestAppDmFsvSig", + defaults: ["apk_verity_sig_gen_default"], + srcs: [":ApkVerityTestAppDm"], + out: ["ApkVerityTestApp.dm.fsv_sig"], +} + +genrule { + name: "ApkVerityTestAppSplitFsvSig", + defaults: ["apk_verity_sig_gen_default"], + srcs: [":ApkVerityTestAppSplit"], + out: ["ApkVerityTestAppSplit.apk.fsv_sig"], +} + +genrule { + name: "ApkVerityTestAppSplitDmFsvSig", + defaults: ["apk_verity_sig_gen_default"], + srcs: [":ApkVerityTestAppSplitDm"], + out: ["ApkVerityTestAppSplit.dm.fsv_sig"], +} + diff --git a/tests/ApkVerityTest/testdata/ApkVerityTestApp.dm b/tests/ApkVerityTest/testdata/ApkVerityTestApp.dm Binary files differnew file mode 100644 index 000000000000..e53a86131366 --- /dev/null +++ b/tests/ApkVerityTest/testdata/ApkVerityTestApp.dm diff --git a/tests/ApkVerityTest/testdata/ApkVerityTestAppSplit.dm b/tests/ApkVerityTest/testdata/ApkVerityTestAppSplit.dm Binary files differnew file mode 100644 index 000000000000..75396f1ba730 --- /dev/null +++ b/tests/ApkVerityTest/testdata/ApkVerityTestAppSplit.dm diff --git a/tests/ApkVerityTest/testdata/ApkVerityTestCert.der b/tests/ApkVerityTest/testdata/ApkVerityTestCert.der Binary files differnew file mode 100644 index 000000000000..fe9029b53aa1 --- /dev/null +++ b/tests/ApkVerityTest/testdata/ApkVerityTestCert.der diff --git a/tests/ApkVerityTest/testdata/ApkVerityTestCert.pem b/tests/ApkVerityTest/testdata/ApkVerityTestCert.pem new file mode 100644 index 000000000000..6c0b7b1f635a --- /dev/null +++ b/tests/ApkVerityTest/testdata/ApkVerityTestCert.pem @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFLjCCAxagAwIBAgIJAKZbtMlZZwtdMA0GCSqGSIb3DQEBCwUAMCwxCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJDQTEQMA4GA1UECgwHQW5kcm9pZDAeFw0xODEyMTky +MTA5MzVaFw0xOTAxMTgyMTA5MzVaMCwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD +QTEQMA4GA1UECgwHQW5kcm9pZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAKnrw4WiFgFBq6vXqcLc97iwvcYPZmeIjQqYRF+CHwXBXx8IyDlMfPrgyIYo +ZLkosnUK/Exuypdu6UEtdqtYPknC6w9z4YkxqsKtyxyB1b13ptcTHh3bf2N8bqGr +8gWWLxj0QjumCtFi7Z/TCwB5t3b3gtC+0jVfABSWrm5PNkgk7jIP+4KeYLDCDfiJ +XH3uHu6OASiSHTOnrmLWSaSw0y6G4OFthHqQnMywasly0r6m+Mif+K0ZUV7hBRi/ +SfqcJ1HTCXTJMskEyV6Qx2sHF/VbK2gdUv56z6OVRNSs/FxPBiWVMuZZKh1FpBVI +gbGxusf2Awwtc+Soxr4/P1YFcrwfA/ff9FK3Yg/Cd3ZMGbzUkbEMEkE5BW7Gbjmx +wz3mYTiRfa2L/Bl4MiMqNi0tfORLkmg+V/EItzfhZ/HsXMOCBsnuj4KnFslmbamz +t9opypj2JLGk+lXhZ5gFNFw8tYH1AnG1AIXe5u+6Fq2nQ1y/ncGUTR5Sw4de/Gee +C0UgR+KiFEdKupMKbXgSKl+0QPz/i2eSpcDOKMwZ4WiNrkbccbCyr38so+j5DfWF +IeZA9a/IlysA6G8yU2TfXBc65VCIEQRJOQdUOZFDO8OSoqGP+fbA6edpmovGw+TH +sM/NkmpEXpQm7BVOI4oVjdf4pKPp0zaW2YcaA3xU2w6eF17pAgMBAAGjUzBRMB0G +A1UdDgQWBBRGpHYy7yiLEYalGuF1va6zJKGD/zAfBgNVHSMEGDAWgBRGpHYy7yiL +EYalGuF1va6zJKGD/zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IC +AQAao6ZBM122F0pYb2QLahIyyGEr3LfSdBGID4068pVik4ncIefFz36Xf9AFxRQd +KHmwRYNPHiLRIEGdtqplC5pZDeHz41txIArNIZKzDWOYtdcFyCz8umuj912BmsoM +YUQhT6F1sX53SWcKxEP/aJ2kltSlPFX99e3Vx9eRkceV1oe2NM6ZG8hnYCfCAMeJ +jRTpbqCGaAsEHFtIx6wt3zEtUXIVg4aYFQs/qjTjeP8ByIj0b4lZrceEoTeRimuj ++4aAI+jBxLkwaN3hseQHzRNpgPehIVV/0RU92yzOD/WN4YwE6rwjKEI1lihHNBDa ++DwGtGbHmIUzjW1qArig+mzUIhfYIJAxrx20ynPz/Q+C7+iXhTDAYQlxTle0pX8m +yM2DUdPo97eLOzQ4JDHxtcN3ntTEJKKvrmzKvWuxy/yoLwS7MtLH6RETTHabH3Qd +CP83X7z8zTyxgPxHdfHo9sgR/4C9RHGJx4OpBTQaiqfjSpDqJSIQdbrHGOQDgYwL +KQyiQuhukmNgRCB6dJoZJ/MyaNuMsXV9QobsDHW1oSuCvPAihVoWHJxt8m4Ma0jJ +EIbEPT2Umw1F/P+CeXnVQwhPvzQKHCa+6cC/YdjTqIKLmQV8X3HUBUIMhP2JGDic +MnUipTm/RwWZVOjCJaFqk5sVq3L0Lyd0XVUWSK1a4IcrsA== +-----END CERTIFICATE----- diff --git a/tests/ApkVerityTest/testdata/ApkVerityTestKey.pem b/tests/ApkVerityTest/testdata/ApkVerityTestKey.pem new file mode 100644 index 000000000000..f0746c162421 --- /dev/null +++ b/tests/ApkVerityTest/testdata/ApkVerityTestKey.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCp68OFohYBQaur +16nC3Pe4sL3GD2ZniI0KmERfgh8FwV8fCMg5THz64MiGKGS5KLJ1CvxMbsqXbulB +LXarWD5JwusPc+GJMarCrcscgdW9d6bXEx4d239jfG6hq/IFli8Y9EI7pgrRYu2f +0wsAebd294LQvtI1XwAUlq5uTzZIJO4yD/uCnmCwwg34iVx97h7ujgEokh0zp65i +1kmksNMuhuDhbYR6kJzMsGrJctK+pvjIn/itGVFe4QUYv0n6nCdR0wl0yTLJBMle +kMdrBxf1WytoHVL+es+jlUTUrPxcTwYllTLmWSodRaQVSIGxsbrH9gMMLXPkqMa+ +Pz9WBXK8HwP33/RSt2IPwnd2TBm81JGxDBJBOQVuxm45scM95mE4kX2ti/wZeDIj +KjYtLXzkS5JoPlfxCLc34Wfx7FzDggbJ7o+CpxbJZm2ps7faKcqY9iSxpPpV4WeY +BTRcPLWB9QJxtQCF3ubvuhatp0Ncv53BlE0eUsOHXvxnngtFIEfiohRHSrqTCm14 +EipftED8/4tnkqXAzijMGeFoja5G3HGwsq9/LKPo+Q31hSHmQPWvyJcrAOhvMlNk +31wXOuVQiBEESTkHVDmRQzvDkqKhj/n2wOnnaZqLxsPkx7DPzZJqRF6UJuwVTiOK +FY3X+KSj6dM2ltmHGgN8VNsOnhde6QIDAQABAoICAGT21tWnisWyXKwd2BwWKgeO +1SRDcEiihZO/CBlr+rzzum55TGdngHedauj0RW0Ttn3/SgysZCp415ZHylRjeZdg +f0VOSLu5TEqi86X7q6IJ35O6I1IAY4AcpqvfvE3/f/qm4FgLADCMRL+LqeTdbdr9 +lLguOj9GNIkHQ5v96zYQ44vRnVNugetlUuHT1KZq/+wlaqDNuRZBU0gdJeL6wnDJ +6gNojKg7F0A0ry8F0B1Cn16uVxebjJMAx4N93hpQALkI2XyQNGHnOzO6eROqQl0i +j/csPW1CUfBUOHLaWpUKy483SOhAINsFz0pqK84G2gIItqTcuRksA/N1J1AYqqQO ++/8IK5Mb9j0RaYYrBG83luGCWYauAsWg2Yol6fUGju8IY/zavOaES42XogY588Ad +JzW+njjxXcnoD/u5keWrGwbPdGfoaLLg4eMlRBT4yNicyT04knXjFG4QTfLY5lF/ +VKdvZk6RMoCLdAtgN6EKHtcwuoYR967otsbavshngZ9HE/ic5/TdNFCBjxs6q9bm +docC4CLHU/feXvOCYSnIfUpDzEPV96Gbk6o0qeYn3RUSGzRpXQHxXXfszEESUWnd +2rtfXxqA7C5n8CshBfKJND7/LKRGpBRaYWJtc4hFmo8prhXfOb40PEZNlx8mcsEz +WYZpmvFQHU8+bZIm0a5RAoIBAQDaCAje9xLKN1CYzygA/U3x2CsGuWWyh9xM1oR5 +5t+nn0EeIMrzGuHrD4hdbZiTiJcO5dpSg/3dssc/QLJEdv+BoMEgSYTf3TX03dIb +kSlj+ONobejO4nVoUP0axTvVe/nuMYvLguTM6OCFvgV752TFxVyVHl6RM+rQYGCl +ajbBCsCRg4QgpZ/RHWf+3KMJunzwWBlsAXcjOudneYqEl713h/q1lc5cONIglQDU +E+bc5q6q++c/H8dYaWq4QE4CQU8wsq77/bZk8z1jheOV0HkwaH5ShtKD7bk/4MA9 +jWQUDW6/LRXkNiPExsAZxnP3mxhtUToWq1nedF6kPmNBko+9AoIBAQDHgvAql6i7 +osTYUcY/GldPmnrvfqbKmD0nI8mnaJfN2vGwjB/ol3lm+pviKIQ4ER80xsdn4xK0 +2cC9OdkY2UX7zilKohxvKVsbVOYpUwfpoRQO1Euddb6iAMqgGDyDzRBDTzTx5pB5 +XL9B/XuJVCMkjsNdD9iEbjdY1Epv7kYf53zfvrXdqv24uSNAszPFBLLPHSC9yONE +a/t3mHGZ2cjr52leGNGY7ib6GNGBUeA34SM9g97tU9pAgy712RfZhH6fA93CLk6T +DKoch56YId71vZt2J0Lrk4TWnnpidSoRmzKfVIJwjCmgYbI+2eDp7h0Z0DnDbji6 +9BPt3RWsoZidAoIBAA2A7+O3U7+Ye3JraiPdjGVNKSUKeIT9KyTLKHtQVEvSbjsK +dudlo9ZmKOD4d7mzfP+cNtBjgmanuvVs8V2SLTL/HNb+Fq+yyLO4xVmVvQWHFbaT +EBc4KWNjmLl+u7z2J72b7feVzMvwJG/EHBzXcQNavOgzcFH38DQls/aqxGdiXhjl +F1raRzKxao57ZdGlbjWIj1KEKLfS3yAmg/DAYSi1EE8MzzIhBsqjz+BStzq5Qtou +Ld1X/4W3SbfNq8cx+lCe0H2k8hYAhq3STg0qU0cvQZuk5Abtw0p0hhOJ3UfsqQ5I +IZH31HFMiftOskIEphenLzzWMgO4G2B6yLT3+dUCggEAOLF1i7Ti5sbfBtVd70qN +6vnr2yhzPvi5z+h0ghTPpliD+3YmDxMUFXY7W63FvKTo6DdgLJ4zD58dDOhmT5BW +ObKguyuLxu7Ki965NJ76jaIPMBOVlR4DWMe+zHV2pMFd0LKuSdsJzOLVGmxscV6u +SdIjo8s/7InhQmW47UuZM7G1I2NvDJltVdOON/F0UZT/NqmBR0zRf/zrTVXNWjmv +xZFRuMJ2tO1fuAvbZNMeUuKv/+f8LhZ424IrkwLoqw/iZ09S8b306AZeRJMpNvPR +BqWlipKnioe15MLN5jKDDNO8M9hw5Ih/v6pjW0bQicj3DgHEmEs25bE8BIihgxe8 +ZQKCAQEAsWKsUv13OEbYYAoJgbzDesWF9NzamFB0NLyno9SChvFPH/d8RmAuti7Y +BQUoBswLK24DF/TKf1YocsZq8tu+pnv0Nx1wtK4K+J3A1BYDm7ElpO3Km+HPUBtf +C9KGT5hotlMQVTpYSDG/QeWbfl4UnNZcbg8pmv38NwV1eDoVDfaVrRYJzQn75+Tf +s/WUq1x5PElR/4pNIU2i6pJGd6FimhRweJu/INR36spWmbMRNX8fyXx+9EBqMbVp +vS2xGgxxQT6bAvBfRlpgi87T9v5Gqoy6/jM/wX9smH9PfUV1vK32n3Zrbd46gwZW +p2aUlQOLXU9SjQTirZbdCZP0XHtFsg== +-----END PRIVATE KEY----- diff --git a/tests/ApkVerityTest/testdata/README.md b/tests/ApkVerityTest/testdata/README.md new file mode 100644 index 000000000000..163cb183a5ad --- /dev/null +++ b/tests/ApkVerityTest/testdata/README.md @@ -0,0 +1,13 @@ +This test only runs on rooted / debuggable device. + +The test tries to install subsets of base.{apk,dm}, split.{apk,dm} and their +corresponding .fsv_sig files (generated by build rule). If installed, the +tests also tries to tamper with the file at absolute disk offset to verify +if fs-verity is effective. + +How to generate dex metadata (.dm) +================================== + + adb shell profman --generate-test-profile=/data/local/tmp/primary.prof + adb pull /data/local/tmp/primary.prof + zip foo.dm primary.prof diff --git a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java index 17986a3c9d61..730b210f1529 100644 --- a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java +++ b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java @@ -66,10 +66,18 @@ public class BootImageProfileTest implements IDeviceTest { String res; res = mTestDevice.executeShellCommand("truncate -s 0 " + SYSTEM_SERVER_PROFILE).trim(); assertTrue(res, res.length() == 0); - // Force save profiles in case the system just started. + // Wait up to 20 seconds for the profile to be saved. + for (int i = 0; i < 20; ++i) { + // Force save the profile since we truncated it. + forceSaveProfile("system_server"); + String s = mTestDevice.executeShellCommand("wc -c <" + SYSTEM_SERVER_PROFILE).trim(); + if (!"0".equals(s)) { + break; + } + Thread.sleep(1000); + } + // In case the profile is partially saved, wait an extra second. Thread.sleep(1000); - forceSaveProfile("system_server"); - Thread.sleep(2000); // Validate that the profile is non empty. res = mTestDevice.executeShellCommand("profman --dump-only --profile-file=" + SYSTEM_SERVER_PROFILE); diff --git a/tests/FlickerTests/AndroidManifest.xml b/tests/FlickerTests/AndroidManifest.xml index 5b1a36b84cc4..91fb7c12b392 100644 --- a/tests/FlickerTests/AndroidManifest.xml +++ b/tests/FlickerTests/AndroidManifest.xml @@ -21,8 +21,12 @@ <!-- Read and write traces from external storage --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <!-- Write secure settings --> + <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <!-- Capture screen contents --> <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" /> + <!-- Enable / Disable tracing !--> + <uses-permission android:name="android.permission.DUMP" /> <!-- Run layers trace --> <uses-permission android:name="android.permission.HARDWARE_TEST"/> <application> @@ -33,4 +37,4 @@ android:targetPackage="com.android.server.wm.flicker" android:label="WindowManager Flicker Tests"> </instrumentation> -</manifest>
\ No newline at end of file +</manifest> diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml index e36f97656f2a..d433df56bc00 100644 --- a/tests/FlickerTests/AndroidTest.xml +++ b/tests/FlickerTests/AndroidTest.xml @@ -25,5 +25,6 @@ <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> <option name="directory-keys" value="/sdcard/flicker" /> <option name="collect-on-run-ended-only" value="true" /> + <option name="clean-up" value="false" /> </metrics_collector> </configuration> diff --git a/tests/FlickerTests/lib/Android.bp b/tests/FlickerTests/lib/Android.bp deleted file mode 100644 index e0f0188ee618..000000000000 --- a/tests/FlickerTests/lib/Android.bp +++ /dev/null @@ -1,57 +0,0 @@ -// -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -java_test { - name: "flickerlib", - platform_apis: true, - srcs: ["src/**/*.java"], - static_libs: [ - "androidx.test.janktesthelper", - "cts-wm-util", - "platformprotosnano", - "layersprotosnano", - "truth-prebuilt", - "sysui-helper", - "launcher-helper-lib", - ], -} - -java_library { - name: "flickerlib_without_helpers", - platform_apis: true, - srcs: ["src/**/*.java"], - exclude_srcs: ["src/**/helpers/*.java"], - static_libs: [ - "cts-wm-util", - "platformprotosnano", - "layersprotosnano", - "truth-prebuilt" - ], -} - -java_library { - name: "flickerautomationhelperlib", - sdk_version: "test_current", - srcs: [ - "src/com/android/server/wm/flicker/helpers/AutomationUtils.java", - "src/com/android/server/wm/flicker/WindowUtils.java", - ], - static_libs: [ - "sysui-helper", - "launcher-helper-lib", - "compatibility-device-util-axt", - ], -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/Assertions.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/Assertions.java deleted file mode 100644 index 38255ee6fe8d..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/Assertions.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - -/** - * Collection of functional interfaces and classes representing assertions and their associated - * results. Assertions are functions that are applied over a single trace entry and returns a - * result which includes a detailed reason if the assertion fails. - */ -public class Assertions { - /** - * Checks assertion on a single trace entry. - * - * @param <T> trace entry type to perform the assertion on. - */ - @FunctionalInterface - public interface TraceAssertion<T> extends Function<T, Result> { - /** - * Returns an assertion that represents the logical negation of this assertion. - * - * @return a assertion that represents the logical negation of this assertion - */ - default TraceAssertion<T> negate() { - return (T t) -> apply(t).negate(); - } - } - - /** - * Checks assertion on a single layers trace entry. - */ - @FunctionalInterface - public interface LayersTraceAssertion extends TraceAssertion<LayersTrace.Entry> { - - } - - /** - * Utility class to store assertions with an identifier to help generate more useful debug - * data when dealing with multiple assertions. - */ - public static class NamedAssertion<T> { - public final TraceAssertion<T> assertion; - public final String name; - - public NamedAssertion(TraceAssertion<T> assertion, String name) { - this.assertion = assertion; - this.name = name; - } - } - - /** - * Contains the result of an assertion including the reason for failed assertions. - */ - public static class Result { - public static final String NEGATION_PREFIX = "!"; - public final boolean success; - public final long timestamp; - public final String assertionName; - public final String reason; - - public Result(boolean success, long timestamp, String assertionName, String reason) { - this.success = success; - this.timestamp = timestamp; - this.assertionName = assertionName; - this.reason = reason; - } - - public Result(boolean success, String reason) { - this.success = success; - this.reason = reason; - this.assertionName = ""; - this.timestamp = 0; - } - - /** - * Returns the negated {@code Result} and adds a negation prefix to the assertion name. - */ - public Result negate() { - String negatedAssertionName; - if (this.assertionName.startsWith(NEGATION_PREFIX)) { - negatedAssertionName = this.assertionName.substring(NEGATION_PREFIX.length() + 1); - } else { - negatedAssertionName = NEGATION_PREFIX + this.assertionName; - } - return new Result(!this.success, this.timestamp, negatedAssertionName, this.reason); - } - - public boolean passed() { - return this.success; - } - - public boolean failed() { - return !this.success; - } - - @Override - public String toString() { - return "Timestamp: " + prettyTimestamp(timestamp) - + "\nAssertion: " + assertionName - + "\nReason: " + reason; - } - - private String prettyTimestamp(long timestamp_ns) { - StringBuilder prettyTimestamp = new StringBuilder(); - TimeUnit[] timeUnits = {TimeUnit.HOURS, TimeUnit.MINUTES, TimeUnit.SECONDS, TimeUnit - .MILLISECONDS}; - String[] unitSuffixes = {"h", "m", "s", "ms"}; - - for (int i = 0; i < timeUnits.length; i++) { - long convertedTime = timeUnits[i].convert(timestamp_ns, TimeUnit.NANOSECONDS); - timestamp_ns -= TimeUnit.NANOSECONDS.convert(convertedTime, timeUnits[i]); - prettyTimestamp.append(convertedTime).append(unitSuffixes[i]); - } - - return prettyTimestamp.toString(); - } - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AssertionsChecker.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AssertionsChecker.java deleted file mode 100644 index 5c4df81299c1..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AssertionsChecker.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import com.android.server.wm.flicker.Assertions.NamedAssertion; -import com.android.server.wm.flicker.Assertions.Result; -import com.android.server.wm.flicker.Assertions.TraceAssertion; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * Captures some of the common logic in {@link LayersTraceSubject} and {@link WmTraceSubject} - * used to filter trace entries and combine multiple assertions. - * - * @param <T> trace entry type - */ -public class AssertionsChecker<T extends ITraceEntry> { - private boolean mFilterEntriesByRange = false; - private long mFilterStartTime = 0; - private long mFilterEndTime = 0; - private AssertionOption mOption = AssertionOption.NONE; - private List<NamedAssertion<T>> mAssertions = new LinkedList<>(); - - public void add(Assertions.TraceAssertion<T> assertion, String name) { - mAssertions.add(new NamedAssertion<>(assertion, name)); - } - - public void filterByRange(long startTime, long endTime) { - mFilterEntriesByRange = true; - mFilterStartTime = startTime; - mFilterEndTime = endTime; - } - - private void setOption(AssertionOption option) { - if (mOption != AssertionOption.NONE && option != mOption) { - throw new IllegalArgumentException("Cannot use " + mOption + " option with " - + option + " option."); - } - mOption = option; - } - - public void checkFirstEntry() { - setOption(AssertionOption.CHECK_FIRST_ENTRY); - } - - public void checkLastEntry() { - setOption(AssertionOption.CHECK_LAST_ENTRY); - } - - public void checkChangingAssertions() { - setOption(AssertionOption.CHECK_CHANGING_ASSERTIONS); - } - - - /** - * Filters trace entries then runs assertions returning a list of failures. - * - * @param entries list of entries to perform assertions on - * @return list of failed assertion results - */ - public List<Result> test(List<T> entries) { - List<T> filteredEntries; - List<Result> failures; - - if (mFilterEntriesByRange) { - filteredEntries = entries.stream() - .filter(e -> ((e.getTimestamp() >= mFilterStartTime) - && (e.getTimestamp() <= mFilterEndTime))) - .collect(Collectors.toList()); - } else { - filteredEntries = entries; - } - - switch (mOption) { - case CHECK_CHANGING_ASSERTIONS: - return assertChanges(filteredEntries); - case CHECK_FIRST_ENTRY: - return assertEntry(filteredEntries.get(0)); - case CHECK_LAST_ENTRY: - return assertEntry(filteredEntries.get(filteredEntries.size() - 1)); - } - return assertAll(filteredEntries); - } - - /** - * Steps through each trace entry checking if provided assertions are true in the order they - * are added. Each assertion must be true for at least a single trace entry. - * - * This can be used to check for asserting a change in property over a trace. Such as visibility - * for a window changes from true to false or top-most window changes from A to Bb and back to A - * again. - */ - private List<Result> assertChanges(List<T> entries) { - List<Result> failures = new ArrayList<>(); - int entryIndex = 0; - int assertionIndex = 0; - int lastPassedAssertionIndex = -1; - - if (mAssertions.size() == 0) { - return failures; - } - - while (assertionIndex < mAssertions.size() && entryIndex < entries.size()) { - TraceAssertion<T> currentAssertion = mAssertions.get(assertionIndex).assertion; - Result result = currentAssertion.apply(entries.get(entryIndex)); - if (result.passed()) { - lastPassedAssertionIndex = assertionIndex; - entryIndex++; - continue; - } - - if (lastPassedAssertionIndex != assertionIndex) { - failures.add(result); - break; - } - assertionIndex++; - - if (assertionIndex == mAssertions.size()) { - failures.add(result); - break; - } - } - - if (failures.isEmpty()) { - if (assertionIndex != mAssertions.size() - 1) { - String reason = "\nAssertion " + mAssertions.get(assertionIndex).name - + " never became false"; - reason += "\nPassed assertions: " + mAssertions.stream().limit(assertionIndex) - .map(assertion -> assertion.name).collect(Collectors.joining(",")); - reason += "\nUntested assertions: " + mAssertions.stream().skip(assertionIndex + 1) - .map(assertion -> assertion.name).collect(Collectors.joining(",")); - - Result result = new Result(false /* success */, 0 /* timestamp */, - "assertChanges", "Not all assertions passed." + reason); - failures.add(result); - } - } - return failures; - } - - private List<Result> assertEntry(T entry) { - List<Result> failures = new ArrayList<>(); - for (NamedAssertion<T> assertion : mAssertions) { - Result result = assertion.assertion.apply(entry); - if (result.failed()) { - failures.add(result); - } - } - return failures; - } - - private List<Result> assertAll(List<T> entries) { - return mAssertions.stream().flatMap( - assertion -> entries.stream() - .map(assertion.assertion) - .filter(Result::failed)) - .collect(Collectors.toList()); - } - - private enum AssertionOption { - NONE, - CHECK_CHANGING_ASSERTIONS, - CHECK_FIRST_ENTRY, - CHECK_LAST_ENTRY, - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/ITraceEntry.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/ITraceEntry.java deleted file mode 100644 index c47f7f42e54e..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/ITraceEntry.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -/** - * Common interface for Layer and WindowManager trace entries. - */ -public interface ITraceEntry { - /** - * @return timestamp of current entry - */ - long getTimestamp(); -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTrace.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTrace.java deleted file mode 100644 index 68986d48783a..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTrace.java +++ /dev/null @@ -1,420 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import android.graphics.Rect; -import android.surfaceflinger.nano.Layers.LayerProto; -import android.surfaceflinger.nano.Layers.RectProto; -import android.surfaceflinger.nano.Layers.RegionProto; -import android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto; -import android.surfaceflinger.nano.Layerstrace.LayersTraceProto; -import android.util.SparseArray; - -import androidx.annotation.Nullable; - -import com.android.server.wm.flicker.Assertions.Result; - -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * Contains a collection of parsed Layers trace entries and assertions to apply over - * a single entry. - * - * Each entry is parsed into a list of {@link LayersTrace.Entry} objects. - */ -public class LayersTrace { - final private List<Entry> mEntries; - @Nullable - final private Path mSource; - - private LayersTrace(List<Entry> entries, Path source) { - this.mEntries = entries; - this.mSource = source; - } - - /** - * Parses {@code LayersTraceFileProto} from {@code data} and uses the proto to generates a list - * of trace entries, storing the flattened layers into its hierarchical structure. - * - * @param data binary proto data - * @param source Path to source of data for additional debug information - */ - public static LayersTrace parseFrom(byte[] data, Path source) { - List<Entry> entries = new ArrayList<>(); - LayersTraceFileProto fileProto; - try { - fileProto = LayersTraceFileProto.parseFrom(data); - } catch (Exception e) { - throw new RuntimeException(e); - } - for (LayersTraceProto traceProto : fileProto.entry) { - Entry entry = Entry.fromFlattenedLayers(traceProto.elapsedRealtimeNanos, - traceProto.layers.layers); - entries.add(entry); - } - return new LayersTrace(entries, source); - } - - /** - * Parses {@code LayersTraceFileProto} from {@code data} and uses the proto to generates a list - * of trace entries, storing the flattened layers into its hierarchical structure. - * - * @param data binary proto data - */ - public static LayersTrace parseFrom(byte[] data) { - return parseFrom(data, null); - } - - public List<Entry> getEntries() { - return mEntries; - } - - public Entry getEntry(long timestamp) { - Optional<Entry> entry = mEntries.stream() - .filter(e -> e.getTimestamp() == timestamp) - .findFirst(); - if (!entry.isPresent()) { - throw new RuntimeException("Entry does not exist for timestamp " + timestamp); - } - return entry.get(); - } - - public Optional<Path> getSource() { - return Optional.ofNullable(mSource); - } - - /** - * Represents a single Layer trace entry. - */ - public static class Entry implements ITraceEntry { - private long mTimestamp; - private List<Layer> mRootLayers; // hierarchical representation of layers - private List<Layer> mFlattenedLayers = null; - - private Entry(long timestamp, List<Layer> rootLayers) { - this.mTimestamp = timestamp; - this.mRootLayers = rootLayers; - } - - /** - * Constructs the layer hierarchy from a flattened list of layers. - */ - public static Entry fromFlattenedLayers(long timestamp, LayerProto[] protos) { - SparseArray<Layer> layerMap = new SparseArray<>(); - ArrayList<Layer> orphans = new ArrayList<>(); - for (LayerProto proto : protos) { - int id = proto.id; - int parentId = proto.parent; - - Layer newLayer = layerMap.get(id); - if (newLayer == null) { - newLayer = new Layer(proto); - layerMap.append(id, newLayer); - } else if (newLayer.mProto != null) { - throw new RuntimeException("Duplicate layer id found:" + id); - } else { - newLayer.mProto = proto; - orphans.remove(newLayer); - } - - // add parent placeholder - if (layerMap.get(parentId) == null) { - Layer orphanLayer = new Layer(null); - layerMap.append(parentId, orphanLayer); - orphans.add(orphanLayer); - } - layerMap.get(parentId).addChild(newLayer); - newLayer.addParent(layerMap.get(parentId)); - } - - // Fail if we find orphan layers. - orphans.remove(layerMap.get(-1)); - orphans.forEach(orphan -> { - String childNodes = orphan.mChildren.stream().map(node -> - Integer.toString(node.getId())).collect(Collectors.joining(", ")); - int orphanId = orphan.mChildren.get(0).mProto.parent; - throw new RuntimeException( - "Failed to parse layers trace. Found orphan layers with parent " - + "layer id:" + orphanId + " : " + childNodes); - }); - - return new Entry(timestamp, layerMap.get(-1).mChildren); - } - - /** - * Extracts {@link Rect} from {@link RectProto}. - */ - private static Rect extract(RectProto proto) { - return new Rect(proto.left, proto.top, proto.right, proto.bottom); - } - - /** - * Extracts {@link Rect} from {@link RegionProto} by returning a rect that encompasses all - * the rects making up the region. - */ - private static Rect extract(RegionProto regionProto) { - Rect region = new Rect(); - for (RectProto proto : regionProto.rect) { - region.union(proto.left, proto.top, proto.right, proto.bottom); - } - return region; - } - - /** - * Checks if a region specified by {@code testRect} is covered by all visible layers. - */ - public Result coversRegion(Rect testRect) { - String assertionName = "coversRegion"; - Collection<Layer> layers = asFlattenedLayers(); - - for (int x = testRect.left; x < testRect.right; x++) { - for (int y = testRect.top; y < testRect.bottom; y++) { - boolean emptyRegionFound = true; - for (Layer layer : layers) { - if (layer.isInvisible() || layer.isHiddenByParent()) { - continue; - } - for (RectProto rectProto : layer.mProto.visibleRegion.rect) { - Rect r = extract(rectProto); - if (r.contains(x, y)) { - y = r.bottom; - emptyRegionFound = false; - } - } - } - if (emptyRegionFound) { - String reason = "Region to test: " + testRect - + "\nfirst empty point: " + x + ", " + y; - reason += "\nvisible regions:"; - for (Layer layer : layers) { - if (layer.isInvisible() || layer.isHiddenByParent()) { - continue; - } - Rect r = extract(layer.mProto.visibleRegion); - reason += "\n" + layer.mProto.name + r.toString(); - } - return new Result(false /* success */, this.mTimestamp, assertionName, - reason); - } - } - } - String info = "Region covered: " + testRect; - return new Result(true /* success */, this.mTimestamp, assertionName, info); - } - - /** - * Checks if a layer with name {@code layerName} has a visible region - * {@code expectedVisibleRegion}. - */ - public Result hasVisibleRegion(String layerName, Rect expectedVisibleRegion) { - String assertionName = "hasVisibleRegion"; - String reason = "Could not find " + layerName; - for (Layer layer : asFlattenedLayers()) { - if (layer.mProto.name.contains(layerName)) { - if (layer.isHiddenByParent()) { - reason = layer.getHiddenByParentReason(); - continue; - } - if (layer.isInvisible()) { - reason = layer.getVisibilityReason(); - continue; - } - Rect visibleRegion = extract(layer.mProto.visibleRegion); - if (visibleRegion.equals(expectedVisibleRegion)) { - return new Result(true /* success */, this.mTimestamp, assertionName, - layer.mProto.name + "has visible region " + expectedVisibleRegion); - } - reason = layer.mProto.name + " has visible region:" + visibleRegion + " " - + "expected:" + expectedVisibleRegion; - } - } - return new Result(false /* success */, this.mTimestamp, assertionName, reason); - } - - /** - * Checks if a layer with name {@code layerName} is visible. - */ - public Result isVisible(String layerName) { - String assertionName = "isVisible"; - String reason = "Could not find " + layerName; - for (Layer layer : asFlattenedLayers()) { - if (layer.mProto.name.contains(layerName)) { - if (layer.isHiddenByParent()) { - reason = layer.getHiddenByParentReason(); - continue; - } - if (layer.isInvisible()) { - reason = layer.getVisibilityReason(); - continue; - } - return new Result(true /* success */, this.mTimestamp, assertionName, - layer.mProto.name + " is visible"); - } - } - return new Result(false /* success */, this.mTimestamp, assertionName, reason); - } - - @Override - public long getTimestamp() { - return mTimestamp; - } - - public List<Layer> getRootLayers() { - return mRootLayers; - } - - /** - * Returns all layers as a flattened list using a depth first traversal. - */ - public List<Layer> asFlattenedLayers() { - if (mFlattenedLayers == null) { - mFlattenedLayers = new LinkedList<>(); - ArrayList<Layer> pendingLayers = new ArrayList<>(this.mRootLayers); - while (!pendingLayers.isEmpty()) { - Layer layer = pendingLayers.remove(0); - mFlattenedLayers.add(layer); - pendingLayers.addAll(0, layer.mChildren); - } - } - return mFlattenedLayers; - } - - public Rect getVisibleBounds(String layerName) { - List<Layer> layers = asFlattenedLayers(); - for (Layer layer : layers) { - if (layer.mProto.name.contains(layerName) && layer.isVisible()) { - return extract(layer.mProto.visibleRegion); - } - } - return new Rect(0, 0, 0, 0); - } - } - - /** - * Represents a single layer with links to its parent and child layers. - */ - public static class Layer { - @Nullable - public LayerProto mProto; - public List<Layer> mChildren; - @Nullable - public Layer mParent = null; - - private Layer(LayerProto proto) { - this.mProto = proto; - this.mChildren = new ArrayList<>(); - } - - private void addChild(Layer childLayer) { - this.mChildren.add(childLayer); - } - - private void addParent(Layer parentLayer) { - this.mParent = parentLayer; - } - - public int getId() { - return mProto.id; - } - - public boolean isActiveBufferEmpty() { - return this.mProto.activeBuffer == null || this.mProto.activeBuffer.height == 0 - || this.mProto.activeBuffer.width == 0; - } - - public boolean isVisibleRegionEmpty() { - if (this.mProto.visibleRegion == null) { - return true; - } - Rect visibleRect = Entry.extract(this.mProto.visibleRegion); - return visibleRect.height() == 0 || visibleRect.width() == 0; - } - - public boolean isHidden() { - return (this.mProto.flags & /* FLAG_HIDDEN */ 0x1) != 0x0; - } - - public boolean isVisible() { - return (!isActiveBufferEmpty() || isColorLayer()) - && !isHidden() - && this.mProto.color != null - && this.mProto.color.a > 0 - && !isVisibleRegionEmpty(); - } - - public boolean isColorLayer() { - return this.mProto.type.equals("ColorLayer"); - } - - public boolean isRootLayer() { - return mParent == null || mParent.mProto == null; - } - - public boolean isInvisible() { - return !isVisible(); - } - - public boolean isHiddenByParent() { - return !isRootLayer() && (mParent.isHidden() || mParent.isHiddenByParent()); - } - - public String getHiddenByParentReason() { - String reason = "Layer " + mProto.name; - if (isHiddenByParent()) { - reason += " is hidden by parent: " + mParent.mProto.name; - } else { - reason += " is not hidden by parent: " + mParent.mProto.name; - } - return reason; - } - - public String getVisibilityReason() { - String reason = "Layer " + mProto.name; - if (isVisible()) { - reason += " is visible:"; - } else { - reason += " is invisible:"; - if (this.mProto.activeBuffer == null) { - reason += " activeBuffer=null"; - } else if (this.mProto.activeBuffer.height == 0) { - reason += " activeBuffer.height=0"; - } else if (this.mProto.activeBuffer.width == 0) { - reason += " activeBuffer.width=0"; - } - if (!isColorLayer()) { - reason += " type != ColorLayer"; - } - if (isHidden()) { - reason += " flags=" + this.mProto.flags + " (FLAG_HIDDEN set)"; - } - if (this.mProto.color == null || this.mProto.color.a == 0) { - reason += " color.a=0"; - } - if (isVisibleRegionEmpty()) { - reason += " visible region is empty"; - } - } - return reason; - } - } -}
\ No newline at end of file diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java deleted file mode 100644 index 4a5129ed2269..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.google.common.truth.Truth.assertAbout; -import static com.google.common.truth.Truth.assertWithMessage; - -import android.graphics.Rect; - -import androidx.annotation.Nullable; - -import com.android.server.wm.flicker.Assertions.Result; -import com.android.server.wm.flicker.LayersTrace.Entry; -import com.android.server.wm.flicker.TransitionRunner.TransitionResult; - -import com.google.common.truth.FailureMetadata; -import com.google.common.truth.Subject; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * Truth subject for {@link LayersTrace} objects. - */ -public class LayersTraceSubject extends Subject<LayersTraceSubject, LayersTrace> { - // Boiler-plate Subject.Factory for LayersTraceSubject - private static final Subject.Factory<LayersTraceSubject, LayersTrace> FACTORY = - new Subject.Factory<LayersTraceSubject, LayersTrace>() { - @Override - public LayersTraceSubject createSubject( - FailureMetadata fm, @Nullable LayersTrace target) { - return new LayersTraceSubject(fm, target); - } - }; - - private AssertionsChecker<Entry> mChecker = new AssertionsChecker<>(); - - private LayersTraceSubject(FailureMetadata fm, @Nullable LayersTrace subject) { - super(fm, subject); - } - - // User-defined entry point - public static LayersTraceSubject assertThat(@Nullable LayersTrace entry) { - return assertAbout(FACTORY).that(entry); - } - - // User-defined entry point - public static LayersTraceSubject assertThat(@Nullable TransitionResult result) { - LayersTrace entries = LayersTrace.parseFrom(result.getLayersTrace(), - result.getLayersTracePath()); - return assertWithMessage(result.toString()).about(FACTORY).that(entries); - } - - // Static method for getting the subject factory (for use with assertAbout()) - public static Subject.Factory<LayersTraceSubject, LayersTrace> entries() { - return FACTORY; - } - - public void forAllEntries() { - test(); - } - - public void forRange(long startTime, long endTime) { - mChecker.filterByRange(startTime, endTime); - test(); - } - - public LayersTraceSubject then() { - mChecker.checkChangingAssertions(); - return this; - } - - public void inTheBeginning() { - if (getSubject().getEntries().isEmpty()) { - fail("No entries found."); - } - mChecker.checkFirstEntry(); - test(); - } - - public void atTheEnd() { - if (getSubject().getEntries().isEmpty()) { - fail("No entries found."); - } - mChecker.checkLastEntry(); - test(); - } - - private void test() { - List<Result> failures = mChecker.test(getSubject().getEntries()); - if (!failures.isEmpty()) { - String failureLogs = failures.stream().map(Result::toString) - .collect(Collectors.joining("\n")); - String tracePath = ""; - if (getSubject().getSource().isPresent()) { - tracePath = "\nLayers Trace can be found in: " - + getSubject().getSource().get().toAbsolutePath() + "\n"; - } - fail(tracePath + failureLogs); - } - } - - public LayersTraceSubject coversRegion(Rect rect) { - mChecker.add(entry -> entry.coversRegion(rect), - "coversRegion(" + rect + ")"); - return this; - } - - public LayersTraceSubject hasVisibleRegion(String layerName, Rect size) { - mChecker.add(entry -> entry.hasVisibleRegion(layerName, size), - "hasVisibleRegion(" + layerName + size + ")"); - return this; - } - - public LayersTraceSubject showsLayer(String layerName) { - mChecker.add(entry -> entry.isVisible(layerName), - "showsLayer(" + layerName + ")"); - return this; - } - - public LayersTraceSubject hidesLayer(String layerName) { - mChecker.add(entry -> entry.isVisible(layerName).negate(), - "hidesLayer(" + layerName + ")"); - return this; - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java deleted file mode 100644 index 241a1c04bdb8..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java +++ /dev/null @@ -1,433 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.android.server.wm.flicker.monitor.ITransitionMonitor.OUTPUT_DIR; - -import android.util.Log; - -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.test.InstrumentationRegistry; - -import com.android.server.wm.flicker.monitor.ITransitionMonitor; -import com.android.server.wm.flicker.monitor.LayersTraceMonitor; -import com.android.server.wm.flicker.monitor.ScreenRecorder; -import com.android.server.wm.flicker.monitor.WindowAnimationFrameStatsMonitor; -import com.android.server.wm.flicker.monitor.WindowManagerTraceMonitor; - -import com.google.common.io.Files; - -import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * Builds and runs UI transitions capturing test artifacts. - * - * User can compose a transition from simpler steps, specifying setup and teardown steps. During - * a transition, Layers trace, WindowManager trace, screen recordings and window animation frame - * stats can be captured. - * - * <pre> - * Transition builder options: - * {@link TransitionBuilder#run(Runnable)} run transition under test. Monitors will be started - * before the transition and stopped after the transition is completed. - * {@link TransitionBuilder#repeat(int)} repeat transitions under test multiple times recording - * result for each run. - * {@link TransitionBuilder#withTag(String)} specify a string identifier used to prefix logs and - * artifacts generated. - * {@link TransitionBuilder#runBeforeAll(Runnable)} run setup transitions once before all other - * transition are run to set up an initial state on device. - * {@link TransitionBuilder#runBefore(Runnable)} run setup transitions before each test transition - * run. - * {@link TransitionBuilder#runAfter(Runnable)} run teardown transitions after each test - * transition. - * {@link TransitionBuilder#runAfter(Runnable)} run teardown transitions once after all - * other transition are run. - * {@link TransitionBuilder#includeJankyRuns()} disables {@link WindowAnimationFrameStatsMonitor} - * to monitor janky frames. If janky frames are detected, then the test run is skipped. This - * monitor is enabled by default. - * {@link TransitionBuilder#skipLayersTrace()} disables {@link LayersTraceMonitor} used to - * capture Layers trace during a transition. This monitor is enabled by default. - * {@link TransitionBuilder#skipWindowManagerTrace()} disables {@link WindowManagerTraceMonitor} - * used to capture WindowManager trace during a transition. This monitor is enabled by - * default. - * {@link TransitionBuilder#recordAllRuns()} records the screen contents and saves it to a file. - * All the runs including setup and teardown transitions are included in the recording. This - * monitor is used for debugging purposes. - * {@link TransitionBuilder#recordEachRun()} records the screen contents during test transitions - * and saves it to a file for each run. This monitor is used for debugging purposes. - * - * Example transition to capture WindowManager and Layers trace when opening a test app: - * {@code - * TransitionRunner.newBuilder() - * .withTag("OpenTestAppFast") - * .runBeforeAll(UiAutomationLib::wakeUp) - * .runBeforeAll(UiAutomationLib::UnlockDevice) - * .runBeforeAll(UiAutomationLib::openTestApp) - * .runBefore(UiAutomationLib::closeTestApp) - * .run(UiAutomationLib::openTestApp) - * .runAfterAll(UiAutomationLib::closeTestApp) - * .repeat(5) - * .build() - * .run(); - * } - * </pre> - */ -public class TransitionRunner { - private static final String TAG = "FLICKER"; - private final ScreenRecorder mScreenRecorder; - private final WindowManagerTraceMonitor mWmTraceMonitor; - private final LayersTraceMonitor mLayersTraceMonitor; - private final WindowAnimationFrameStatsMonitor mFrameStatsMonitor; - - private final List<ITransitionMonitor> mAllRunsMonitors; - private final List<ITransitionMonitor> mPerRunMonitors; - private final List<Runnable> mBeforeAlls; - private final List<Runnable> mBefores; - private final List<Runnable> mTransitions; - private final List<Runnable> mAfters; - private final List<Runnable> mAfterAlls; - - private final int mIterations; - private final String mTestTag; - - @Nullable - private List<TransitionResult> mResults = null; - - private TransitionRunner(TransitionBuilder builder) { - mScreenRecorder = builder.mScreenRecorder; - mWmTraceMonitor = builder.mWmTraceMonitor; - mLayersTraceMonitor = builder.mLayersTraceMonitor; - mFrameStatsMonitor = builder.mFrameStatsMonitor; - - mAllRunsMonitors = builder.mAllRunsMonitors; - mPerRunMonitors = builder.mPerRunMonitors; - mBeforeAlls = builder.mBeforeAlls; - mBefores = builder.mBefores; - mTransitions = builder.mTransitions; - mAfters = builder.mAfters; - mAfterAlls = builder.mAfterAlls; - - mIterations = builder.mIterations; - mTestTag = builder.mTestTag; - } - - public static TransitionBuilder newBuilder() { - return newBuilder(OUTPUT_DIR.toString()); - } - - public static TransitionBuilder newBuilder(String outputDir) { - return new TransitionBuilder(outputDir); - } - - /** - * Runs the composed transition and calls monitors at the appropriate stages. If jank monitor - * is enabled, transitions with jank are skipped. - * - * @return itself - */ - public TransitionRunner run() { - mResults = new ArrayList<>(); - mAllRunsMonitors.forEach(ITransitionMonitor::start); - mBeforeAlls.forEach(Runnable::run); - for (int iteration = 0; iteration < mIterations; iteration++) { - mBefores.forEach(Runnable::run); - mPerRunMonitors.forEach(ITransitionMonitor::start); - mTransitions.forEach(Runnable::run); - mPerRunMonitors.forEach(ITransitionMonitor::stop); - mAfters.forEach(Runnable::run); - if (runJankFree() && mFrameStatsMonitor.jankyFramesDetected()) { - String msg = String.format("Skipping iteration %d/%d for test %s due to jank. %s", - iteration, mIterations - 1, mTestTag, mFrameStatsMonitor.toString()); - Log.e(TAG, msg); - continue; - } - mResults.add(saveResult(iteration)); - } - mAfterAlls.forEach(Runnable::run); - mAllRunsMonitors.forEach(monitor -> { - monitor.stop(); - monitor.save(mTestTag); - }); - return this; - } - - /** - * Returns a list of transition results. - * - * @return list of transition results. - */ - public List<TransitionResult> getResults() { - if (mResults == null) { - throw new IllegalStateException("Results do not exist!"); - } - return mResults; - } - - /** - * Deletes all transition results that are not marked for saving. - * - * @return list of transition results. - */ - public void deleteResults() { - if (mResults == null) { - return; - } - mResults.stream() - .filter(TransitionResult::canDelete) - .forEach(TransitionResult::delete); - mResults = null; - } - - /** - * Saves monitor results to file. - * - * @return object containing paths to test artifacts - */ - private TransitionResult saveResult(int iteration) { - Path windowTrace = null; - Path layerTrace = null; - Path screenCaptureVideo = null; - - if (mPerRunMonitors.contains(mWmTraceMonitor)) { - windowTrace = mWmTraceMonitor.save(mTestTag, iteration); - } - if (mPerRunMonitors.contains(mLayersTraceMonitor)) { - layerTrace = mLayersTraceMonitor.save(mTestTag, iteration); - } - if (mPerRunMonitors.contains(mScreenRecorder)) { - screenCaptureVideo = mScreenRecorder.save(mTestTag, iteration); - } - return new TransitionResult(layerTrace, windowTrace, screenCaptureVideo); - } - - private boolean runJankFree() { - return mPerRunMonitors.contains(mFrameStatsMonitor); - } - - public String getTestTag() { - return mTestTag; - } - - /** - * Stores paths to all test artifacts. - */ - @VisibleForTesting - public static class TransitionResult { - @Nullable - public final Path layersTrace; - @Nullable - public final Path windowManagerTrace; - @Nullable - public final Path screenCaptureVideo; - private boolean flaggedForSaving; - - public TransitionResult(@Nullable Path layersTrace, @Nullable Path windowManagerTrace, - @Nullable Path screenCaptureVideo) { - this.layersTrace = layersTrace; - this.windowManagerTrace = windowManagerTrace; - this.screenCaptureVideo = screenCaptureVideo; - } - - public void flagForSaving() { - flaggedForSaving = true; - } - - public boolean canDelete() { - return !flaggedForSaving; - } - - public boolean layersTraceExists() { - return layersTrace != null && layersTrace.toFile().exists(); - } - - public byte[] getLayersTrace() { - try { - return Files.toByteArray(this.layersTrace.toFile()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public Path getLayersTracePath() { - return layersTrace; - } - - public boolean windowManagerTraceExists() { - return windowManagerTrace != null && windowManagerTrace.toFile().exists(); - } - - public byte[] getWindowManagerTrace() { - try { - return Files.toByteArray(this.windowManagerTrace.toFile()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public Path getWindowManagerTracePath() { - return windowManagerTrace; - } - - public boolean screenCaptureVideoExists() { - return screenCaptureVideo != null && screenCaptureVideo.toFile().exists(); - } - - public Path screenCaptureVideoPath() { - return screenCaptureVideo; - } - - public void delete() { - if (layersTraceExists()) layersTrace.toFile().delete(); - if (windowManagerTraceExists()) windowManagerTrace.toFile().delete(); - if (screenCaptureVideoExists()) screenCaptureVideo.toFile().delete(); - } - } - - /** - * Builds a {@link TransitionRunner} instance. - */ - public static class TransitionBuilder { - private ScreenRecorder mScreenRecorder; - private WindowManagerTraceMonitor mWmTraceMonitor; - private LayersTraceMonitor mLayersTraceMonitor; - private WindowAnimationFrameStatsMonitor mFrameStatsMonitor; - - private List<ITransitionMonitor> mAllRunsMonitors = new LinkedList<>(); - private List<ITransitionMonitor> mPerRunMonitors = new LinkedList<>(); - private List<Runnable> mBeforeAlls = new LinkedList<>(); - private List<Runnable> mBefores = new LinkedList<>(); - private List<Runnable> mTransitions = new LinkedList<>(); - private List<Runnable> mAfters = new LinkedList<>(); - private List<Runnable> mAfterAlls = new LinkedList<>(); - - private boolean mRunJankFree = true; - private boolean mCaptureWindowManagerTrace = true; - private boolean mCaptureLayersTrace = true; - private boolean mRecordEachRun = false; - private int mIterations = 1; - private String mTestTag = ""; - - private boolean mRecordAllRuns = false; - - public TransitionBuilder(String outputDir) { - mScreenRecorder = new ScreenRecorder(); - mWmTraceMonitor = new WindowManagerTraceMonitor(outputDir); - mLayersTraceMonitor = new LayersTraceMonitor(outputDir); - mFrameStatsMonitor = new - WindowAnimationFrameStatsMonitor(InstrumentationRegistry.getInstrumentation()); - } - - public TransitionRunner build() { - if (mCaptureWindowManagerTrace) { - mPerRunMonitors.add(mWmTraceMonitor); - } - - if (mCaptureLayersTrace) { - mPerRunMonitors.add(mLayersTraceMonitor); - } - - if (mRunJankFree) { - mPerRunMonitors.add(mFrameStatsMonitor); - } - - if (mRecordAllRuns) { - mAllRunsMonitors.add(mScreenRecorder); - } - - if (mRecordEachRun) { - mPerRunMonitors.add(mScreenRecorder); - } - - return new TransitionRunner(this); - } - - public TransitionBuilder runBeforeAll(Runnable runnable) { - mBeforeAlls.add(runnable); - return this; - } - - public TransitionBuilder runBefore(Runnable runnable) { - mBefores.add(runnable); - return this; - } - - public TransitionBuilder run(Runnable runnable) { - mTransitions.add(runnable); - return this; - } - - public TransitionBuilder runAfter(Runnable runnable) { - mAfters.add(runnable); - return this; - } - - public TransitionBuilder runAfterAll(Runnable runnable) { - mAfterAlls.add(runnable); - return this; - } - - public TransitionBuilder repeat(int iterations) { - mIterations = iterations; - return this; - } - - public TransitionBuilder skipWindowManagerTrace() { - mCaptureWindowManagerTrace = false; - return this; - } - - public TransitionBuilder skipLayersTrace() { - mCaptureLayersTrace = false; - return this; - } - - public TransitionBuilder includeJankyRuns() { - mRunJankFree = false; - return this; - } - - public TransitionBuilder recordEachRun() { - if (mRecordAllRuns) { - throw new IllegalArgumentException("Invalid option with recordAllRuns"); - } - mRecordEachRun = true; - return this; - } - - public TransitionBuilder recordAllRuns() { - if (mRecordEachRun) { - throw new IllegalArgumentException("Invalid option with recordEachRun"); - } - mRecordAllRuns = true; - return this; - } - - public TransitionBuilder withTag(String testTag) { - if (testTag.contains(" ")) { - throw new IllegalArgumentException("The test tag can not contain spaces since it " - + "is a part of the file name"); - } - mTestTag = testTag; - return this; - } - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowManagerTrace.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowManagerTrace.java deleted file mode 100644 index 412e72d82e55..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowManagerTrace.java +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import androidx.annotation.Nullable; - -import com.android.server.wm.flicker.Assertions.Result; -import com.android.server.wm.nano.AppWindowTokenProto; -import com.android.server.wm.nano.StackProto; -import com.android.server.wm.nano.TaskProto; -import com.android.server.wm.nano.WindowManagerTraceFileProto; -import com.android.server.wm.nano.WindowManagerTraceProto; -import com.android.server.wm.nano.WindowStateProto; -import com.android.server.wm.nano.WindowTokenProto; - -import com.google.protobuf.nano.InvalidProtocolBufferNanoException; - -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -/** - * Contains a collection of parsed WindowManager trace entries and assertions to apply over - * a single entry. - * - * Each entry is parsed into a list of {@link WindowManagerTrace.Entry} objects. - */ -public class WindowManagerTrace { - private static final int DEFAULT_DISPLAY = 0; - private final List<Entry> mEntries; - @Nullable - final private Path mSource; - - private WindowManagerTrace(List<Entry> entries, Path source) { - this.mEntries = entries; - this.mSource = source; - } - - /** - * Parses {@code WindowManagerTraceFileProto} from {@code data} and uses the proto to - * generates a list of trace entries. - * - * @param data binary proto data - * @param source Path to source of data for additional debug information - */ - public static WindowManagerTrace parseFrom(byte[] data, Path source) { - List<Entry> entries = new ArrayList<>(); - - WindowManagerTraceFileProto fileProto; - try { - fileProto = WindowManagerTraceFileProto.parseFrom(data); - } catch (InvalidProtocolBufferNanoException e) { - throw new RuntimeException(e); - } - for (WindowManagerTraceProto entryProto : fileProto.entry) { - entries.add(new Entry(entryProto)); - } - return new WindowManagerTrace(entries, source); - } - - public static WindowManagerTrace parseFrom(byte[] data) { - return parseFrom(data, null); - } - - public List<Entry> getEntries() { - return mEntries; - } - - public Entry getEntry(long timestamp) { - Optional<Entry> entry = mEntries.stream() - .filter(e -> e.getTimestamp() == timestamp) - .findFirst(); - if (!entry.isPresent()) { - throw new RuntimeException("Entry does not exist for timestamp " + timestamp); - } - return entry.get(); - } - - public Optional<Path> getSource() { - return Optional.ofNullable(mSource); - } - - /** - * Represents a single WindowManager trace entry. - */ - public static class Entry implements ITraceEntry { - private final WindowManagerTraceProto mProto; - - public Entry(WindowManagerTraceProto proto) { - mProto = proto; - } - - private static Result isWindowVisible(String windowTitle, - WindowTokenProto[] windowTokenProtos) { - boolean titleFound = false; - for (WindowTokenProto windowToken : windowTokenProtos) { - for (WindowStateProto windowState : windowToken.windows) { - if (windowState.identifier.title.contains(windowTitle)) { - titleFound = true; - if (isVisible(windowState)) { - return new Result(true /* success */, - windowState.identifier.title + " is visible"); - } - } - } - } - - String reason; - if (!titleFound) { - reason = windowTitle + " cannot be found"; - } else { - reason = windowTitle + " is invisible"; - } - return new Result(false /* success */, reason); - } - - private static boolean isVisible(WindowStateProto windowState) { - return windowState.windowContainer.visible; - } - - @Override - public long getTimestamp() { - return mProto.elapsedRealtimeNanos; - } - - /** - * Returns window title of the top most visible app window. - */ - private String getTopVisibleAppWindow() { - StackProto[] stacks = mProto.windowManagerService.rootWindowContainer - .displays[DEFAULT_DISPLAY].stacks; - for (StackProto stack : stacks) { - for (TaskProto task : stack.tasks) { - for (AppWindowTokenProto token : task.appWindowTokens) { - for (WindowStateProto windowState : token.windowToken.windows) { - if (windowState.windowContainer.visible) { - return task.appWindowTokens[0].name; - } - } - } - } - } - - return ""; - } - - /** - * Checks if aboveAppWindow with {@code windowTitle} is visible. - */ - public Result isAboveAppWindowVisible(String windowTitle) { - WindowTokenProto[] windowTokenProtos = mProto.windowManagerService - .rootWindowContainer - .displays[DEFAULT_DISPLAY].aboveAppWindows; - Result result = isWindowVisible(windowTitle, windowTokenProtos); - return new Result(result.success, getTimestamp(), "showsAboveAppWindow", result.reason); - } - - /** - * Checks if belowAppWindow with {@code windowTitle} is visible. - */ - public Result isBelowAppWindowVisible(String windowTitle) { - WindowTokenProto[] windowTokenProtos = mProto.windowManagerService - .rootWindowContainer - .displays[DEFAULT_DISPLAY].belowAppWindows; - Result result = isWindowVisible(windowTitle, windowTokenProtos); - return new Result(result.success, getTimestamp(), "isBelowAppWindowVisible", - result.reason); - } - - /** - * Checks if imeWindow with {@code windowTitle} is visible. - */ - public Result isImeWindowVisible(String windowTitle) { - WindowTokenProto[] windowTokenProtos = mProto.windowManagerService - .rootWindowContainer - .displays[DEFAULT_DISPLAY].imeWindows; - Result result = isWindowVisible(windowTitle, windowTokenProtos); - return new Result(result.success, getTimestamp(), "isImeWindowVisible", - result.reason); - } - - /** - * Checks if app window with {@code windowTitle} is on top. - */ - public Result isVisibleAppWindowOnTop(String windowTitle) { - String topAppWindow = getTopVisibleAppWindow(); - boolean success = topAppWindow.contains(windowTitle); - String reason = "wanted=" + windowTitle + " found=" + topAppWindow; - return new Result(success, getTimestamp(), "isAppWindowOnTop", reason); - } - - /** - * Checks if app window with {@code windowTitle} is visible. - */ - public Result isAppWindowVisible(String windowTitle) { - final String assertionName = "isAppWindowVisible"; - boolean titleFound = false; - StackProto[] stacks = mProto.windowManagerService.rootWindowContainer - .displays[DEFAULT_DISPLAY].stacks; - for (StackProto stack : stacks) { - for (TaskProto task : stack.tasks) { - for (AppWindowTokenProto token : task.appWindowTokens) { - if (token.name.contains(windowTitle)) { - titleFound = true; - for (WindowStateProto windowState : token.windowToken.windows) { - if (windowState.windowContainer.visible) { - return new Result(true /* success */, getTimestamp(), - assertionName, "Window " + token.name + - "is visible"); - } - } - } - } - } - } - String reason; - if (!titleFound) { - reason = "Window " + windowTitle + " cannot be found"; - } else { - reason = "Window " + windowTitle + " is invisible"; - } - return new Result(false /* success */, getTimestamp(), assertionName, reason); - } - } -}
\ No newline at end of file diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java deleted file mode 100644 index 3d25fbed5135..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Point; -import android.graphics.Rect; -import android.view.Surface; -import android.view.WindowManager; - -import androidx.test.InstrumentationRegistry; - -/** - * Helper functions to retrieve system window sizes and positions. - */ -public class WindowUtils { - - public static Rect getDisplayBounds() { - Point display = new Point(); - WindowManager wm = - (WindowManager) InstrumentationRegistry.getContext().getSystemService( - Context.WINDOW_SERVICE); - wm.getDefaultDisplay().getRealSize(display); - return new Rect(0, 0, display.x, display.y); - } - - private static int getCurrentRotation() { - WindowManager wm = - (WindowManager) InstrumentationRegistry.getContext().getSystemService( - Context.WINDOW_SERVICE); - return wm.getDefaultDisplay().getRotation(); - } - - public static Rect getDisplayBounds(int requestedRotation) { - Rect displayBounds = getDisplayBounds(); - int currentDisplayRotation = getCurrentRotation(); - - boolean displayIsRotated = (currentDisplayRotation == Surface.ROTATION_90 || - currentDisplayRotation == Surface.ROTATION_270); - - boolean requestedDisplayIsRotated = requestedRotation == Surface.ROTATION_90 || - requestedRotation == Surface.ROTATION_270; - - // if the current orientation changes with the requested rotation, - // flip height and width of display bounds. - if (displayIsRotated != requestedDisplayIsRotated) { - return new Rect(0, 0, displayBounds.height(), displayBounds.width()); - } - - return new Rect(0, 0, displayBounds.width(), displayBounds.height()); - } - - - public static Rect getAppPosition(int requestedRotation) { - Rect displayBounds = getDisplayBounds(); - int currentDisplayRotation = getCurrentRotation(); - - boolean displayIsRotated = currentDisplayRotation == Surface.ROTATION_90 || - currentDisplayRotation == Surface.ROTATION_270; - - boolean requestedAppIsRotated = requestedRotation == Surface.ROTATION_90 || - requestedRotation == Surface.ROTATION_270; - - // display size will change if the display is reflected. Flip height and width of app if the - // requested rotation is different from the current rotation. - if (displayIsRotated != requestedAppIsRotated) { - return new Rect(0, 0, displayBounds.height(), displayBounds.width()); - } - - return new Rect(0, 0, displayBounds.width(), displayBounds.height()); - } - - public static Rect getStatusBarPosition(int requestedRotation) { - Resources resources = InstrumentationRegistry.getContext().getResources(); - String resourceName; - Rect displayBounds = getDisplayBounds(); - int width; - if (requestedRotation == Surface.ROTATION_0 || requestedRotation == Surface.ROTATION_180) { - resourceName = "status_bar_height_portrait"; - width = Math.min(displayBounds.width(), displayBounds.height()); - } else { - resourceName = "status_bar_height_landscape"; - width = Math.max(displayBounds.width(), displayBounds.height()); - } - - int resourceId = resources.getIdentifier(resourceName, "dimen", "android"); - int height = resources.getDimensionPixelSize(resourceId); - - return new Rect(0, 0, width, height); - } - - public static Rect getNavigationBarPosition(int requestedRotation) { - Resources resources = InstrumentationRegistry.getContext().getResources(); - Rect displayBounds = getDisplayBounds(); - int displayWidth = Math.min(displayBounds.width(), displayBounds.height()); - int displayHeight = Math.max(displayBounds.width(), displayBounds.height()); - int resourceId; - if (requestedRotation == Surface.ROTATION_0 || requestedRotation == Surface.ROTATION_180) { - resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android"); - int height = resources.getDimensionPixelSize(resourceId); - return new Rect(0, displayHeight - height, displayWidth, displayHeight); - } else { - resourceId = resources.getIdentifier("navigation_bar_width", "dimen", "android"); - int width = resources.getDimensionPixelSize(resourceId); - // swap display dimensions in landscape or seascape mode - int temp = displayHeight; - displayHeight = displayWidth; - displayWidth = temp; - if (requestedRotation == Surface.ROTATION_90) { - return new Rect(0, 0, width, displayHeight); - } else { - return new Rect(displayWidth - width, 0, displayWidth, displayHeight); - } - } - } - - public static int getNavigationBarHeight() { - Resources resources = InstrumentationRegistry.getContext().getResources(); - int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android"); - return resources.getDimensionPixelSize(resourceId); - } - - public static int getDockedStackDividerInset() { - Resources resources = InstrumentationRegistry.getContext().getResources(); - int resourceId = resources.getIdentifier("docked_stack_divider_insets", "dimen", - "android"); - return resources.getDimensionPixelSize(resourceId); - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java deleted file mode 100644 index 064cc2702f39..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.google.common.truth.Truth.assertAbout; -import static com.google.common.truth.Truth.assertWithMessage; - -import androidx.annotation.Nullable; - -import com.android.server.wm.flicker.Assertions.Result; -import com.android.server.wm.flicker.TransitionRunner.TransitionResult; - -import com.google.common.truth.FailureMetadata; -import com.google.common.truth.Subject; - -import java.nio.file.Path; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * Truth subject for {@link WindowManagerTrace} objects. - */ -public class WmTraceSubject extends Subject<WmTraceSubject, WindowManagerTrace> { - // Boiler-plate Subject.Factory for WmTraceSubject - private static final Subject.Factory<WmTraceSubject, WindowManagerTrace> FACTORY = - new Subject.Factory<WmTraceSubject, WindowManagerTrace>() { - @Override - public WmTraceSubject createSubject( - FailureMetadata fm, @Nullable WindowManagerTrace target) { - return new WmTraceSubject(fm, target); - } - }; - - private AssertionsChecker<WindowManagerTrace.Entry> mChecker = new AssertionsChecker<>(); - - private WmTraceSubject(FailureMetadata fm, @Nullable WindowManagerTrace subject) { - super(fm, subject); - } - - // User-defined entry point - public static WmTraceSubject assertThat(@Nullable WindowManagerTrace entry) { - return assertAbout(FACTORY).that(entry); - } - - // User-defined entry point - public static WmTraceSubject assertThat(@Nullable TransitionResult result) { - WindowManagerTrace entries = WindowManagerTrace.parseFrom(result.getWindowManagerTrace(), - result.getWindowManagerTracePath()); - return assertWithMessage(result.toString()).about(FACTORY).that(entries); - } - - // Static method for getting the subject factory (for use with assertAbout()) - public static Subject.Factory<WmTraceSubject, WindowManagerTrace> entries() { - return FACTORY; - } - - public void forAllEntries() { - test(); - } - - public void forRange(long startTime, long endTime) { - mChecker.filterByRange(startTime, endTime); - test(); - } - - public WmTraceSubject then() { - mChecker.checkChangingAssertions(); - return this; - } - - public void inTheBeginning() { - if (getSubject().getEntries().isEmpty()) { - fail("No entries found."); - } - mChecker.checkFirstEntry(); - test(); - } - - public void atTheEnd() { - if (getSubject().getEntries().isEmpty()) { - fail("No entries found."); - } - mChecker.checkLastEntry(); - test(); - } - - private void test() { - List<Result> failures = mChecker.test(getSubject().getEntries()); - if (!failures.isEmpty()) { - Optional<Path> failureTracePath = getSubject().getSource(); - String failureLogs = failures.stream().map(Result::toString) - .collect(Collectors.joining("\n")); - String tracePath = ""; - if (failureTracePath.isPresent()) { - tracePath = "\nWindowManager Trace can be found in: " - + failureTracePath.get().toAbsolutePath() + "\n"; - } - fail(tracePath + failureLogs); - } - } - - public WmTraceSubject showsAboveAppWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isAboveAppWindowVisible(partialWindowTitle), - "showsAboveAppWindow(" + partialWindowTitle + ")"); - return this; - } - - public WmTraceSubject hidesAboveAppWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isAboveAppWindowVisible(partialWindowTitle).negate(), - "hidesAboveAppWindow" + "(" + partialWindowTitle + ")"); - return this; - } - - public WmTraceSubject showsBelowAppWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isBelowAppWindowVisible(partialWindowTitle), - "showsBelowAppWindow(" + partialWindowTitle + ")"); - return this; - } - - public WmTraceSubject hidesBelowAppWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isBelowAppWindowVisible(partialWindowTitle).negate(), - "hidesBelowAppWindow" + "(" + partialWindowTitle + ")"); - return this; - } - - public WmTraceSubject showsImeWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isImeWindowVisible(partialWindowTitle), - "showsBelowAppWindow(" + partialWindowTitle + ")"); - return this; - } - - public WmTraceSubject hidesImeWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isImeWindowVisible(partialWindowTitle).negate(), - "hidesImeWindow" + "(" + partialWindowTitle + ")"); - return this; - } - - public WmTraceSubject showsAppWindowOnTop(String partialWindowTitle) { - mChecker.add( - entry -> { - Result result = entry.isAppWindowVisible(partialWindowTitle); - if (result.passed()) { - result = entry.isVisibleAppWindowOnTop(partialWindowTitle); - } - return result; - }, - "showsAppWindowOnTop(" + partialWindowTitle + ")" - ); - return this; - } - - public WmTraceSubject hidesAppWindowOnTop(String partialWindowTitle) { - mChecker.add( - entry -> { - Result result = entry.isAppWindowVisible(partialWindowTitle).negate(); - if (result.failed()) { - result = entry.isVisibleAppWindowOnTop(partialWindowTitle).negate(); - } - return result; - }, - "hidesAppWindowOnTop(" + partialWindowTitle + ")" - ); - return this; - } - - public WmTraceSubject showsAppWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isAppWindowVisible(partialWindowTitle), - "showsAppWindow(" + partialWindowTitle + ")"); - return this; - } - - public WmTraceSubject hidesAppWindow(String partialWindowTitle) { - mChecker.add(entry -> entry.isAppWindowVisible(partialWindowTitle).negate(), - "hidesAppWindow(" + partialWindowTitle + ")"); - return this; - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/helpers/AutomationUtils.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/helpers/AutomationUtils.java deleted file mode 100644 index 6821ff02e371..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/helpers/AutomationUtils.java +++ /dev/null @@ -1,263 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.helpers; - -import static android.os.SystemClock.sleep; -import static android.system.helpers.OverviewHelper.isRecentsInLauncher; -import static android.view.Surface.ROTATION_0; - -import static com.android.compatibility.common.util.SystemUtil.runShellCommand; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import android.content.Context; -import android.content.pm.PackageManager; -import android.graphics.Point; -import android.graphics.Rect; -import android.os.RemoteException; -import android.support.test.launcherhelper.LauncherStrategyFactory; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.BySelector; -import android.support.test.uiautomator.Configurator; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; -import android.util.Log; -import android.util.Rational; -import android.view.View; -import android.view.ViewConfiguration; - -import androidx.test.InstrumentationRegistry; - -import com.android.server.wm.flicker.WindowUtils; - -/** - * Collection of UI Automation helper functions. - */ -public class AutomationUtils { - private static final String SYSTEMUI_PACKAGE = "com.android.systemui"; - private static final long FIND_TIMEOUT = 10000; - private static final long LONG_PRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout() * 2L; - private static final String TAG = "FLICKER"; - - public static void wakeUpAndGoToHomeScreen() { - UiDevice device = UiDevice.getInstance(InstrumentationRegistry - .getInstrumentation()); - try { - device.wakeUp(); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - device.pressHome(); - } - - /** - * Sets {@link android.app.UiAutomation#waitForIdle(long, long)} global timeout to 0 causing - * the {@link android.app.UiAutomation#waitForIdle(long, long)} function to timeout instantly. - * This removes some delays when using the UIAutomator library required to create fast UI - * transitions. - */ - public static void setFastWait() { - Configurator.getInstance().setWaitForIdleTimeout(0); - } - - /** - * Reverts {@link android.app.UiAutomation#waitForIdle(long, long)} to default behavior. - */ - public static void setDefaultWait() { - Configurator.getInstance().setWaitForIdleTimeout(10000); - } - - public static boolean isQuickstepEnabled(UiDevice device) { - return device.findObject(By.res(SYSTEMUI_PACKAGE, "recent_apps")) == null; - } - - public static void openQuickstep(UiDevice device) { - if (isQuickstepEnabled(device)) { - int height = device.getDisplayHeight(); - UiObject2 navBar = device.findObject(By.res(SYSTEMUI_PACKAGE, "navigation_bar_frame")); - - Rect navBarVisibleBounds; - - // TODO(vishnun) investigate why this object cannot be found. - if (navBar != null) { - navBarVisibleBounds = navBar.getVisibleBounds(); - } else { - Log.e(TAG, "Could not find nav bar, infer location"); - navBarVisibleBounds = WindowUtils.getNavigationBarPosition(ROTATION_0); - } - - // Swipe from nav bar to 2/3rd down the screen. - device.swipe( - navBarVisibleBounds.centerX(), navBarVisibleBounds.centerY(), - navBarVisibleBounds.centerX(), height * 2 / 3, - (navBarVisibleBounds.centerY() - height * 2 / 3) / 100); // 100 px/step - } else { - try { - device.pressRecentApps(); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - BySelector RECENTS = By.res(SYSTEMUI_PACKAGE, "recents_view"); - - // use a long timeout to wait until recents populated - if (device.wait( - Until.findObject(isRecentsInLauncher() - ? getLauncherOverviewSelector(device) : RECENTS), - 10000) == null) { - fail("Recents didn't appear"); - } - device.waitForIdle(); - } - - public static void clearRecents(UiDevice device) { - if (isQuickstepEnabled(device)) { - openQuickstep(device); - - for (int i = 0; i < 5; i++) { - device.swipe(device.getDisplayWidth() / 2, - device.getDisplayHeight() / 2, device.getDisplayWidth(), - device.getDisplayHeight() / 2, - 5); - - BySelector clearAllSelector = By.res("com.google.android.apps.nexuslauncher", - "clear_all_button"); - UiObject2 clearAllButton = device.wait(Until.findObject(clearAllSelector), 100); - if (clearAllButton != null) { - clearAllButton.click(); - return; - } - } - } - } - - private static BySelector getLauncherOverviewSelector(UiDevice device) { - return By.res(device.getLauncherPackageName(), "overview_panel"); - } - - private static void longPressRecents(UiDevice device) { - BySelector recentsSelector = By.res(SYSTEMUI_PACKAGE, "recent_apps"); - UiObject2 recentsButton = device.wait(Until.findObject(recentsSelector), FIND_TIMEOUT); - assertNotNull("Unable to find recents button", recentsButton); - recentsButton.click(LONG_PRESS_TIMEOUT); - } - - public static void launchSplitScreen(UiDevice device) { - String mLauncherPackage = LauncherStrategyFactory.getInstance(device) - .getLauncherStrategy().getSupportedLauncherPackage(); - - if (isQuickstepEnabled(device)) { - // Quickstep enabled - openQuickstep(device); - - BySelector overviewIconSelector = By.res(mLauncherPackage, "icon") - .clazz(View.class); - UiObject2 overviewIcon = device.wait(Until.findObject(overviewIconSelector), - FIND_TIMEOUT); - assertNotNull("Unable to find app icon in Overview", overviewIcon); - overviewIcon.click(); - - BySelector splitscreenButtonSelector = By.text("Split screen"); - UiObject2 splitscreenButton = device.wait(Until.findObject(splitscreenButtonSelector), - FIND_TIMEOUT); - assertNotNull("Unable to find Split screen button in Overview", splitscreenButton); - splitscreenButton.click(); - } else { - // Classic long press recents - longPressRecents(device); - } - // Wait for animation to complete. - sleep(2000); - } - - public static void exitSplitScreen(UiDevice device) { - if (isQuickstepEnabled(device)) { - // Quickstep enabled - BySelector dividerSelector = By.res(SYSTEMUI_PACKAGE, "docked_divider_handle"); - UiObject2 divider = device.wait(Until.findObject(dividerSelector), FIND_TIMEOUT); - assertNotNull("Unable to find Split screen divider", divider); - - // Drag the split screen divider to the top of the screen - divider.drag(new Point(device.getDisplayWidth() / 2, 0), 400); - } else { - // Classic long press recents - longPressRecents(device); - } - // Wait for animation to complete. - sleep(2000); - } - - public static void resizeSplitScreen(UiDevice device, Rational windowHeightRatio) { - BySelector dividerSelector = By.res(SYSTEMUI_PACKAGE, "docked_divider_handle"); - UiObject2 divider = device.wait(Until.findObject(dividerSelector), FIND_TIMEOUT); - assertNotNull("Unable to find Split screen divider", divider); - int destHeight = - (int) (WindowUtils.getDisplayBounds().height() * windowHeightRatio.floatValue()); - // Drag the split screen divider to so that the ratio of top window height and bottom - // window height is windowHeightRatio - device.drag(divider.getVisibleBounds().centerX(), divider.getVisibleBounds().centerY(), - device.getDisplayWidth() / 2, destHeight, 10); - //divider.drag(new Point(device.getDisplayWidth() / 2, destHeight), 400) - divider = device.wait(Until.findObject(dividerSelector), FIND_TIMEOUT); - - // Wait for animation to complete. - sleep(2000); - } - - public static void closePipWindow(UiDevice device) { - UiObject2 pipWindow = device.findObject( - By.res(SYSTEMUI_PACKAGE, "background")); - pipWindow.click(); - UiObject2 exitPipObject = device.findObject( - By.res(SYSTEMUI_PACKAGE, "dismiss")); - exitPipObject.click(); - // Wait for animation to complete. - sleep(2000); - } - - public static void expandPipWindow(UiDevice device) { - UiObject2 pipWindow = device.findObject( - By.res(SYSTEMUI_PACKAGE, "background")); - pipWindow.click(); - pipWindow.click(); - } - - public static void stopPackage(Context context, String packageName) { - runShellCommand("am force-stop " + packageName); - int packageUid; - try { - packageUid = context.getPackageManager().getPackageUid(packageName, /* flags= */0); - } catch (PackageManager.NameNotFoundException e) { - return; - } - while (targetPackageIsRunning(packageUid)) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - //ignore - } - } - } - - private static boolean targetPackageIsRunning(int uid) { - final String result = runShellCommand( - String.format("cmd activity get-uid-state %d", uid)); - return !result.contains("(NONEXISTENT)"); - } -}
\ No newline at end of file diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ITransitionMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ITransitionMonitor.java deleted file mode 100644 index 67e0ecc1cde7..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ITransitionMonitor.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import android.os.Environment; - -import java.nio.file.Path; -import java.nio.file.Paths; - -/** - * Collects test artifacts during a UI transition. - */ -public interface ITransitionMonitor { - Path OUTPUT_DIR = Paths.get(Environment.getExternalStorageDirectory().toString(), "flicker"); - - /** - * Starts monitor. - */ - void start(); - - /** - * Stops monitor. - */ - void stop(); - - /** - * Saves any monitor artifacts to file adding {@code testTag} and {@code iteration} - * to the file name. - * - * @param testTag suffix added to artifact name - * @param iteration suffix added to artifact name - * - * @return Path to saved artifact - */ - default Path save(String testTag, int iteration) { - return save(testTag + "_" + iteration); - } - - /** - * Saves any monitor artifacts to file adding {@code testTag} to the file name. - * - * @param testTag suffix added to artifact name - * - * @return Path to saved artifact - */ - default Path save(String testTag) { - throw new UnsupportedOperationException("Save not implemented for this monitor"); - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/LayersTraceMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/LayersTraceMonitor.java deleted file mode 100644 index da75b3e86d6b..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/LayersTraceMonitor.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import android.os.RemoteException; -import android.view.IWindowManager; -import android.view.WindowManagerGlobal; - -/** - * Captures Layers trace from SurfaceFlinger. - */ -public class LayersTraceMonitor extends TraceMonitor { - private IWindowManager mWm = WindowManagerGlobal.getWindowManagerService(); - - public LayersTraceMonitor() { - this(OUTPUT_DIR.toString()); - } - - public LayersTraceMonitor(String outputDir) { - super(outputDir, "layers_trace.pb"); - } - - @Override - public void start() { - setEnabled(true); - } - - @Override - public void stop() { - setEnabled(false); - } - - @Override - public boolean isEnabled() throws RemoteException { - try { - return mWm.isLayerTracing(); - } catch (RemoteException e) { - e.printStackTrace(); - } - return false; - } - - private void setEnabled(boolean isEnabled) { - try { - mWm.setLayerTracing(isEnabled); - } catch (RemoteException e) { - e.printStackTrace(); - } - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ScreenRecorder.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ScreenRecorder.java deleted file mode 100644 index dce1c2739b15..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ScreenRecorder.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import static com.android.compatibility.common.util.SystemUtil.runShellCommand; - -import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; - -import android.util.Log; - -import androidx.annotation.VisibleForTesting; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * Captures screen contents and saves it as a mp4 video file. - */ -public class ScreenRecorder implements ITransitionMonitor { - @VisibleForTesting - public static final Path DEFAULT_OUTPUT_PATH = OUTPUT_DIR.resolve("transition.mp4"); - private static final String TAG = "FLICKER"; - private Thread recorderThread; - - @VisibleForTesting - public static Path getPath(String testTag) { - return OUTPUT_DIR.resolve(testTag + ".mp4"); - } - - @Override - public void start() { - OUTPUT_DIR.toFile().mkdirs(); - String command = "screenrecord " + DEFAULT_OUTPUT_PATH; - recorderThread = new Thread(() -> { - try { - Runtime.getRuntime().exec(command); - } catch (IOException e) { - Log.e(TAG, "Error executing " + command, e); - } - }); - recorderThread.start(); - } - - @Override - public void stop() { - runShellCommand("killall -s 2 screenrecord"); - try { - recorderThread.join(); - } catch (InterruptedException e) { - // ignore - } - } - - @Override - public Path save(String testTag) { - try { - Path targetPath = Files.move(DEFAULT_OUTPUT_PATH, getPath(testTag), - REPLACE_EXISTING); - Log.i(TAG, "Video saved to " + targetPath.toString()); - return targetPath; - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/TraceMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/TraceMonitor.java deleted file mode 100644 index 1ba36bba92ef..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/TraceMonitor.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import static com.android.compatibility.common.util.SystemUtil.runShellCommand; - -import android.os.RemoteException; - -import androidx.annotation.VisibleForTesting; - -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Locale; - -/** - * Base class for monitors containing common logic to read the trace - * as a byte array and save the trace to another location. - */ -public abstract class TraceMonitor implements ITransitionMonitor { - public static final String TAG = "FLICKER"; - private static final String TRACE_DIR = "/data/misc/wmtrace/"; - - private Path mOutputDir; - public String mTraceFileName; - - public abstract boolean isEnabled() throws RemoteException; - - public TraceMonitor(String outputDir, String traceFileName) { - mOutputDir = Paths.get(outputDir); - mTraceFileName = traceFileName; - } - - /** - * Saves trace file to the external storage directory suffixing the name with the testtag - * and iteration. - * - * Moves the trace file from the default location via a shell command since the test app - * does not have security privileges to access /data/misc/wmtrace. - * - * @param testTag suffix added to trace name used to identify trace - * - * @return Path to saved trace file - */ - @Override - public Path save(String testTag) { - OUTPUT_DIR.toFile().mkdirs(); - Path traceFileCopy = getOutputTraceFilePath(testTag); - - // Read the input stream fully. - String copyCommand = String.format(Locale.getDefault(), "mv %s%s %s", TRACE_DIR, - mTraceFileName, traceFileCopy.toString()); - runShellCommand(copyCommand); - return traceFileCopy; - } - - @VisibleForTesting - public Path getOutputTraceFilePath(String testTag) { - return mOutputDir.resolve(mTraceFileName + "_" + testTag); - } -} diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java deleted file mode 100644 index 3f86f0d001d7..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import static android.view.FrameStats.UNDEFINED_TIME_NANO; - -import android.app.Instrumentation; -import android.util.Log; -import android.view.FrameStats; - -/** - * Monitors {@link android.view.WindowAnimationFrameStats} to detect janky frames. - * - * Adapted from {@link androidx.test.jank.internal.WindowAnimationFrameStatsMonitorImpl} - * using the same threshold to determine jank. - */ -public class WindowAnimationFrameStatsMonitor implements ITransitionMonitor { - - private static final String TAG = "FLICKER"; - // Maximum normalized error in frame duration before the frame is considered janky - private static final double MAX_ERROR = 0.5f; - // Maximum normalized frame duration before the frame is considered a pause - private static final double PAUSE_THRESHOLD = 15.0f; - private Instrumentation mInstrumentation; - private FrameStats stats; - private int numJankyFrames; - private long mLongestFrameNano = 0L; - - - /** - * Constructs a WindowAnimationFrameStatsMonitor instance. - */ - public WindowAnimationFrameStatsMonitor(Instrumentation instrumentation) { - mInstrumentation = instrumentation; - } - - private void analyze() { - int frameCount = stats.getFrameCount(); - long refreshPeriodNano = stats.getRefreshPeriodNano(); - - // Skip first frame - for (int i = 2; i < frameCount; i++) { - // Handle frames that have not been presented. - if (stats.getFramePresentedTimeNano(i) == UNDEFINED_TIME_NANO) { - // The animation must not have completed. Warn and break out of the loop. - Log.w(TAG, "Skipping fenced frame."); - break; - } - long frameDurationNano = stats.getFramePresentedTimeNano(i) - - stats.getFramePresentedTimeNano(i - 1); - double normalized = (double) frameDurationNano / refreshPeriodNano; - if (normalized < PAUSE_THRESHOLD) { - if (normalized > 1.0f + MAX_ERROR) { - numJankyFrames++; - } - mLongestFrameNano = Math.max(mLongestFrameNano, frameDurationNano); - } - } - } - - @Override - public void start() { - // Clear out any previous data - numJankyFrames = 0; - mLongestFrameNano = 0; - mInstrumentation.getUiAutomation().clearWindowAnimationFrameStats(); - } - - @Override - public void stop() { - stats = mInstrumentation.getUiAutomation().getWindowAnimationFrameStats(); - analyze(); - } - - public boolean jankyFramesDetected() { - return stats.getFrameCount() > 0 && numJankyFrames > 0; - } - - @Override - public String toString() { - return stats.toString() + - " RefreshPeriodNano:" + stats.getRefreshPeriodNano() + - " NumJankyFrames:" + numJankyFrames + - " LongestFrameNano:" + mLongestFrameNano; - } -}
\ No newline at end of file diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitor.java deleted file mode 100644 index 11de4aa86343..000000000000 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitor.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import android.os.RemoteException; -import android.view.IWindowManager; -import android.view.WindowManagerGlobal; - -/** - * Captures WindowManager trace from WindowManager. - */ -public class WindowManagerTraceMonitor extends TraceMonitor { - private IWindowManager mWm = WindowManagerGlobal.getWindowManagerService(); - - public WindowManagerTraceMonitor() { - this(OUTPUT_DIR.toString()); - } - - public WindowManagerTraceMonitor(String outputDir) { - super(outputDir, "wm_trace.pb"); - } - - @Override - public void start() { - try { - mWm.startWindowTrace(); - } catch (RemoteException e) { - throw new RuntimeException("Could not start trace", e); - } - } - - @Override - public void stop() { - try { - mWm.stopWindowTrace(); - } catch (RemoteException e) { - throw new RuntimeException("Could not stop trace", e); - } - } - - @Override - public boolean isEnabled() throws RemoteException{ - return mWm.isWindowTraceEnabled(); - } -} diff --git a/tests/FlickerTests/lib/test/AndroidManifest.xml b/tests/FlickerTests/lib/test/AndroidManifest.xml deleted file mode 100644 index 6451a5710821..000000000000 --- a/tests/FlickerTests/lib/test/AndroidManifest.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright 2018 Google Inc. All Rights Reserved. - --> - -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.server.wm.flicker"> - - <uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27"/> - <!-- Read and write traces from external storage --> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> - <!-- Capture screen contents --> - <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" /> - <!-- Run layers trace --> - <uses-permission android:name="android.permission.HARDWARE_TEST"/> - <application android:label="FlickerLibTest"> - <uses-library android:name="android.test.runner"/> - </application> - - <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" - android:targetPackage="com.android.server.wm.flicker" - android:label="WindowManager Flicker Lib Test"> - </instrumentation> - -</manifest>
\ No newline at end of file diff --git a/tests/FlickerTests/lib/test/AndroidTest.xml b/tests/FlickerTests/lib/test/AndroidTest.xml deleted file mode 100644 index e4cc298a2aa8..000000000000 --- a/tests/FlickerTests/lib/test/AndroidTest.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright 2018 Google Inc. All Rights Reserved. - --> -<configuration description="Config for WindowManager Flicker Tests"> - <target_preparer class="com.google.android.tradefed.targetprep.GoogleDeviceSetup"> - <!-- keeps the screen on during tests --> - <option name="screen-always-on" value="on" /> - <!-- prevents the phone from restarting --> - <option name="force-skip-system-props" value="true" /> - </target_preparer> - <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> - <option name="cleanup-apks" value="true"/> - <option name="test-file-name" value="FlickerLibTest.apk"/> - </target_preparer> - <test class="com.android.tradefed.testtype.AndroidJUnitTest"> - <option name="package" value="com.android.server.wm.flicker"/> - <option name="hidden-api-checks" value="false" /> - </test> -</configuration> diff --git a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_emptyregion.pb b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_emptyregion.pb Binary files differdeleted file mode 100644 index 98ee6f3ed269..000000000000 --- a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_emptyregion.pb +++ /dev/null diff --git a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_invalid_layer_visibility.pb b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_invalid_layer_visibility.pb Binary files differdeleted file mode 100644 index 20572d79d826..000000000000 --- a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_invalid_layer_visibility.pb +++ /dev/null diff --git a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_orphanlayers.pb b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_orphanlayers.pb Binary files differdeleted file mode 100644 index af4079707c69..000000000000 --- a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_orphanlayers.pb +++ /dev/null diff --git a/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome.pb b/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome.pb Binary files differdeleted file mode 100644 index b3f31706f55c..000000000000 --- a/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome.pb +++ /dev/null diff --git a/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome2.pb b/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome2.pb Binary files differdeleted file mode 100644 index b3b73ce0518a..000000000000 --- a/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome2.pb +++ /dev/null diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsCheckerTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsCheckerTest.java deleted file mode 100644 index 8e7fe1b4f942..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsCheckerTest.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.google.common.truth.Truth.assertThat; - -import com.android.server.wm.flicker.Assertions.Result; - -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; - -/** - * Contains {@link AssertionsChecker} tests. - * To run this test: {@code atest FlickerLibTest:AssertionsCheckerTest} - */ -public class AssertionsCheckerTest { - - /** - * Returns a list of SimpleEntry objects with {@code data} and incremental timestamps starting - * at 0. - */ - private static List<SimpleEntry> getTestEntries(int... data) { - List<SimpleEntry> entries = new ArrayList<>(); - for (int i = 0; i < data.length; i++) { - entries.add(new SimpleEntry(i, data[i])); - } - return entries; - } - - @Test - public void canCheckAllEntries() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.add(SimpleEntry::isData42, "isData42"); - - List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1)); - - assertThat(failures).hasSize(5); - } - - @Test - public void canCheckFirstEntry() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.checkFirstEntry(); - checker.add(SimpleEntry::isData42, "isData42"); - - List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1)); - - assertThat(failures).hasSize(1); - assertThat(failures.get(0).timestamp).isEqualTo(0); - } - - @Test - public void canCheckLastEntry() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.checkLastEntry(); - checker.add(SimpleEntry::isData42, "isData42"); - - List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1)); - - assertThat(failures).hasSize(1); - assertThat(failures.get(0).timestamp).isEqualTo(4); - } - - @Test - public void canCheckRangeOfEntries() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.filterByRange(1, 2); - checker.add(SimpleEntry::isData42, "isData42"); - - List<Result> failures = checker.test(getTestEntries(1, 42, 42, 1, 1)); - - assertThat(failures).hasSize(0); - } - - @Test - public void emptyRangePasses() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.filterByRange(9, 10); - checker.add(SimpleEntry::isData42, "isData42"); - - List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1)); - - assertThat(failures).isEmpty(); - } - - @Test - public void canCheckChangingAssertions() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.add(SimpleEntry::isData42, "isData42"); - checker.add(SimpleEntry::isData0, "isData0"); - checker.checkChangingAssertions(); - - List<Result> failures = checker.test(getTestEntries(42, 0, 0, 0, 0)); - - assertThat(failures).isEmpty(); - } - - @Test - public void canCheckChangingAssertions_withNoAssertions() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.checkChangingAssertions(); - - List<Result> failures = checker.test(getTestEntries(42, 0, 0, 0, 0)); - - assertThat(failures).isEmpty(); - } - - @Test - public void canCheckChangingAssertions_withSingleAssertion() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.add(SimpleEntry::isData42, "isData42"); - checker.checkChangingAssertions(); - - List<Result> failures = checker.test(getTestEntries(42, 42, 42, 42, 42)); - - assertThat(failures).isEmpty(); - } - - @Test - public void canFailCheckChangingAssertions_ifStartingAssertionFails() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.add(SimpleEntry::isData42, "isData42"); - checker.add(SimpleEntry::isData0, "isData0"); - checker.checkChangingAssertions(); - - List<Result> failures = checker.test(getTestEntries(0, 0, 0, 0, 0)); - - assertThat(failures).hasSize(1); - } - - @Test - public void canFailCheckChangingAssertions_ifStartingAssertionAlwaysPasses() { - AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>(); - checker.add(SimpleEntry::isData42, "isData42"); - checker.add(SimpleEntry::isData0, "isData0"); - checker.checkChangingAssertions(); - - List<Result> failures = checker.test(getTestEntries(0, 0, 0, 0, 0)); - - assertThat(failures).hasSize(1); - } - - static class SimpleEntry implements ITraceEntry { - long timestamp; - int data; - - SimpleEntry(long timestamp, int data) { - this.timestamp = timestamp; - this.data = data; - } - - @Override - public long getTimestamp() { - return timestamp; - } - - Result isData42() { - return new Result(this.data == 42, this.timestamp, "is42", ""); - } - - Result isData0() { - return new Result(this.data == 0, this.timestamp, "is42", ""); - } - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsTest.java deleted file mode 100644 index 7fd178ca6e51..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.google.common.truth.Truth.assertThat; - -import com.android.server.wm.flicker.Assertions.Result; - -import org.junit.Test; - -/** - * Contains {@link Assertions} tests. - * To run this test: {@code atest FlickerLibTest:AssertionsTest} - */ -public class AssertionsTest { - @Test - public void traceEntryAssertionCanNegateResult() { - Assertions.TraceAssertion<Integer> assertNumEquals42 = - getIntegerTraceEntryAssertion(); - - assertThat(assertNumEquals42.apply(1).success).isFalse(); - assertThat(assertNumEquals42.negate().apply(1).success).isTrue(); - - assertThat(assertNumEquals42.apply(42).success).isTrue(); - assertThat(assertNumEquals42.negate().apply(42).success).isFalse(); - } - - @Test - public void resultCanBeNegated() { - String reason = "Everything is fine!"; - Result result = new Result(true, 0, "TestAssert", reason); - Result negatedResult = result.negate(); - assertThat(negatedResult.success).isFalse(); - assertThat(negatedResult.reason).isEqualTo(reason); - assertThat(negatedResult.assertionName).isEqualTo("!TestAssert"); - } - - private Assertions.TraceAssertion<Integer> getIntegerTraceEntryAssertion() { - return (num) -> { - if (num == 42) { - return new Result(true, "Num equals 42"); - } - return new Result(false, "Num doesn't equal 42, actual:" + num); - }; - } -}
\ No newline at end of file diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceSubjectTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceSubjectTest.java deleted file mode 100644 index d06c5d76552b..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceSubjectTest.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.android.server.wm.flicker.LayersTraceSubject.assertThat; -import static com.android.server.wm.flicker.TestFileUtils.readTestFile; - -import static com.google.common.truth.Truth.assertWithMessage; - -import static org.junit.Assert.fail; - -import android.graphics.Rect; - -import org.junit.Test; - -import java.nio.file.Paths; - -/** - * Contains {@link LayersTraceSubject} tests. - * To run this test: {@code atest FlickerLibTest:LayersTraceSubjectTest} - */ -public class LayersTraceSubjectTest { - private static final Rect displayRect = new Rect(0, 0, 1440, 2880); - - private static LayersTrace readLayerTraceFromFile(String relativePath) { - try { - return LayersTrace.parseFrom(readTestFile(relativePath), Paths.get(relativePath)); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Test - public void testCanDetectEmptyRegionFromLayerTrace() { - LayersTrace layersTraceEntries = readLayerTraceFromFile("layers_trace_emptyregion.pb"); - try { - assertThat(layersTraceEntries).coversRegion(displayRect).forAllEntries(); - fail("Assertion passed"); - } catch (AssertionError e) { - assertWithMessage("Contains path to trace") - .that(e.getMessage()).contains("layers_trace_emptyregion.pb"); - assertWithMessage("Contains timestamp") - .that(e.getMessage()).contains("0h38m28s8ms"); - assertWithMessage("Contains assertion function") - .that(e.getMessage()).contains("coversRegion"); - assertWithMessage("Contains debug info") - .that(e.getMessage()).contains("Region to test: " + displayRect); - assertWithMessage("Contains debug info") - .that(e.getMessage()).contains("first empty point: 0, 99"); - } - } - - @Test - public void testCanDetectIncorrectVisibilityFromLayerTrace() { - LayersTrace layersTraceEntries = readLayerTraceFromFile( - "layers_trace_invalid_layer_visibility.pb"); - try { - assertThat(layersTraceEntries).showsLayer("com.android.server.wm.flicker.testapp") - .then().hidesLayer("com.android.server.wm.flicker.testapp").forAllEntries(); - fail("Assertion passed"); - } catch (AssertionError e) { - assertWithMessage("Contains path to trace") - .that(e.getMessage()).contains("layers_trace_invalid_layer_visibility.pb"); - assertWithMessage("Contains timestamp") - .that(e.getMessage()).contains("70h13m14s303ms"); - assertWithMessage("Contains assertion function") - .that(e.getMessage()).contains("!isVisible"); - assertWithMessage("Contains debug info") - .that(e.getMessage()).contains( - "com.android.server.wm.flicker.testapp/com.android.server.wm.flicker.testapp" - + ".SimpleActivity#0 is visible"); - } - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java deleted file mode 100644 index 7d77126fd7d4..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java +++ /dev/null @@ -1,230 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.android.server.wm.flicker.TestFileUtils.readTestFile; - -import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth.assertWithMessage; - -import static org.junit.Assert.fail; - -import android.content.Context; -import android.graphics.Point; -import android.graphics.Rect; -import android.view.WindowManager; - -import androidx.test.InstrumentationRegistry; - -import org.junit.Test; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * Contains {@link LayersTrace} tests. - * To run this test: {@code atest FlickerLibTest:LayersTraceTest} - */ -public class LayersTraceTest { - private static LayersTrace readLayerTraceFromFile(String relativePath) { - try { - return LayersTrace.parseFrom(readTestFile(relativePath)); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private static Rect getDisplayBounds() { - Point display = new Point(); - WindowManager wm = - (WindowManager) InstrumentationRegistry.getContext().getSystemService( - Context.WINDOW_SERVICE); - wm.getDefaultDisplay().getRealSize(display); - return new Rect(0, 0, display.x, display.y); - } - - @Test - public void canParseAllLayers() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - assertThat(trace.getEntries()).isNotEmpty(); - assertThat(trace.getEntries().get(0).getTimestamp()).isEqualTo(2307984557311L); - assertThat(trace.getEntries().get(trace.getEntries().size() - 1).getTimestamp()) - .isEqualTo(2308521813510L); - List<LayersTrace.Layer> flattenedLayers = trace.getEntries().get(0).asFlattenedLayers(); - String msg = "Layers:\n" + flattenedLayers.stream().map(layer -> layer.mProto.name) - .collect(Collectors.joining("\n\t")); - assertWithMessage(msg).that(flattenedLayers).hasSize(47); - } - - @Test - public void canParseVisibleLayers() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - assertThat(trace.getEntries()).isNotEmpty(); - assertThat(trace.getEntries().get(0).getTimestamp()).isEqualTo(2307984557311L); - assertThat(trace.getEntries().get(trace.getEntries().size() - 1).getTimestamp()) - .isEqualTo(2308521813510L); - List<LayersTrace.Layer> flattenedLayers = trace.getEntries().get(0).asFlattenedLayers(); - List<LayersTrace.Layer> visibleLayers = flattenedLayers.stream() - .filter(layer -> layer.isVisible() && !layer.isHiddenByParent()) - .collect(Collectors.toList()); - - String msg = "Visible Layers:\n" + visibleLayers.stream() - .map(layer -> layer.mProto.name) - .collect(Collectors.joining("\n\t")); - - assertWithMessage(msg).that(visibleLayers).hasSize(9); - } - - @Test - public void canParseLayerHierarchy() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - assertThat(trace.getEntries()).isNotEmpty(); - assertThat(trace.getEntries().get(0).getTimestamp()).isEqualTo(2307984557311L); - assertThat(trace.getEntries().get(trace.getEntries().size() - 1).getTimestamp()) - .isEqualTo(2308521813510L); - List<LayersTrace.Layer> layers = trace.getEntries().get(0).getRootLayers(); - assertThat(layers).hasSize(2); - assertThat(layers.get(0).mChildren).hasSize(layers.get(0).mProto.children.length); - assertThat(layers.get(1).mChildren).hasSize(layers.get(1).mProto.children.length); - } - - // b/76099859 - @Test - public void canDetectOrphanLayers() { - try { - readLayerTraceFromFile( - "layers_trace_orphanlayers.pb"); - fail("Failed to detect orphaned layers."); - } catch (RuntimeException exception) { - assertThat(exception.getMessage()).contains( - "Failed to parse layers trace. Found orphan layers " - + "with parent layer id:1006 : 49"); - } - } - - // b/75276931 - @Test - public void canDetectUncoveredRegion() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - LayersTrace.Entry entry = trace.getEntry(2308008331271L); - - Assertions.Result result = entry.coversRegion(getDisplayBounds()); - - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains("Region to test: Rect(0, 0 - 1440, 2880)"); - assertThat(result.reason).contains("first empty point: 0, 99"); - assertThat(result.reason).contains("visible regions:"); - assertWithMessage("Reason contains list of visible regions") - .that(result.reason).contains("StatusBar#0Rect(0, 0 - 1440, 98"); - } - - // Visible region tests - @Test - public void canTestLayerVisibleRegion_layerDoesNotExist() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - LayersTrace.Entry entry = trace.getEntry(2308008331271L); - - final Rect expectedVisibleRegion = new Rect(0, 0, 1, 1); - Assertions.Result result = entry.hasVisibleRegion("ImaginaryLayer", - expectedVisibleRegion); - - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains("Could not find ImaginaryLayer"); - } - - @Test - public void canTestLayerVisibleRegion_layerDoesNotHaveExpectedVisibleRegion() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - LayersTrace.Entry entry = trace.getEntry(2307993020072L); - - final Rect expectedVisibleRegion = new Rect(0, 0, 1, 1); - Assertions.Result result = entry.hasVisibleRegion("NexusLauncherActivity#2", - expectedVisibleRegion); - - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains( - "Layer com.google.android.apps.nexuslauncher/com.google.android.apps" - + ".nexuslauncher.NexusLauncherActivity#2 is invisible: activeBuffer=null" - + " type != ColorLayer flags=1 (FLAG_HIDDEN set) visible region is empty"); - } - - @Test - public void canTestLayerVisibleRegion_layerIsHiddenByParent() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - LayersTrace.Entry entry = trace.getEntry(2308455948035L); - - final Rect expectedVisibleRegion = new Rect(0, 0, 1, 1); - Assertions.Result result = entry.hasVisibleRegion( - "SurfaceView - com.android.chrome/com.google.android.apps.chrome.Main", - expectedVisibleRegion); - - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains( - "Layer SurfaceView - com.android.chrome/com.google.android.apps.chrome.Main#0 is " - + "hidden by parent: com.android.chrome/com.google.android.apps.chrome" - + ".Main#0"); - } - - @Test - public void canTestLayerVisibleRegion_incorrectRegionSize() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - LayersTrace.Entry entry = trace.getEntry(2308008331271L); - - final Rect expectedVisibleRegion = new Rect(0, 0, 1440, 99); - Assertions.Result result = entry.hasVisibleRegion( - "StatusBar", - expectedVisibleRegion); - - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains("StatusBar#0 has visible " - + "region:Rect(0, 0 - 1440, 98) expected:Rect(0, 0 - 1440, 99)"); - } - - @Test - public void canTestLayerVisibleRegion() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_emptyregion.pb"); - LayersTrace.Entry entry = trace.getEntry(2308008331271L); - - final Rect expectedVisibleRegion = new Rect(0, 0, 1440, 98); - Assertions.Result result = entry.hasVisibleRegion("StatusBar", expectedVisibleRegion); - - assertThat(result.passed()).isTrue(); - } - - @Test - public void canTestLayerVisibleRegion_layerIsNotVisible() { - LayersTrace trace = readLayerTraceFromFile( - "layers_trace_invalid_layer_visibility.pb"); - LayersTrace.Entry entry = trace.getEntry(252794268378458L); - - Assertions.Result result = entry.isVisible("com.android.server.wm.flicker.testapp"); - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains( - "Layer com.android.server.wm.flicker.testapp/com.android.server.wm.flicker" - + ".testapp.SimpleActivity#0 is invisible: type != ColorLayer visible " - + "region is empty"); - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java deleted file mode 100644 index c46175c1a977..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import android.content.Context; - -import androidx.test.InstrumentationRegistry; - -import com.google.common.io.ByteStreams; - -import java.io.InputStream; - -/** - * Helper functions for test file resources. - */ -class TestFileUtils { - static byte[] readTestFile(String relativePath) throws Exception { - Context context = InstrumentationRegistry.getContext(); - InputStream in = context.getResources().getAssets().open("testdata/" + relativePath); - return ByteStreams.toByteArray(in); - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TransitionRunnerTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TransitionRunnerTest.java deleted file mode 100644 index 9c5e2059a0e6..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TransitionRunnerTest.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; - -import android.os.Environment; - -import com.android.server.wm.flicker.TransitionRunner.TransitionBuilder; -import com.android.server.wm.flicker.TransitionRunner.TransitionResult; -import com.android.server.wm.flicker.monitor.LayersTraceMonitor; -import com.android.server.wm.flicker.monitor.ScreenRecorder; -import com.android.server.wm.flicker.monitor.WindowAnimationFrameStatsMonitor; -import com.android.server.wm.flicker.monitor.WindowManagerTraceMonitor; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.InOrder; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.io.IOException; -import java.nio.file.Paths; -import java.util.List; - -/** - * Contains {@link TransitionRunner} tests. - * {@code atest FlickerLibTest:TransitionRunnerTest} - */ -public class TransitionRunnerTest { - @Mock - private SimpleUiTransitions mTransitionsMock; - @Mock - private ScreenRecorder mScreenRecorderMock; - @Mock - private WindowManagerTraceMonitor mWindowManagerTraceMonitorMock; - @Mock - private LayersTraceMonitor mLayersTraceMonitorMock; - @Mock - private WindowAnimationFrameStatsMonitor mWindowAnimationFrameStatsMonitor; - @InjectMocks - private TransitionBuilder mTransitionBuilder; - - @Before - public void init() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void transitionsRunInOrder() { - TransitionRunner.newBuilder() - .runBeforeAll(mTransitionsMock::turnOnDevice) - .runBefore(mTransitionsMock::openApp) - .run(mTransitionsMock::performMagic) - .runAfter(mTransitionsMock::closeApp) - .runAfterAll(mTransitionsMock::cleanUpTracks) - .skipLayersTrace() - .skipWindowManagerTrace() - .build() - .run(); - - InOrder orderVerifier = inOrder(mTransitionsMock); - orderVerifier.verify(mTransitionsMock).turnOnDevice(); - orderVerifier.verify(mTransitionsMock).openApp(); - orderVerifier.verify(mTransitionsMock).performMagic(); - orderVerifier.verify(mTransitionsMock).closeApp(); - orderVerifier.verify(mTransitionsMock).cleanUpTracks(); - } - - @Test - public void canCombineTransitions() { - TransitionRunner.newBuilder() - .runBeforeAll(mTransitionsMock::turnOnDevice) - .runBeforeAll(mTransitionsMock::turnOnDevice) - .runBefore(mTransitionsMock::openApp) - .runBefore(mTransitionsMock::openApp) - .run(mTransitionsMock::performMagic) - .run(mTransitionsMock::performMagic) - .runAfter(mTransitionsMock::closeApp) - .runAfter(mTransitionsMock::closeApp) - .runAfterAll(mTransitionsMock::cleanUpTracks) - .runAfterAll(mTransitionsMock::cleanUpTracks) - .skipLayersTrace() - .skipWindowManagerTrace() - .build() - .run(); - - final int wantedNumberOfInvocations = 2; - verify(mTransitionsMock, times(wantedNumberOfInvocations)).turnOnDevice(); - verify(mTransitionsMock, times(wantedNumberOfInvocations)).openApp(); - verify(mTransitionsMock, times(wantedNumberOfInvocations)).performMagic(); - verify(mTransitionsMock, times(wantedNumberOfInvocations)).closeApp(); - verify(mTransitionsMock, times(wantedNumberOfInvocations)).cleanUpTracks(); - } - - @Test - public void emptyTransitionPasses() { - List<TransitionResult> results = TransitionRunner.newBuilder() - .skipLayersTrace() - .skipWindowManagerTrace() - .build() - .run() - .getResults(); - assertThat(results).hasSize(1); - assertThat(results.get(0).layersTraceExists()).isFalse(); - assertThat(results.get(0).windowManagerTraceExists()).isFalse(); - assertThat(results.get(0).screenCaptureVideoExists()).isFalse(); - } - - @Test - public void canRepeatTransitions() { - final int wantedNumberOfInvocations = 10; - TransitionRunner.newBuilder() - .runBeforeAll(mTransitionsMock::turnOnDevice) - .runBefore(mTransitionsMock::openApp) - .run(mTransitionsMock::performMagic) - .runAfter(mTransitionsMock::closeApp) - .runAfterAll(mTransitionsMock::cleanUpTracks) - .repeat(wantedNumberOfInvocations) - .skipLayersTrace() - .skipWindowManagerTrace() - .build() - .run(); - verify(mTransitionsMock).turnOnDevice(); - verify(mTransitionsMock, times(wantedNumberOfInvocations)).openApp(); - verify(mTransitionsMock, times(wantedNumberOfInvocations)).performMagic(); - verify(mTransitionsMock, times(wantedNumberOfInvocations)).closeApp(); - verify(mTransitionsMock).cleanUpTracks(); - } - - private void emptyTask() { - - } - - @Test - public void canCaptureWindowManagerTrace() { - mTransitionBuilder - .run(this::emptyTask) - .includeJankyRuns() - .skipLayersTrace() - .withTag("mCaptureWmTraceTransitionRunner") - .build().run(); - InOrder orderVerifier = inOrder(mWindowManagerTraceMonitorMock); - orderVerifier.verify(mWindowManagerTraceMonitorMock).start(); - orderVerifier.verify(mWindowManagerTraceMonitorMock).stop(); - orderVerifier.verify(mWindowManagerTraceMonitorMock) - .save("mCaptureWmTraceTransitionRunner", 0); - verifyNoMoreInteractions(mWindowManagerTraceMonitorMock); - } - - @Test - public void canCaptureLayersTrace() { - mTransitionBuilder - .run(this::emptyTask) - .includeJankyRuns() - .skipWindowManagerTrace() - .withTag("mCaptureLayersTraceTransitionRunner") - .build().run(); - InOrder orderVerifier = inOrder(mLayersTraceMonitorMock); - orderVerifier.verify(mLayersTraceMonitorMock).start(); - orderVerifier.verify(mLayersTraceMonitorMock).stop(); - orderVerifier.verify(mLayersTraceMonitorMock) - .save("mCaptureLayersTraceTransitionRunner", 0); - verifyNoMoreInteractions(mLayersTraceMonitorMock); - } - - @Test - public void canRecordEachRun() throws IOException { - mTransitionBuilder - .run(this::emptyTask) - .withTag("mRecordEachRun") - .recordEachRun() - .includeJankyRuns() - .skipLayersTrace() - .skipWindowManagerTrace() - .repeat(2) - .build().run(); - InOrder orderVerifier = inOrder(mScreenRecorderMock); - orderVerifier.verify(mScreenRecorderMock).start(); - orderVerifier.verify(mScreenRecorderMock).stop(); - orderVerifier.verify(mScreenRecorderMock).save("mRecordEachRun", 0); - orderVerifier.verify(mScreenRecorderMock).start(); - orderVerifier.verify(mScreenRecorderMock).stop(); - orderVerifier.verify(mScreenRecorderMock).save("mRecordEachRun", 1); - verifyNoMoreInteractions(mScreenRecorderMock); - } - - @Test - public void canRecordAllRuns() throws IOException { - doReturn(Paths.get(Environment.getExternalStorageDirectory().getAbsolutePath(), - "mRecordAllRuns.mp4")).when(mScreenRecorderMock).save("mRecordAllRuns"); - mTransitionBuilder - .run(this::emptyTask) - .recordAllRuns() - .includeJankyRuns() - .skipLayersTrace() - .skipWindowManagerTrace() - .withTag("mRecordAllRuns") - .repeat(2) - .build().run(); - InOrder orderVerifier = inOrder(mScreenRecorderMock); - orderVerifier.verify(mScreenRecorderMock).start(); - orderVerifier.verify(mScreenRecorderMock).stop(); - orderVerifier.verify(mScreenRecorderMock).save("mRecordAllRuns"); - verifyNoMoreInteractions(mScreenRecorderMock); - } - - @Test - public void canSkipJankyRuns() { - doReturn(false).doReturn(true).doReturn(false) - .when(mWindowAnimationFrameStatsMonitor).jankyFramesDetected(); - List<TransitionResult> results = mTransitionBuilder - .run(this::emptyTask) - .skipLayersTrace() - .skipWindowManagerTrace() - .repeat(3) - .build().run().getResults(); - assertThat(results).hasSize(2); - } - - public static class SimpleUiTransitions { - public void turnOnDevice() { - } - - public void openApp() { - } - - public void performMagic() { - } - - public void closeApp() { - } - - public void cleanUpTracks() { - } - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WindowManagerTraceTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WindowManagerTraceTest.java deleted file mode 100644 index 49278718932c..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WindowManagerTraceTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.android.server.wm.flicker.TestFileUtils.readTestFile; - -import static com.google.common.truth.Truth.assertThat; - -import com.android.server.wm.flicker.Assertions.Result; - -import org.junit.Before; -import org.junit.Test; - -/** - * Contains {@link WindowManagerTrace} tests. - * To run this test: {@code atest FlickerLibTest:WindowManagerTraceTest} - */ -public class WindowManagerTraceTest { - private WindowManagerTrace mTrace; - - private static WindowManagerTrace readWindowManagerTraceFromFile(String relativePath) { - try { - return WindowManagerTrace.parseFrom(readTestFile(relativePath)); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Before - public void setup() { - mTrace = readWindowManagerTraceFromFile("wm_trace_openchrome.pb"); - } - - @Test - public void canParseAllEntries() { - assertThat(mTrace.getEntries().get(0).getTimestamp()).isEqualTo(241777211939236L); - assertThat(mTrace.getEntries().get(mTrace.getEntries().size() - 1).getTimestamp()).isEqualTo - (241779809471942L); - } - - @Test - public void canDetectAboveAppWindowVisibility() { - WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L); - Result result = entry.isAboveAppWindowVisible("NavigationBar"); - assertThat(result.passed()).isTrue(); - } - - @Test - public void canDetectBelowAppWindowVisibility() { - WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L); - Result result = entry.isBelowAppWindowVisible("wallpaper"); - assertThat(result.passed()).isTrue(); - } - - @Test - public void canDetectAppWindowVisibility() { - WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L); - Result result = entry.isAppWindowVisible("com.google.android.apps.nexuslauncher"); - assertThat(result.passed()).isTrue(); - } - - @Test - public void canFailWithReasonForVisibilityChecks_windowNotFound() { - WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L); - Result result = entry.isAboveAppWindowVisible("ImaginaryWindow"); - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains("ImaginaryWindow cannot be found"); - } - - @Test - public void canFailWithReasonForVisibilityChecks_windowNotVisible() { - WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L); - Result result = entry.isAboveAppWindowVisible("AssistPreviewPanel"); - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains("AssistPreviewPanel is invisible"); - } - - @Test - public void canDetectAppZOrder() { - WindowManagerTrace.Entry entry = mTrace.getEntry(241778130296410L); - Result result = entry.isVisibleAppWindowOnTop("com.google.android.apps.chrome"); - assertThat(result.passed()).isTrue(); - } - - @Test - public void canFailWithReasonForZOrderChecks_windowNotOnTop() { - WindowManagerTrace.Entry entry = mTrace.getEntry(241778130296410L); - Result result = entry.isVisibleAppWindowOnTop("com.google.android.apps.nexuslauncher"); - assertThat(result.failed()).isTrue(); - assertThat(result.reason).contains("wanted=com.google.android.apps.nexuslauncher"); - assertThat(result.reason).contains("found=com.android.chrome/" - + "com.google.android.apps.chrome.Main"); - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WmTraceSubjectTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WmTraceSubjectTest.java deleted file mode 100644 index d547a188a663..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WmTraceSubjectTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import static com.android.server.wm.flicker.TestFileUtils.readTestFile; -import static com.android.server.wm.flicker.WmTraceSubject.assertThat; - -import org.junit.Test; - -/** - * Contains {@link WmTraceSubject} tests. - * To run this test: {@code atest FlickerLibTest:WmTraceSubjectTest} - */ -public class WmTraceSubjectTest { - private static WindowManagerTrace readWmTraceFromFile(String relativePath) { - try { - return WindowManagerTrace.parseFrom(readTestFile(relativePath)); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Test - public void testCanTransitionInAppWindow() { - WindowManagerTrace trace = readWmTraceFromFile("wm_trace_openchrome2.pb"); - - assertThat(trace).showsAppWindowOnTop("com.google.android.apps.nexuslauncher/" - + ".NexusLauncherActivity").forRange(174684850717208L, 174685957511016L); - assertThat(trace).showsAppWindowOnTop( - "com.google.android.apps.nexuslauncher/.NexusLauncherActivity") - .then() - .showsAppWindowOnTop("com.android.chrome") - .forAllEntries(); - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/LayersTraceMonitorTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/LayersTraceMonitorTest.java deleted file mode 100644 index dbd6761a05b0..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/LayersTraceMonitorTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import static android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto.MAGIC_NUMBER_H; -import static android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto.MAGIC_NUMBER_L; - -import static com.google.common.truth.Truth.assertThat; - -import android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto; - -import com.google.common.io.Files; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; - -/** - * Contains {@link LayersTraceMonitor} tests. - * To run this test: {@code atest FlickerLibTest:LayersTraceMonitorTest} - */ -public class LayersTraceMonitorTest { - private LayersTraceMonitor mLayersTraceMonitor; - - @Before - public void setup() { - mLayersTraceMonitor = new LayersTraceMonitor(); - } - - @After - public void teardown() { - mLayersTraceMonitor.stop(); - mLayersTraceMonitor.getOutputTraceFilePath("captureLayersTrace").toFile().delete(); - } - - @Test - public void canStartLayersTrace() throws Exception { - mLayersTraceMonitor.start(); - assertThat(mLayersTraceMonitor.isEnabled()).isTrue(); - } - - @Test - public void canStopLayersTrace() throws Exception { - mLayersTraceMonitor.start(); - assertThat(mLayersTraceMonitor.isEnabled()).isTrue(); - mLayersTraceMonitor.stop(); - assertThat(mLayersTraceMonitor.isEnabled()).isFalse(); - } - - @Test - public void captureLayersTrace() throws Exception { - mLayersTraceMonitor.start(); - mLayersTraceMonitor.stop(); - File testFile = mLayersTraceMonitor.save("captureLayersTrace").toFile(); - assertThat(testFile.exists()).isTrue(); - byte[] trace = Files.toByteArray(testFile); - assertThat(trace.length).isGreaterThan(0); - LayersTraceFileProto mLayerTraceFileProto = LayersTraceFileProto.parseFrom(trace); - assertThat(mLayerTraceFileProto.magicNumber).isEqualTo( - (long) MAGIC_NUMBER_H << 32 | MAGIC_NUMBER_L); - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/ScreenRecorderTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/ScreenRecorderTest.java deleted file mode 100644 index e73eecc348f0..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/ScreenRecorderTest.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import static android.os.SystemClock.sleep; - -import static com.android.server.wm.flicker.monitor.ScreenRecorder.DEFAULT_OUTPUT_PATH; -import static com.android.server.wm.flicker.monitor.ScreenRecorder.getPath; - -import static com.google.common.truth.Truth.assertThat; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; -import java.io.IOException; - -/** - * Contains {@link ScreenRecorder} tests. - * To run this test: {@code atest FlickerLibTest:ScreenRecorderTest} - */ -public class ScreenRecorderTest { - private static final String TEST_VIDEO_FILENAME = "test.mp4"; - private ScreenRecorder mScreenRecorder; - - @Before - public void setup() { - mScreenRecorder = new ScreenRecorder(); - } - - @After - public void teardown() { - DEFAULT_OUTPUT_PATH.toFile().delete(); - getPath(TEST_VIDEO_FILENAME).toFile().delete(); - } - - @Test - public void videoIsRecorded() { - mScreenRecorder.start(); - sleep(100); - mScreenRecorder.stop(); - File file = DEFAULT_OUTPUT_PATH.toFile(); - assertThat(file.exists()).isTrue(); - } - - @Test - public void videoCanBeSaved() { - mScreenRecorder.start(); - sleep(100); - mScreenRecorder.stop(); - mScreenRecorder.save(TEST_VIDEO_FILENAME); - File file = getPath(TEST_VIDEO_FILENAME).toFile(); - assertThat(file.exists()).isTrue(); - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java deleted file mode 100644 index f31238477e95..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import static com.android.server.wm.flicker.helpers.AutomationUtils.wakeUpAndGoToHomeScreen; - -import androidx.test.InstrumentationRegistry; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Contains {@link WindowAnimationFrameStatsMonitor} tests. - * To run this test: {@code atest FlickerLibTest:WindowAnimationFrameStatsMonitorTest} - */ -public class WindowAnimationFrameStatsMonitorTest { - private WindowAnimationFrameStatsMonitor mWindowAnimationFrameStatsMonitor; - - @Before - public void setup() { - mWindowAnimationFrameStatsMonitor = new WindowAnimationFrameStatsMonitor( - InstrumentationRegistry.getInstrumentation()); - wakeUpAndGoToHomeScreen(); - } - - // TODO(vishnun) - @Ignore("Disabled until app-helper libraries are available.") - @Test - public void captureWindowAnimationFrameStats() throws Exception { - mWindowAnimationFrameStatsMonitor.start(); - //AppHelperWrapper.getInstance().getHelper(CHROME).open(); - //AppHelperWrapper.getInstance().getHelper(CHROME).exit(); - mWindowAnimationFrameStatsMonitor.stop(); - } -} diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitorTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitorTest.java deleted file mode 100644 index 56284d7d516a..000000000000 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitorTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.monitor; - -import static com.android.server.wm.nano.WindowManagerTraceFileProto.MAGIC_NUMBER_H; -import static com.android.server.wm.nano.WindowManagerTraceFileProto.MAGIC_NUMBER_L; - -import static com.google.common.truth.Truth.assertThat; - -import com.android.server.wm.nano.WindowManagerTraceFileProto; - -import com.google.common.io.Files; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; - -/** - * Contains {@link WindowManagerTraceMonitor} tests. - * To run this test: {@code atest FlickerLibTest:WindowManagerTraceMonitorTest} - */ -public class WindowManagerTraceMonitorTest { - private WindowManagerTraceMonitor mWindowManagerTraceMonitor; - - @Before - public void setup() { - mWindowManagerTraceMonitor = new WindowManagerTraceMonitor(); - } - - @After - public void teardown() { - mWindowManagerTraceMonitor.stop(); - mWindowManagerTraceMonitor.getOutputTraceFilePath("captureWindowTrace").toFile().delete(); - } - - @Test - public void canStartWindowTrace() throws Exception { - mWindowManagerTraceMonitor.start(); - assertThat(mWindowManagerTraceMonitor.isEnabled()).isTrue(); - } - - @Test - public void canStopWindowTrace() throws Exception { - mWindowManagerTraceMonitor.start(); - assertThat(mWindowManagerTraceMonitor.isEnabled()).isTrue(); - mWindowManagerTraceMonitor.stop(); - assertThat(mWindowManagerTraceMonitor.isEnabled()).isFalse(); - } - - @Test - public void captureWindowTrace() throws Exception { - mWindowManagerTraceMonitor.start(); - mWindowManagerTraceMonitor.stop(); - File testFile = mWindowManagerTraceMonitor.save("captureWindowTrace").toFile(); - assertThat(testFile.exists()).isTrue(); - byte[] trace = Files.toByteArray(testFile); - assertThat(trace.length).isGreaterThan(0); - WindowManagerTraceFileProto mWindowTraceFileProto = WindowManagerTraceFileProto.parseFrom( - trace); - assertThat(mWindowTraceFileProto.magicNumber).isEqualTo( - (long) MAGIC_NUMBER_H << 32 | MAGIC_NUMBER_L); - } -} diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java index b6860cbd8d96..aa591d919cbe 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java @@ -29,11 +29,15 @@ import android.util.Log; import android.view.Surface; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.LargeTest; import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -44,18 +48,19 @@ import java.util.Collection; * Cycle through supported app rotations. * To run this test: {@code atest FlickerTest:ChangeAppRotationTest} */ -@RunWith(Parameterized.class) @LargeTest +@RunWith(Parameterized.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ChangeAppRotationTest extends FlickerTestBase { - private int beginRotation; - private int endRotation; + private int mBeginRotation; + private int mEndRotation; public ChangeAppRotationTest(String beginRotationName, String endRotationName, int beginRotation, int endRotation) { - this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), + this.mTestApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), "com.android.server.wm.flicker.testapp", "SimpleApp"); - this.beginRotation = beginRotation; - this.endRotation = endRotation; + this.mBeginRotation = beginRotation; + this.mEndRotation = endRotation; } @Parameters(name = "{0}-{1}") @@ -77,15 +82,19 @@ public class ChangeAppRotationTest extends FlickerTestBase { @Before public void runTransition() { super.runTransition( - changeAppRotation(testApp, uiDevice, beginRotation, endRotation).build()); + changeAppRotation(mTestApp, mUiDevice, mBeginRotation, mEndRotation).build()); } + @FlakyTest(bugId = 140855415) + @Ignore("Waiting bug feedback") @Test public void checkVisibility_navBarWindowIsAlwaysVisible() { checkResults(result -> assertThat(result) .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries()); } + @FlakyTest(bugId = 140855415) + @Ignore("Waiting bug feedback") @Test public void checkVisibility_statusBarWindowIsAlwaysVisible() { checkResults(result -> assertThat(result) @@ -94,8 +103,8 @@ public class ChangeAppRotationTest extends FlickerTestBase { @Test public void checkPosition_navBarLayerRotatesAndScales() { - Rect startingPos = getNavigationBarPosition(beginRotation); - Rect endingPos = getNavigationBarPosition(endRotation); + Rect startingPos = getNavigationBarPosition(mBeginRotation); + Rect endingPos = getNavigationBarPosition(mEndRotation); checkResults(result -> { LayersTraceSubject.assertThat(result) .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, startingPos) @@ -108,22 +117,22 @@ public class ChangeAppRotationTest extends FlickerTestBase { @Test public void checkPosition_appLayerRotates() { - Rect startingPos = getAppPosition(beginRotation); - Rect endingPos = getAppPosition(endRotation); + Rect startingPos = getAppPosition(mBeginRotation); + Rect endingPos = getAppPosition(mEndRotation); Log.e(TAG, "startingPos=" + startingPos + " endingPos=" + endingPos); checkResults(result -> { LayersTraceSubject.assertThat(result) - .hasVisibleRegion(testApp.getPackage(), startingPos).inTheBeginning(); + .hasVisibleRegion(mTestApp.getPackage(), startingPos).inTheBeginning(); LayersTraceSubject.assertThat(result) - .hasVisibleRegion(testApp.getPackage(), endingPos).atTheEnd(); + .hasVisibleRegion(mTestApp.getPackage(), endingPos).atTheEnd(); } ); } @Test public void checkPosition_statusBarLayerScales() { - Rect startingPos = getStatusBarPosition(beginRotation); - Rect endingPos = getStatusBarPosition(endRotation); + Rect startingPos = getStatusBarPosition(mBeginRotation); + Rect endingPos = getStatusBarPosition(mEndRotation); checkResults(result -> { LayersTraceSubject.assertThat(result) .hasVisibleRegion(STATUS_BAR_WINDOW_TITLE, startingPos) @@ -134,12 +143,16 @@ public class ChangeAppRotationTest extends FlickerTestBase { ); } + @FlakyTest(bugId = 140855415) + @Ignore("Waiting bug feedback") @Test public void checkVisibility_navBarLayerIsAlwaysVisible() { checkResults(result -> LayersTraceSubject.assertThat(result) .showsLayer(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries()); } + @FlakyTest(bugId = 140855415) + @Ignore("Waiting bug feedback") @Test public void checkVisibility_statusBarLayerIsAlwaysVisible() { checkResults(result -> LayersTraceSubject.assertThat(result) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java index 6590b86f1499..9deb97726542 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java @@ -26,8 +26,10 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test IME window closing back to app window transitions. @@ -35,6 +37,7 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CloseImeWindowToAppTest extends FlickerTestBase { private static final String IME_WINDOW_TITLE = "InputMethod"; @@ -44,7 +47,7 @@ public class CloseImeWindowToAppTest extends FlickerTestBase { @Before public void runTransition() { - super.runTransition(editTextLoseFocusToApp(uiDevice) + super.runTransition(editTextLoseFocusToApp(mUiDevice) .includeJankyRuns().build()); } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java index 4771b02000c0..cce5a2a7cc0d 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java @@ -26,8 +26,10 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test IME window closing to home transitions. @@ -35,6 +37,7 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CloseImeWindowToHomeTest extends FlickerTestBase { private static final String IME_WINDOW_TITLE = "InputMethod"; @@ -44,7 +47,7 @@ public class CloseImeWindowToHomeTest extends FlickerTestBase { @Before public void runTransition() { - super.runTransition(editTextLoseFocusToHome(uiDevice) + super.runTransition(editTextLoseFocusToHome(mUiDevice) .includeJankyRuns().build()); } 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 5cf2c1cd6827..1d44ea490f25 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java @@ -67,7 +67,7 @@ class CommonTransitions { device.setOrientationNatural(); } // Wait for animation to complete - sleep(3000); + sleep(1000); } catch (RemoteException e) { throw new RuntimeException(e); } @@ -216,10 +216,10 @@ class CommonTransitions { static TransitionBuilder resizeSplitScreen(IAppHelper testAppTop, IAppHelper testAppBottom, UiDevice device, Rational startRatio, Rational stopRatio) { - String testTag = "resizeSplitScreen_" + testAppTop.getLauncherName() + "_" + - testAppBottom.getLauncherName() + "_" + - startRatio.toString().replace("/", ":") + "_to_" + - stopRatio.toString().replace("/", ":"); + String testTag = "resizeSplitScreen_" + testAppTop.getLauncherName() + "_" + + testAppBottom.getLauncherName() + "_" + + startRatio.toString().replace("/", ":") + "_to_" + + stopRatio.toString().replace("/", ":"); return TransitionRunner.newBuilder() .withTag(testTag) .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen) @@ -231,7 +231,7 @@ class CommonTransitions { .runBefore(() -> launchSplitScreen(device)) .runBefore(() -> { UiObject2 snapshot = device.findObject( - By.res("com.google.android.apps.nexuslauncher", "snapshot")); + By.res(device.getLauncherPackageName(), "snapshot")); snapshot.click(); }) .runBefore(() -> AutomationUtils.resizeSplitScreen(device, startRatio)) @@ -316,4 +316,4 @@ class CommonTransitions { .runAfterAll(testApp::exit) .repeat(ITERATIONS); } -}
\ No newline at end of file +} diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java index 61cca0d6b53f..9836655bc013 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java @@ -22,17 +22,22 @@ import android.util.Rational; import android.view.Surface; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; +import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Tests to help debug individual transitions, capture video recordings and create test cases. */ +@LargeTest @Ignore("Used for debugging transitions used in FlickerTests.") @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DebugTest { private IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), "com.android.server.wm.flicker.testapp", "SimpleApp"); diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java b/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java index 8c9d6b4dc7a0..6e8e0c3c76c5 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java @@ -16,20 +16,23 @@ package com.android.server.wm.flicker; +import static androidx.test.InstrumentationRegistry.getInstrumentation; + import static com.android.server.wm.flicker.helpers.AutomationUtils.setDefaultWait; import static com.google.common.truth.Truth.assertWithMessage; +import android.os.Bundle; import android.platform.helpers.IAppHelper; +import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; import android.util.Log; -import androidx.test.InstrumentationRegistry; - import com.android.server.wm.flicker.TransitionRunner.TransitionResult; import org.junit.After; import org.junit.AfterClass; +import org.junit.Before; import java.util.HashMap; import java.util.List; @@ -51,10 +54,16 @@ public class FlickerTestBase { static final String DOCKED_STACK_DIVIDER = "DockedStackDivider"; private static HashMap<String, List<TransitionResult>> transitionResults = new HashMap<>(); - IAppHelper testApp; - UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); - private List<TransitionResult> results; - private TransitionResult lastResult = null; + IAppHelper mTestApp; + UiDevice mUiDevice; + private List<TransitionResult> mResults; + private TransitionResult mLastResult = null; + + @Before + public void setUp() { + InstrumentationRegistry.registerInstance(getInstrumentation(), new Bundle()); + mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); + } /** * Teardown any system settings and clean up test artifacts from the file system. @@ -91,14 +100,14 @@ public class FlickerTestBase { */ void runTransition(TransitionRunner transition) { if (transitionResults.containsKey(transition.getTestTag())) { - results = transitionResults.get(transition.getTestTag()); + mResults = transitionResults.get(transition.getTestTag()); return; } - results = transition.run().getResults(); + mResults = transition.run().getResults(); /* Fail if we don't have any results due to jank */ assertWithMessage("No results to test because all transition runs were invalid because " - + "of Jank").that(results).isNotEmpty(); - transitionResults.put(transition.getTestTag(), results); + + "of Jank").that(mResults).isNotEmpty(); + transitionResults.put(transition.getTestTag(), mResults); } /** @@ -106,11 +115,11 @@ public class FlickerTestBase { */ void checkResults(Consumer<TransitionResult> assertion) { - for (TransitionResult result : results) { - lastResult = result; + for (TransitionResult result : mResults) { + mLastResult = result; assertion.accept(result); } - lastResult = null; + mLastResult = null; } /** @@ -119,8 +128,8 @@ public class FlickerTestBase { */ @After public void markArtifactsForSaving() { - if (lastResult != null) { - lastResult.flagForSaving(); + if (mLastResult != null) { + mLastResult.flagForSaving(); } } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java index 7818c4e4ba50..8d99054d907e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java @@ -21,12 +21,16 @@ import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; import static com.android.server.wm.flicker.WmTraceSubject.assertThat; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test cold launch app from launcher. @@ -34,16 +38,17 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class OpenAppColdTest extends FlickerTestBase { public OpenAppColdTest() { - this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), + this.mTestApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), "com.android.server.wm.flicker.testapp", "SimpleApp"); } @Before public void runTransition() { - super.runTransition(getOpenAppCold(testApp, uiDevice).build()); + super.runTransition(getOpenAppCold(mTestApp, mUiDevice).build()); } @Test @@ -61,9 +66,9 @@ public class OpenAppColdTest extends FlickerTestBase { @Test public void checkVisibility_wallpaperWindowBecomesInvisible() { checkResults(result -> assertThat(result) - .showsBelowAppWindow("wallpaper") + .showsBelowAppWindow("Wallpaper") .then() - .hidesBelowAppWindow("wallpaper") + .hidesBelowAppWindow("Wallpaper") .forAllEntries()); } @@ -71,13 +76,15 @@ public class OpenAppColdTest extends FlickerTestBase { public void checkZOrder_appWindowReplacesLauncherAsTopWindow() { checkResults(result -> assertThat(result) .showsAppWindowOnTop( - "com.google.android.apps.nexuslauncher/.NexusLauncherActivity") + "com.android.launcher3/.Launcher") .then() - .showsAppWindowOnTop(testApp.getPackage()) + .showsAppWindowOnTop(mTestApp.getPackage()) .forAllEntries()); } @Test + @FlakyTest(bugId = 141235985) + @Ignore("Waiting bug feedback") public void checkCoveredRegion_noUncoveredRegions() { checkResults(result -> LayersTraceSubject.assertThat(result).coversRegion( getDisplayBounds()).forAllEntries()); @@ -98,9 +105,9 @@ public class OpenAppColdTest extends FlickerTestBase { @Test public void checkVisibility_wallpaperLayerBecomesInvisible() { checkResults(result -> LayersTraceSubject.assertThat(result) - .showsLayer("wallpaper") + .showsLayer("Wallpaper") .then() - .hidesLayer("wallpaper") + .hidesLayer("Wallpaper") .forAllEntries()); } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java index 63018ec1d9e7..f8b7938901a8 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java @@ -24,8 +24,10 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test open app to split screen. @@ -33,16 +35,17 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class OpenAppToSplitScreenTest extends FlickerTestBase { public OpenAppToSplitScreenTest() { - this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), + this.mTestApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), "com.android.server.wm.flicker.testapp", "SimpleApp"); } @Before public void runTransition() { - super.runTransition(appToSplitScreen(testApp, uiDevice).includeJankyRuns().build()); + super.runTransition(appToSplitScreen(mTestApp, mUiDevice).includeJankyRuns().build()); } @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java index 1aba93056c89..e8702c2dfa9f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java @@ -21,12 +21,16 @@ import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; import static com.android.server.wm.flicker.WmTraceSubject.assertThat; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test warm launch app. @@ -34,16 +38,17 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class OpenAppWarmTest extends FlickerTestBase { public OpenAppWarmTest() { - this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), + this.mTestApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), "com.android.server.wm.flicker.testapp", "SimpleApp"); } @Before public void runTransition() { - super.runTransition(openAppWarm(testApp, uiDevice).build()); + super.runTransition(openAppWarm(mTestApp, mUiDevice).includeJankyRuns().build()); } @Test @@ -61,9 +66,9 @@ public class OpenAppWarmTest extends FlickerTestBase { @Test public void checkVisibility_wallpaperBecomesInvisible() { checkResults(result -> assertThat(result) - .showsBelowAppWindow("wallpaper") + .showsBelowAppWindow("Wallpaper") .then() - .hidesBelowAppWindow("wallpaper") + .hidesBelowAppWindow("Wallpaper") .forAllEntries()); } @@ -71,12 +76,14 @@ public class OpenAppWarmTest extends FlickerTestBase { public void checkZOrder_appWindowReplacesLauncherAsTopWindow() { checkResults(result -> assertThat(result) .showsAppWindowOnTop( - "com.google.android.apps.nexuslauncher/.NexusLauncherActivity") + "com.android.launcher3/.Launcher") .then() - .showsAppWindowOnTop(testApp.getPackage()) + .showsAppWindowOnTop(mTestApp.getPackage()) .forAllEntries()); } + @FlakyTest(bugId = 141235985) + @Ignore("Waiting bug feedback") @Test public void checkCoveredRegion_noUncoveredRegions() { checkResults(result -> LayersTraceSubject.assertThat(result).coversRegion( @@ -98,9 +105,9 @@ public class OpenAppWarmTest extends FlickerTestBase { @Test public void checkVisibility_wallpaperLayerBecomesInvisible() { checkResults(result -> LayersTraceSubject.assertThat(result) - .showsLayer("wallpaper") + .showsLayer("Wallpaper") .then() - .hidesLayer("wallpaper") + .hidesLayer("Wallpaper") .forAllEntries()); } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java index a81fa8e6d123..9f5cfcedd38f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java @@ -23,8 +23,10 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test IME window opening transitions. @@ -32,13 +34,14 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class OpenImeWindowTest extends FlickerTestBase { private static final String IME_WINDOW_TITLE = "InputMethod"; @Before public void runTransition() { - super.runTransition(editTextSetFocus(uiDevice) + super.runTransition(editTextSetFocus(mUiDevice) .includeJankyRuns().build()); } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java index 50dba81e53b7..1031baf7ec04 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java @@ -28,12 +28,16 @@ import android.platform.helpers.IAppHelper; import android.util.Rational; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test split screen resizing window transitions. @@ -41,10 +45,13 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@FlakyTest(bugId = 140856143) +@Ignore("Waiting bug feedback") public class ResizeSplitScreenTest extends FlickerTestBase { public ResizeSplitScreenTest() { - this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), + this.mTestApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), "com.android.server.wm.flicker.testapp", "SimpleApp"); } @@ -53,7 +60,7 @@ public class ResizeSplitScreenTest extends FlickerTestBase { IAppHelper bottomApp = new StandardAppHelper(InstrumentationRegistry .getInstrumentation(), "com.android.server.wm.flicker.testapp", "ImeApp"); - super.runTransition(resizeSplitScreen(testApp, bottomApp, uiDevice, new Rational(1, 3), + super.runTransition(resizeSplitScreen(mTestApp, bottomApp, mUiDevice, new Rational(1, 3), new Rational(2, 3)).includeJankyRuns().build()); } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java index 117ac5a8fadf..ae55a75d7e67 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java @@ -33,8 +33,10 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.LargeTest; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -47,6 +49,7 @@ import java.util.Collection; */ @LargeTest @RunWith(Parameterized.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SeamlessAppRotationTest extends FlickerTestBase { private int mBeginRotation; private int mEndRotation; @@ -105,7 +108,7 @@ public class SeamlessAppRotationTest extends FlickerTestBase { super.runTransition( changeAppRotation(mIntent, intentId, InstrumentationRegistry.getContext(), - uiDevice, mBeginRotation, mEndRotation).repeat(5).build()); + mUiDevice, mBeginRotation, mEndRotation).repeat(5).build()); } @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java index 1d30df9750b2..85a14941a7fd 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java @@ -25,8 +25,11 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; /** * Test open app to split screen. @@ -34,16 +37,19 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@FlakyTest(bugId = 140856143) +@Ignore("Waiting bug feedback") public class SplitScreenToLauncherTest extends FlickerTestBase { public SplitScreenToLauncherTest() { - this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), + this.mTestApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(), "com.android.server.wm.flicker.testapp", "SimpleApp"); } @Before public void runTransition() { - super.runTransition(splitScreenToLauncher(testApp, uiDevice).includeJankyRuns().build()); + super.runTransition(splitScreenToLauncher(mTestApp, mUiDevice).includeJankyRuns().build()); } @Test @@ -62,13 +68,12 @@ public class SplitScreenToLauncherTest extends FlickerTestBase { .forAllEntries()); } - @FlakyTest(bugId = 79686616) @Test public void checkVisibility_appLayerBecomesInVisible() { checkResults(result -> LayersTraceSubject.assertThat(result) - .showsLayer(testApp.getPackage()) + .showsLayer(mTestApp.getPackage()) .then() - .hidesLayer(testApp.getPackage()) + .hidesLayer(mTestApp.getPackage()) .forAllEntries()); } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/StandardAppHelper.java b/tests/FlickerTests/src/com/android/server/wm/flicker/StandardAppHelper.java deleted file mode 100644 index 79a0220e0e87..000000000000 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/StandardAppHelper.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker; - -import android.app.Instrumentation; -import android.platform.helpers.AbstractStandardAppHelper; - -/** - * Class to take advantage of {@code IAppHelper} interface so the same test can be run against - * first party and third party apps. - */ -public class StandardAppHelper extends AbstractStandardAppHelper { - private final String mPackageName; - private final String mLauncherName; - - public StandardAppHelper(Instrumentation instr, String packageName, String launcherName) { - super(instr); - mPackageName = packageName; - mLauncherName = launcherName; - } - - /** - * {@inheritDoc} - */ - @Override - public String getPackage() { - return mPackageName; - } - - /** - * {@inheritDoc} - */ - @Override - public String getLauncherName() { - return mLauncherName; - } - - /** - * {@inheritDoc} - */ - @Override - public void dismissInitialDialogs() { - - } -} diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SeamlessRotationActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SeamlessRotationActivity.java index 3a0c1c9382fe..5cf81cb90fbc 100644 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SeamlessRotationActivity.java +++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SeamlessRotationActivity.java @@ -17,7 +17,6 @@ package com.android.server.wm.flicker.testapp; import static android.os.SystemClock.sleep; -import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; import static com.android.server.wm.flicker.testapp.ActivityOptions.EXTRA_STARVE_UI_THREAD; @@ -39,8 +38,8 @@ public class SeamlessRotationActivity extends Activity { super.onCreate(savedInstanceState); enableSeamlessRotation(); setContentView(R.layout.activity_simple); - boolean starveUiThread = getIntent().getExtras() != null && - getIntent().getExtras().getBoolean(EXTRA_STARVE_UI_THREAD); + boolean starveUiThread = getIntent().getExtras() != null + && getIntent().getExtras().getBoolean(EXTRA_STARVE_UI_THREAD); if (starveUiThread) { starveUiThread(); } diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java index 79f5095010e8..06b58fda5b7d 100644 --- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java +++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java @@ -626,11 +626,40 @@ public class PackageWatchdogTest { // Verify that health check is failed assertThat(observer.mMitigatedPackages).containsExactly(APP_A); - // Then clear failed packages and start observing a random package so requests are synced - // and PackageWatchdog#onSupportedPackages is called and APP_A has a chance to fail again - // this time due to package expiry. + // Clear failed packages and forward time to expire the observation duration observer.mMitigatedPackages.clear(); - watchdog.startObservingHealth(observer, Arrays.asList(APP_B), LONG_DURATION); + moveTimeForwardAndDispatch(LONG_DURATION); + + // Verify that health check failure is not notified again + assertThat(observer.mMitigatedPackages).isEmpty(); + } + + /** + * Tests failure when health check duration is different from package observation duration + * Failure is also notified only once. + */ + @Test + public void testExplicitHealthCheckFailureAfterExpiry() { + TestController controller = new TestController(); + PackageWatchdog watchdog = createWatchdog(controller, true /* withPackagesReady */); + TestObserver observer = new TestObserver(OBSERVER_NAME_1, + PackageHealthObserverImpact.USER_IMPACT_MEDIUM); + + // Start observing with explicit health checks for APP_A and + // package observation duration == SHORT_DURATION / 2 + // health check duration == SHORT_DURATION (set by default in the TestController) + controller.setSupportedPackages(Arrays.asList(APP_A)); + watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION / 2); + + // Forward time to expire the observation duration + moveTimeForwardAndDispatch(SHORT_DURATION / 2); + + // Verify that health check is failed + assertThat(observer.mMitigatedPackages).containsExactly(APP_A); + + // Clear failed packages and forward time to expire the health check duration + observer.mMitigatedPackages.clear(); + moveTimeForwardAndDispatch(SHORT_DURATION); // Verify that health check failure is not notified again assertThat(observer.mMitigatedPackages).isEmpty(); diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index f2f258a737e3..9e21db76be84 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -504,6 +504,8 @@ public class ConnectivityServiceTest { // Waits for the NetworkAgent to be registered, which includes the creation of the // NetworkMonitor. waitForIdle(TIMEOUT_MS); + HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS); + HandlerUtilsKt.waitForIdle(ConnectivityThread.get(), TIMEOUT_MS); } @Override @@ -4315,16 +4317,16 @@ public class ConnectivityServiceTest { assertFalse(mCm.isNetworkSupported(TYPE_NONE)); assertThrows(IllegalArgumentException.class, - () -> { mCm.networkCapabilitiesForType(TYPE_NONE); }); + () -> mCm.networkCapabilitiesForType(TYPE_NONE)); Class<UnsupportedOperationException> unsupported = UnsupportedOperationException.class; - assertThrows(unsupported, () -> { mCm.startUsingNetworkFeature(TYPE_WIFI, ""); }); - assertThrows(unsupported, () -> { mCm.stopUsingNetworkFeature(TYPE_WIFI, ""); }); + assertThrows(unsupported, () -> mCm.startUsingNetworkFeature(TYPE_WIFI, "")); + assertThrows(unsupported, () -> mCm.stopUsingNetworkFeature(TYPE_WIFI, "")); // TODO: let test context have configuration application target sdk version // and test that pre-M requesting for TYPE_NONE sends back APN_REQUEST_FAILED - assertThrows(unsupported, () -> { mCm.startUsingNetworkFeature(TYPE_NONE, ""); }); - assertThrows(unsupported, () -> { mCm.stopUsingNetworkFeature(TYPE_NONE, ""); }); - assertThrows(unsupported, () -> { mCm.requestRouteToHostAddress(TYPE_NONE, null); }); + assertThrows(unsupported, () -> mCm.startUsingNetworkFeature(TYPE_NONE, "")); + assertThrows(unsupported, () -> mCm.stopUsingNetworkFeature(TYPE_NONE, "")); + assertThrows(unsupported, () -> mCm.requestRouteToHostAddress(TYPE_NONE, null)); } @Test diff --git a/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt b/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt index 5c921612df45..2e48d97d6349 100644 --- a/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt +++ b/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt @@ -27,8 +27,9 @@ object CodeUtils { * Returns a stable hash of a string. * We reimplement String::hashCode() for readability reasons. */ - fun hash(str: String, level: LogLevel): Int { - return (level.name + str).map { c -> c.toInt() }.reduce { h, c -> h * 31 + c } + fun hash(position: String, messageString: String, logLevel: LogLevel, logGroup: LogGroup): Int { + return (position + messageString + logLevel.name + logGroup.name) + .map { c -> c.toInt() }.reduce { h, c -> h * 31 + c } } fun isWildcardStaticImported(code: CompilationUnit, className: String): Boolean { @@ -71,4 +72,10 @@ object CodeUtils { "or concatenation of string literals.", expr) } } + + fun getPositionString(fileName: String): String { + return when { + else -> fileName + } + } } diff --git a/tools/protologtool/src/com/android/protolog/tool/Constants.kt b/tools/protologtool/src/com/android/protolog/tool/Constants.kt index 83b3c00ebc28..aa3e00f2f4db 100644 --- a/tools/protologtool/src/com/android/protolog/tool/Constants.kt +++ b/tools/protologtool/src/com/android/protolog/tool/Constants.kt @@ -19,6 +19,6 @@ package com.android.protolog.tool object Constants { const val NAME = "protologtool" const val VERSION = "1.0.0" - const val IS_LOG_TO_ANY_METHOD = "isLogToAny" + const val IS_ENABLED_METHOD = "isEnabled" const val ENUM_VALUES_METHOD = "values" } diff --git a/tools/protologtool/src/com/android/protolog/tool/ProtoLogTool.kt b/tools/protologtool/src/com/android/protolog/tool/ProtoLogTool.kt index 9678ec3a02ba..53834a69ef9f 100644 --- a/tools/protologtool/src/com/android/protolog/tool/ProtoLogTool.kt +++ b/tools/protologtool/src/com/android/protolog/tool/ProtoLogTool.kt @@ -49,14 +49,14 @@ object ProtoLogTool { val file = File(path) val text = file.readText() val code = StaticJavaParser.parse(text) + val pack = if (code.packageDeclaration.isPresent) code.packageDeclaration + .get().nameAsString else "" + val newPath = pack.replace('.', '/') + '/' + file.name val outSrc = when { containsProtoLogText(text, command.protoLogClassNameArg) -> - transformer.processClass(text, code) + transformer.processClass(text, newPath, code) else -> text } - val pack = if (code.packageDeclaration.isPresent) code.packageDeclaration - .get().nameAsString else "" - val newPath = pack.replace('.', '/') + '/' + file.name outJar.putNextEntry(ZipEntry(newPath)) outJar.write(outSrc.toByteArray()) outJar.closeEntry() @@ -76,7 +76,11 @@ object ProtoLogTool { val file = File(path) val text = file.readText() if (containsProtoLogText(text, command.protoLogClassNameArg)) { - builder.processClass(StaticJavaParser.parse(text)) + val code = StaticJavaParser.parse(text) + val pack = if (code.packageDeclaration.isPresent) code.packageDeclaration + .get().nameAsString else "" + val newPath = pack.replace('.', '/') + '/' + file.name + builder.processClass(code, newPath) } } val out = FileOutputStream(command.viewerConfigJsonArg) diff --git a/tools/protologtool/src/com/android/protolog/tool/SourceTransformer.kt b/tools/protologtool/src/com/android/protolog/tool/SourceTransformer.kt index c3920780b22a..c2964a3dad7e 100644 --- a/tools/protologtool/src/com/android/protolog/tool/SourceTransformer.kt +++ b/tools/protologtool/src/com/android/protolog/tool/SourceTransformer.kt @@ -16,7 +16,7 @@ package com.android.protolog.tool -import com.android.protolog.tool.Constants.IS_LOG_TO_ANY_METHOD +import com.android.protolog.tool.Constants.IS_ENABLED_METHOD import com.android.server.protolog.common.LogDataType import com.github.javaparser.StaticJavaParser import com.github.javaparser.ast.CompilationUnit @@ -73,7 +73,8 @@ class SourceTransformer( } val ifStmt: IfStmt if (group.enabled) { - val hash = CodeUtils.hash(messageString, level) + val position = CodeUtils.getPositionString(fileName) + val hash = CodeUtils.hash(position, messageString, level, group) val newCall = call.clone() if (!group.textEnabled) { // Remove message string if text logging is not enabled by default. @@ -90,12 +91,12 @@ class SourceTransformer( // Out: ProtoLog.e(GROUP, 1234, 0, null, arg) newCall.arguments.add(2, IntegerLiteralExpr(typeMask)) // Replace call to a stub method with an actual implementation. - // Out: com.android.server.wm.ProtoLogImpl.e(GROUP, 1234, null, arg) + // Out: com.android.server.protolog.ProtoLogImpl.e(GROUP, 1234, null, arg) newCall.setScope(protoLogImplClassNode) - // Create a call to GROUP.isLogAny() - // Out: GROUP.isLogAny() - val isLogAnyExpr = MethodCallExpr(newCall.arguments[0].clone(), - SimpleName(IS_LOG_TO_ANY_METHOD)) + // Create a call to ProtoLogImpl.isEnabled(GROUP) + // Out: com.android.server.protolog.ProtoLogImpl.isEnabled(GROUP) + val isLogEnabled = MethodCallExpr(protoLogImplClassNode, IS_ENABLED_METHOD, + NodeList<Expression>(newCall.arguments[0].clone())) if (argTypes.size != call.arguments.size - 2) { throw InvalidProtoLogCallException( "Number of arguments does not mach format string", call) @@ -120,11 +121,11 @@ class SourceTransformer( } blockStmt.addStatement(ExpressionStmt(newCall)) // Create an IF-statement with the previously created condition. - // Out: if (GROUP.isLogAny()) { + // Out: if (com.android.server.protolog.ProtoLogImpl.isEnabled(GROUP)) { // long protoLogParam0 = arg; - // com.android.server.wm.ProtoLogImpl.e(GROUP, 1234, 0, null, protoLogParam0); + // com.android.server.protolog.ProtoLogImpl.e(GROUP, 1234, 0, null, protoLogParam0); // } - ifStmt = IfStmt(isLogAnyExpr, blockStmt, null) + ifStmt = IfStmt(isLogEnabled, blockStmt, null) } else { // Surround with if (false). val newCall = parentStmt.clone() @@ -212,12 +213,15 @@ class SourceTransformer( StaticJavaParser.parseExpression<FieldAccessExpr>(protoLogImplClassName) private var processedCode: MutableList<String> = mutableListOf() private var offsets: IntArray = IntArray(0) + private var fileName: String = "" fun processClass( code: String, + path: String, compilationUnit: CompilationUnit = StaticJavaParser.parse(code) ): String { + fileName = path processedCode = code.split('\n').toMutableList() offsets = IntArray(processedCode.size) LexicalPreservingPrinter.setup(compilationUnit) diff --git a/tools/protologtool/src/com/android/protolog/tool/ViewerConfigBuilder.kt b/tools/protologtool/src/com/android/protolog/tool/ViewerConfigBuilder.kt index a75b5c9bbe4b..172de0e9d4d0 100644 --- a/tools/protologtool/src/com/android/protolog/tool/ViewerConfigBuilder.kt +++ b/tools/protologtool/src/com/android/protolog/tool/ViewerConfigBuilder.kt @@ -32,24 +32,28 @@ class ViewerConfigBuilder( group: LogGroup ) { if (group.enabled) { - val key = CodeUtils.hash(messageString, level) + val position = CodeUtils.getPositionString(fileName) + val key = CodeUtils.hash(position, messageString, level, group) if (statements.containsKey(key)) { - if (statements[key] != Triple(messageString, level, group)) { + if (statements[key] != LogCall(messageString, level, group, position)) { throw HashCollisionException( "Please modify the log message \"$messageString\" " + "or \"${statements[key]}\" - their hashes are equal.") } } else { groups.add(group) - statements[key] = Triple(messageString, level, group) + statements[key] = LogCall(messageString, level, group, position) + call.range.isPresent } } } - private val statements: MutableMap<Int, Triple<String, LogLevel, LogGroup>> = mutableMapOf() + private val statements: MutableMap<Int, LogCall> = mutableMapOf() private val groups: MutableSet<LogGroup> = mutableSetOf() + private var fileName: String = "" - fun processClass(unit: CompilationUnit) { + fun processClass(unit: CompilationUnit, fileName: String) { + this.fileName = fileName protoLogCallVisitor.process(unit, this) } @@ -66,11 +70,13 @@ class ViewerConfigBuilder( writer.name(key.toString()) writer.beginObject() writer.name("message") - writer.value(value.first) + writer.value(value.messageString) writer.name("level") - writer.value(value.second.name) + writer.value(value.logLevel.name) writer.name("group") - writer.value(value.third.name) + writer.value(value.logGroup.name) + writer.name("at") + writer.value(value.position) writer.endObject() } writer.endObject() @@ -88,4 +94,11 @@ class ViewerConfigBuilder( stringWriter.buffer.append('\n') return stringWriter.toString() } + + data class LogCall( + val messageString: String, + val logLevel: LogLevel, + val logGroup: LogGroup, + val position: String + ) } diff --git a/tools/protologtool/tests/com/android/protolog/tool/CodeUtilsTest.kt b/tools/protologtool/tests/com/android/protolog/tool/CodeUtilsTest.kt index 337ed995891c..0acbc9074857 100644 --- a/tools/protologtool/tests/com/android/protolog/tool/CodeUtilsTest.kt +++ b/tools/protologtool/tests/com/android/protolog/tool/CodeUtilsTest.kt @@ -27,17 +27,32 @@ import org.junit.Test class CodeUtilsTest { @Test fun hash() { - assertEquals(-1704685243, CodeUtils.hash("test", LogLevel.DEBUG)) + assertEquals(-1259556708, CodeUtils.hash("Test.java:50", "test", + LogLevel.DEBUG, LogGroup("test", true, true, "TAG"))) + } + + @Test + fun hash_changeLocation() { + assertEquals(15793504, CodeUtils.hash("Test.java:10", "test2", + LogLevel.DEBUG, LogGroup("test", true, true, "TAG"))) } @Test fun hash_changeLevel() { - assertEquals(-1176900998, CodeUtils.hash("test", LogLevel.ERROR)) + assertEquals(-731772463, CodeUtils.hash("Test.java:50", "test", + LogLevel.ERROR, LogGroup("test", true, true, "TAG"))) } @Test fun hash_changeMessage() { - assertEquals(-1305634931, CodeUtils.hash("test2", LogLevel.DEBUG)) + assertEquals(-2026343204, CodeUtils.hash("Test.java:50", "test2", + LogLevel.DEBUG, LogGroup("test", true, true, "TAG"))) + } + + @Test + fun hash_changeGroup() { + assertEquals(1607870166, CodeUtils.hash("Test.java:50", "test2", + LogLevel.DEBUG, LogGroup("test2", true, true, "TAG"))) } @Test diff --git a/tools/protologtool/tests/com/android/protolog/tool/SourceTransformerTest.kt b/tools/protologtool/tests/com/android/protolog/tool/SourceTransformerTest.kt index d6e4a36dc3da..18504b684006 100644 --- a/tools/protologtool/tests/com/android/protolog/tool/SourceTransformerTest.kt +++ b/tools/protologtool/tests/com/android/protolog/tool/SourceTransformerTest.kt @@ -78,7 +78,7 @@ class SourceTransformerTest { class Test { void test() { - if (TEST_GROUP.isLogToAny()) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 835524026, 9, "test %d %f", protoLogParam0, protoLogParam1); } + if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); } } } """.trimIndent() @@ -88,7 +88,7 @@ class SourceTransformerTest { class Test { void test() { - if (TEST_GROUP.isLogToAny()) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, -986393606, 9, "test %d %f " + "abc %s\n test", protoLogParam0, protoLogParam1, protoLogParam2); + if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, 1780316587, 9, "test %d %f " + "abc %s\n test", protoLogParam0, protoLogParam1, protoLogParam2); } } @@ -100,8 +100,8 @@ class SourceTransformerTest { class Test { void test() { - if (TEST_GROUP.isLogToAny()) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 835524026, 9, "test %d %f", protoLogParam0, protoLogParam1); } /* ProtoLog.w(TEST_GROUP, "test %d %f", 100, 0.1); */ if (TEST_GROUP.isLogToAny()) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 835524026, 9, "test %d %f", protoLogParam0, protoLogParam1); } - if (TEST_GROUP.isLogToAny()) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 835524026, 9, "test %d %f", protoLogParam0, protoLogParam1); } + if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); } /* ProtoLog.w(TEST_GROUP, "test %d %f", 100, 0.1); */ if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); } + if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); } } } """.trimIndent() @@ -111,7 +111,7 @@ class SourceTransformerTest { class Test { void test() { - if (TEST_GROUP.isLogToAny()) { org.example.ProtoLogImpl.w(TEST_GROUP, 1282022424, 0, "test", (Object[]) null); } + if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { org.example.ProtoLogImpl.w(TEST_GROUP, -1741986185, 0, "test", (Object[]) null); } } } """.trimIndent() @@ -121,7 +121,7 @@ class SourceTransformerTest { class Test { void test() { - if (TEST_GROUP.isLogToAny()) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 835524026, 9, null, protoLogParam0, protoLogParam1); } + if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, null, protoLogParam0, protoLogParam1); } } } """.trimIndent() @@ -131,7 +131,7 @@ class SourceTransformerTest { class Test { void test() { - if (TEST_GROUP.isLogToAny()) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, -986393606, 9, null, protoLogParam0, protoLogParam1, protoLogParam2); + if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, 1780316587, 9, null, protoLogParam0, protoLogParam1, protoLogParam2); } } @@ -160,10 +160,13 @@ class SourceTransformerTest { } """.trimIndent() /* ktlint-enable max-line-length */ + + private const val PATH = "com.example.Test.java" } private val processor: ProtoLogCallProcessor = Mockito.mock(ProtoLogCallProcessor::class.java) - private val sourceJarWriter = SourceTransformer("org.example.ProtoLogImpl", processor) + private val implPath = "org.example.ProtoLogImpl" + private val sourceJarWriter = SourceTransformer(implPath, processor) private fun <T> any(type: Class<T>): T = Mockito.any<T>(type) @@ -181,13 +184,13 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE, code) + val out = sourceJarWriter.processClass(TEST_CODE, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) assertEquals(1, ifStmts.size) val ifStmt = ifStmts[0] - assertEquals("TEST_GROUP.${Constants.IS_LOG_TO_ANY_METHOD}()", + assertEquals("$implPath.${Constants.IS_ENABLED_METHOD}(TEST_GROUP)", ifStmt.condition.toString()) assertFalse(ifStmt.elseStmt.isPresent) assertEquals(3, ifStmt.thenStmt.childNodes.size) @@ -196,7 +199,7 @@ class SourceTransformerTest { assertEquals("w", methodCall.name.asString()) assertEquals(6, methodCall.arguments.size) assertEquals("TEST_GROUP", methodCall.arguments[0].toString()) - assertEquals("835524026", methodCall.arguments[1].toString()) + assertEquals("1698911065", methodCall.arguments[1].toString()) assertEquals(0b1001.toString(), methodCall.arguments[2].toString()) assertEquals("\"test %d %f\"", methodCall.arguments[3].toString()) assertEquals("protoLogParam0", methodCall.arguments[4].toString()) @@ -223,13 +226,13 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE_MULTICALLS, code) + val out = sourceJarWriter.processClass(TEST_CODE_MULTICALLS, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) assertEquals(3, ifStmts.size) val ifStmt = ifStmts[1] - assertEquals("TEST_GROUP.${Constants.IS_LOG_TO_ANY_METHOD}()", + assertEquals("$implPath.${Constants.IS_ENABLED_METHOD}(TEST_GROUP)", ifStmt.condition.toString()) assertFalse(ifStmt.elseStmt.isPresent) assertEquals(3, ifStmt.thenStmt.childNodes.size) @@ -238,7 +241,7 @@ class SourceTransformerTest { assertEquals("w", methodCall.name.asString()) assertEquals(6, methodCall.arguments.size) assertEquals("TEST_GROUP", methodCall.arguments[0].toString()) - assertEquals("835524026", methodCall.arguments[1].toString()) + assertEquals("1698911065", methodCall.arguments[1].toString()) assertEquals(0b1001.toString(), methodCall.arguments[2].toString()) assertEquals("\"test %d %f\"", methodCall.arguments[3].toString()) assertEquals("protoLogParam0", methodCall.arguments[4].toString()) @@ -261,13 +264,13 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE_MULTILINE, code) + val out = sourceJarWriter.processClass(TEST_CODE_MULTILINE, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) assertEquals(1, ifStmts.size) val ifStmt = ifStmts[0] - assertEquals("TEST_GROUP.${Constants.IS_LOG_TO_ANY_METHOD}()", + assertEquals("$implPath.${Constants.IS_ENABLED_METHOD}(TEST_GROUP)", ifStmt.condition.toString()) assertFalse(ifStmt.elseStmt.isPresent) assertEquals(4, ifStmt.thenStmt.childNodes.size) @@ -276,7 +279,7 @@ class SourceTransformerTest { assertEquals("w", methodCall.name.asString()) assertEquals(7, methodCall.arguments.size) assertEquals("TEST_GROUP", methodCall.arguments[0].toString()) - assertEquals("-986393606", methodCall.arguments[1].toString()) + assertEquals("1780316587", methodCall.arguments[1].toString()) assertEquals(0b001001.toString(), methodCall.arguments[2].toString()) assertEquals("protoLogParam0", methodCall.arguments[4].toString()) assertEquals("protoLogParam1", methodCall.arguments[5].toString()) @@ -298,13 +301,13 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE_NO_PARAMS, code) + val out = sourceJarWriter.processClass(TEST_CODE_NO_PARAMS, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) assertEquals(1, ifStmts.size) val ifStmt = ifStmts[0] - assertEquals("TEST_GROUP.${Constants.IS_LOG_TO_ANY_METHOD}()", + assertEquals("$implPath.${Constants.IS_ENABLED_METHOD}(TEST_GROUP)", ifStmt.condition.toString()) assertFalse(ifStmt.elseStmt.isPresent) assertEquals(1, ifStmt.thenStmt.childNodes.size) @@ -313,7 +316,7 @@ class SourceTransformerTest { assertEquals("w", methodCall.name.asString()) assertEquals(5, methodCall.arguments.size) assertEquals("TEST_GROUP", methodCall.arguments[0].toString()) - assertEquals("1282022424", methodCall.arguments[1].toString()) + assertEquals("-1741986185", methodCall.arguments[1].toString()) assertEquals(0.toString(), methodCall.arguments[2].toString()) assertEquals(TRANSFORMED_CODE_NO_PARAMS, out) } @@ -332,13 +335,13 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE, code) + val out = sourceJarWriter.processClass(TEST_CODE, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) assertEquals(1, ifStmts.size) val ifStmt = ifStmts[0] - assertEquals("TEST_GROUP.${Constants.IS_LOG_TO_ANY_METHOD}()", + assertEquals("$implPath.${Constants.IS_ENABLED_METHOD}(TEST_GROUP)", ifStmt.condition.toString()) assertFalse(ifStmt.elseStmt.isPresent) assertEquals(3, ifStmt.thenStmt.childNodes.size) @@ -347,7 +350,7 @@ class SourceTransformerTest { assertEquals("w", methodCall.name.asString()) assertEquals(6, methodCall.arguments.size) assertEquals("TEST_GROUP", methodCall.arguments[0].toString()) - assertEquals("835524026", methodCall.arguments[1].toString()) + assertEquals("1698911065", methodCall.arguments[1].toString()) assertEquals(0b1001.toString(), methodCall.arguments[2].toString()) assertEquals("null", methodCall.arguments[3].toString()) assertEquals("protoLogParam0", methodCall.arguments[4].toString()) @@ -370,13 +373,13 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE_MULTILINE, code) + val out = sourceJarWriter.processClass(TEST_CODE_MULTILINE, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) assertEquals(1, ifStmts.size) val ifStmt = ifStmts[0] - assertEquals("TEST_GROUP.${Constants.IS_LOG_TO_ANY_METHOD}()", + assertEquals("$implPath.${Constants.IS_ENABLED_METHOD}(TEST_GROUP)", ifStmt.condition.toString()) assertFalse(ifStmt.elseStmt.isPresent) assertEquals(4, ifStmt.thenStmt.childNodes.size) @@ -385,7 +388,7 @@ class SourceTransformerTest { assertEquals("w", methodCall.name.asString()) assertEquals(7, methodCall.arguments.size) assertEquals("TEST_GROUP", methodCall.arguments[0].toString()) - assertEquals("-986393606", methodCall.arguments[1].toString()) + assertEquals("1780316587", methodCall.arguments[1].toString()) assertEquals(0b001001.toString(), methodCall.arguments[2].toString()) assertEquals("null", methodCall.arguments[3].toString()) assertEquals("protoLogParam0", methodCall.arguments[4].toString()) @@ -408,7 +411,7 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE, code) + val out = sourceJarWriter.processClass(TEST_CODE, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) @@ -433,7 +436,7 @@ class SourceTransformerTest { invocation.arguments[0] as CompilationUnit } - val out = sourceJarWriter.processClass(TEST_CODE_MULTILINE, code) + val out = sourceJarWriter.processClass(TEST_CODE_MULTILINE, PATH, code) code = StaticJavaParser.parse(out) val ifStmts = code.findAll(IfStmt::class.java) diff --git a/tools/protologtool/tests/com/android/protolog/tool/ViewerConfigBuilderTest.kt b/tools/protologtool/tests/com/android/protolog/tool/ViewerConfigBuilderTest.kt index f435d4065256..d3f8c767e8b1 100644 --- a/tools/protologtool/tests/com/android/protolog/tool/ViewerConfigBuilderTest.kt +++ b/tools/protologtool/tests/com/android/protolog/tool/ViewerConfigBuilderTest.kt @@ -31,6 +31,10 @@ class ViewerConfigBuilderTest { private val TEST1 = ViewerConfigParser.ConfigEntry("test1", LogLevel.INFO.name, TAG1) private val TEST2 = ViewerConfigParser.ConfigEntry("test2", LogLevel.DEBUG.name, TAG2) private val TEST3 = ViewerConfigParser.ConfigEntry("test3", LogLevel.ERROR.name, TAG2) + private val GROUP1 = LogGroup("TEST_GROUP", true, true, TAG1) + private val GROUP2 = LogGroup("DEBUG_GROUP", true, true, TAG2) + private val GROUP3 = LogGroup("DEBUG_GROUP", true, true, TAG2) + private const val PATH = "/tmp/test.java" } private val processor: ProtoLogCallProcessor = Mockito.mock(ProtoLogCallProcessor::class.java) @@ -50,25 +54,25 @@ class ViewerConfigBuilderTest { val visitor = invocation.arguments[1] as ProtoLogCallVisitor visitor.processCall(MethodCallExpr(), TEST1.messageString, LogLevel.INFO, - LogGroup("TEST_GROUP", true, true, TAG1)) + GROUP1) visitor.processCall(MethodCallExpr(), TEST2.messageString, LogLevel.DEBUG, - LogGroup("DEBUG_GROUP", true, true, TAG2)) + GROUP2) visitor.processCall(MethodCallExpr(), TEST3.messageString, LogLevel.ERROR, - LogGroup("DEBUG_GROUP", true, true, TAG2)) + GROUP3) invocation.arguments[0] as CompilationUnit } - configBuilder.processClass(dummyCompilationUnit) + configBuilder.processClass(dummyCompilationUnit, PATH) val parsedConfig = parseConfig(configBuilder.build()) assertEquals(3, parsedConfig.size) - assertEquals(TEST1, parsedConfig[CodeUtils.hash(TEST1.messageString, - LogLevel.INFO)]) - assertEquals(TEST2, parsedConfig[CodeUtils.hash(TEST2.messageString, - LogLevel.DEBUG)]) - assertEquals(TEST3, parsedConfig[CodeUtils.hash(TEST3.messageString, - LogLevel.ERROR)]) + assertEquals(TEST1, parsedConfig[CodeUtils.hash(PATH, + TEST1.messageString, LogLevel.INFO, GROUP1)]) + assertEquals(TEST2, parsedConfig[CodeUtils.hash(PATH, TEST2.messageString, + LogLevel.DEBUG, GROUP2)]) + assertEquals(TEST3, parsedConfig[CodeUtils.hash(PATH, TEST3.messageString, + LogLevel.ERROR, GROUP3)]) } @Test @@ -78,20 +82,21 @@ class ViewerConfigBuilderTest { val visitor = invocation.arguments[1] as ProtoLogCallVisitor visitor.processCall(MethodCallExpr(), TEST1.messageString, LogLevel.INFO, - LogGroup("TEST_GROUP", true, true, TAG1)) + GROUP1) visitor.processCall(MethodCallExpr(), TEST1.messageString, LogLevel.INFO, - LogGroup("TEST_GROUP", true, true, TAG1)) + GROUP1) visitor.processCall(MethodCallExpr(), TEST1.messageString, LogLevel.INFO, - LogGroup("TEST_GROUP", true, true, TAG1)) + GROUP1) invocation.arguments[0] as CompilationUnit } - configBuilder.processClass(dummyCompilationUnit) + configBuilder.processClass(dummyCompilationUnit, PATH) val parsedConfig = parseConfig(configBuilder.build()) assertEquals(1, parsedConfig.size) - assertEquals(TEST1, parsedConfig[CodeUtils.hash(TEST1.messageString, LogLevel.INFO)]) + assertEquals(TEST1, parsedConfig[CodeUtils.hash(PATH, TEST1.messageString, + LogLevel.INFO, GROUP1)]) } @Test @@ -101,7 +106,7 @@ class ViewerConfigBuilderTest { val visitor = invocation.arguments[1] as ProtoLogCallVisitor visitor.processCall(MethodCallExpr(), TEST1.messageString, LogLevel.INFO, - LogGroup("TEST_GROUP", true, true, TAG1)) + GROUP1) visitor.processCall(MethodCallExpr(), TEST2.messageString, LogLevel.DEBUG, LogGroup("DEBUG_GROUP", false, true, TAG2)) visitor.processCall(MethodCallExpr(), TEST3.messageString, LogLevel.ERROR, @@ -110,11 +115,13 @@ class ViewerConfigBuilderTest { invocation.arguments[0] as CompilationUnit } - configBuilder.processClass(dummyCompilationUnit) + configBuilder.processClass(dummyCompilationUnit, PATH) val parsedConfig = parseConfig(configBuilder.build()) assertEquals(2, parsedConfig.size) - assertEquals(TEST1, parsedConfig[CodeUtils.hash(TEST1.messageString, LogLevel.INFO)]) - assertEquals(TEST3, parsedConfig[CodeUtils.hash(TEST3.messageString, LogLevel.ERROR)]) + assertEquals(TEST1, parsedConfig[CodeUtils.hash(PATH, TEST1.messageString, + LogLevel.INFO, GROUP1)]) + assertEquals(TEST3, parsedConfig[CodeUtils.hash(PATH, TEST3.messageString, + LogLevel.ERROR, LogGroup("DEBUG_GROUP", true, false, TAG2))]) } } diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp index 56a242f1daaf..5ac9dfd2a557 100644 --- a/tools/validatekeymaps/Main.cpp +++ b/tools/validatekeymaps/Main.cpp @@ -137,7 +137,6 @@ static bool validateFile(const char* filename) { } } - log("No errors.\n\n"); return true; } diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index eb5a717d2b07..2afb14a12110 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -1056,26 +1056,6 @@ public class WifiConfiguration implements Parcelable { } /** - * @hide - * Returns Randomized MAC address to use with the network. - * If it is not set/valid, creates a new randomized address. - * If it can't generate a valid mac, returns the default MAC. - */ - public @NonNull MacAddress getOrCreateRandomizedMacAddress() { - int randomMacGenerationCount = 0; - while (!isValidMacAddressForRandomization(mRandomizedMacAddress) - && randomMacGenerationCount < MAXIMUM_RANDOM_MAC_GENERATION_RETRY) { - mRandomizedMacAddress = MacAddress.createRandomUnicastAddress(); - randomMacGenerationCount++; - } - - if (!isValidMacAddressForRandomization(mRandomizedMacAddress)) { - mRandomizedMacAddress = MacAddress.fromString(WifiInfo.DEFAULT_MAC_ADDRESS); - } - return mRandomizedMacAddress; - } - - /** * Returns MAC address set to be the local randomized MAC address. * Depending on user preference, the device may or may not use the returned MAC address for * connections to this network. diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index 075531ce158e..68948cbbe7a9 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -17,6 +17,7 @@ package android.net.wifi; import android.Manifest; +import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; @@ -58,13 +59,23 @@ public class WifiScanner { /** 5 GHz band excluding DFS channels */ public static final int WIFI_BAND_5_GHZ = 2; /* 5 GHz band without DFS channels */ /** DFS channels from 5 GHz band only */ - public static final int WIFI_BAND_5_GHZ_DFS_ONLY = 4; /* 5 GHz band with DFS channels */ + public static final int WIFI_BAND_5_GHZ_DFS_ONLY = 4; /* 5 GHz band DFS channels */ + /** + * 2.4Ghz band + DFS channels from 5 GHz band only + * @hide + */ + public static final int WIFI_BAND_24_GHZ_WITH_5GHZ_DFS = 5; /** 5 GHz band including DFS channels */ public static final int WIFI_BAND_5_GHZ_WITH_DFS = 6; /* 5 GHz band with DFS channels */ /** Both 2.4 GHz band and 5 GHz band; no DFS channels */ public static final int WIFI_BAND_BOTH = 3; /* both bands without DFS channels */ /** Both 2.4 GHz band and 5 GHz band; with DFS channels */ public static final int WIFI_BAND_BOTH_WITH_DFS = 7; /* both bands with DFS channels */ + /** + * Max band value + * @hide + */ + public static final int WIFI_BAND_MAX = 8; /** Minimum supported scanning period */ public static final int MIN_SCAN_PERIOD_MS = 1000; /* minimum supported period */ @@ -375,19 +386,27 @@ public class WifiScanner { */ private int mBandScanned; /** all scan results discovered in this scan, sorted by timestamp in ascending order */ - private ScanResult mResults[]; + private final List<ScanResult> mResults; - ScanData() {} + ScanData() { + mResults = new ArrayList<>(); + } public ScanData(int id, int flags, ScanResult[] results) { mId = id; mFlags = flags; - mResults = results; + mResults = new ArrayList<>(Arrays.asList(results)); } /** {@hide} */ public ScanData(int id, int flags, int bucketsScanned, int bandScanned, ScanResult[] results) { + this(id, flags, bucketsScanned, bandScanned, new ArrayList<>(Arrays.asList(results))); + } + + /** {@hide} */ + public ScanData(int id, int flags, int bucketsScanned, int bandScanned, + List<ScanResult> results) { mId = id; mFlags = flags; mBucketsScanned = bucketsScanned; @@ -400,11 +419,9 @@ public class WifiScanner { mFlags = s.mFlags; mBucketsScanned = s.mBucketsScanned; mBandScanned = s.mBandScanned; - mResults = new ScanResult[s.mResults.length]; - for (int i = 0; i < s.mResults.length; i++) { - ScanResult result = s.mResults[i]; - ScanResult newResult = new ScanResult(result); - mResults[i] = newResult; + mResults = new ArrayList<>(); + for (ScanResult scanResult : s.mResults) { + mResults.add(new ScanResult(scanResult)); } } @@ -427,7 +444,14 @@ public class WifiScanner { } public ScanResult[] getResults() { - return mResults; + return mResults.toArray(new ScanResult[0]); + } + + /** {@hide} */ + public void addResults(@NonNull ScanResult[] newResults) { + for (ScanResult result : newResults) { + mResults.add(new ScanResult(result)); + } } /** Implement the Parcelable interface {@hide} */ @@ -437,19 +461,11 @@ public class WifiScanner { /** Implement the Parcelable interface {@hide} */ public void writeToParcel(Parcel dest, int flags) { - if (mResults != null) { - dest.writeInt(mId); - dest.writeInt(mFlags); - dest.writeInt(mBucketsScanned); - dest.writeInt(mBandScanned); - dest.writeInt(mResults.length); - for (int i = 0; i < mResults.length; i++) { - ScanResult result = mResults[i]; - result.writeToParcel(dest, flags); - } - } else { - dest.writeInt(0); - } + dest.writeInt(mId); + dest.writeInt(mFlags); + dest.writeInt(mBucketsScanned); + dest.writeInt(mBandScanned); + dest.writeParcelableList(mResults, 0); } /** Implement the Parcelable interface {@hide} */ @@ -460,11 +476,8 @@ public class WifiScanner { int flags = in.readInt(); int bucketsScanned = in.readInt(); int bandScanned = in.readInt(); - int n = in.readInt(); - ScanResult results[] = new ScanResult[n]; - for (int i = 0; i < n; i++) { - results[i] = ScanResult.CREATOR.createFromParcel(in); - } + List<ScanResult> results = new ArrayList<>(); + in.readParcelableList(results, ScanResult.class.getClassLoader()); return new ScanData(id, flags, bucketsScanned, bandScanned, results); } diff --git a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java index ba9fc786afe7..6d7e621a9bc2 100644 --- a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java @@ -19,7 +19,6 @@ package android.net.wifi; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import android.net.MacAddress; @@ -62,7 +61,8 @@ public class WifiConfigurationTest { config.updateIdentifier = "1234"; config.fromWifiNetworkSpecifier = true; config.fromWifiNetworkSuggestion = true; - MacAddress macBeforeParcel = config.getOrCreateRandomizedMacAddress(); + config.setRandomizedMacAddress(MacAddress.createRandomUnicastAddress()); + MacAddress macBeforeParcel = config.getRandomizedMacAddress(); Parcel parcelW = Parcel.obtain(); config.writeToParcel(parcelW, 0); byte[] bytes = parcelW.marshall(); @@ -75,7 +75,7 @@ public class WifiConfigurationTest { // lacking a useful config.equals, check two fields near the end. assertEquals(cookie, reconfig.getMoTree()); - assertEquals(macBeforeParcel, reconfig.getOrCreateRandomizedMacAddress()); + assertEquals(macBeforeParcel, reconfig.getRandomizedMacAddress()); assertEquals(config.updateIdentifier, reconfig.updateIdentifier); assertFalse(reconfig.trusted); assertTrue(config.fromWifiNetworkSpecifier); @@ -193,19 +193,6 @@ public class WifiConfigurationTest { } @Test - public void testGetOrCreateRandomizedMacAddress_SavesAndReturnsSameAddress() { - WifiConfiguration config = new WifiConfiguration(); - MacAddress defaultMac = MacAddress.fromString(WifiInfo.DEFAULT_MAC_ADDRESS); - assertEquals(defaultMac, config.getRandomizedMacAddress()); - - MacAddress firstMacAddress = config.getOrCreateRandomizedMacAddress(); - MacAddress secondMacAddress = config.getOrCreateRandomizedMacAddress(); - - assertNotEquals(defaultMac, firstMacAddress); - assertEquals(firstMacAddress, secondMacAddress); - } - - @Test public void testSetRandomizedMacAddress_ChangesSavedAddress() { WifiConfiguration config = new WifiConfiguration(); MacAddress defaultMac = MacAddress.fromString(WifiInfo.DEFAULT_MAC_ADDRESS); @@ -219,36 +206,6 @@ public class WifiConfigurationTest { } @Test - public void testGetOrCreateRandomizedMacAddress_ReRandomizesInvalidAddress() { - WifiConfiguration config = new WifiConfiguration(); - - MacAddress defaultMac = MacAddress.fromString(WifiInfo.DEFAULT_MAC_ADDRESS); - MacAddress macAddressZeroes = MacAddress.ALL_ZEROS_ADDRESS; - MacAddress macAddressMulticast = MacAddress.fromString("03:ff:ff:ff:ff:ff"); - MacAddress macAddressGlobal = MacAddress.fromString("fc:ff:ff:ff:ff:ff"); - - config.setRandomizedMacAddress(null); - MacAddress macAfterChange = config.getOrCreateRandomizedMacAddress(); - assertNotEquals(macAfterChange, null); - - config.setRandomizedMacAddress(defaultMac); - macAfterChange = config.getOrCreateRandomizedMacAddress(); - assertNotEquals(macAfterChange, defaultMac); - - config.setRandomizedMacAddress(macAddressZeroes); - macAfterChange = config.getOrCreateRandomizedMacAddress(); - assertNotEquals(macAfterChange, macAddressZeroes); - - config.setRandomizedMacAddress(macAddressMulticast); - macAfterChange = config.getOrCreateRandomizedMacAddress(); - assertNotEquals(macAfterChange, macAddressMulticast); - - config.setRandomizedMacAddress(macAddressGlobal); - macAfterChange = config.getOrCreateRandomizedMacAddress(); - assertNotEquals(macAfterChange, macAddressGlobal); - } - - @Test public void testSetRandomizedMacAddress_DoesNothingWhenNull() { WifiConfiguration config = new WifiConfiguration(); MacAddress defaultMac = MacAddress.fromString(WifiInfo.DEFAULT_MAC_ADDRESS); diff --git a/wifi/tests/src/android/net/wifi/WifiScannerTest.java b/wifi/tests/src/android/net/wifi/WifiScannerTest.java index dd05b47fbd4f..ea136d62b202 100644 --- a/wifi/tests/src/android/net/wifi/WifiScannerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiScannerTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -445,4 +444,37 @@ public class WifiScannerTest { assertEquals(WifiScanner.CMD_STOP_PNO_SCAN, message.what); } + + @Test + public void testScanDataAddResults() throws Exception { + ScanResult scanResult1 = new ScanResult(); + scanResult1.SSID = TEST_SSID_1; + ScanData scanData = new ScanData(0, 0, new ScanResult[]{scanResult1}); + + ScanResult scanResult2 = new ScanResult(); + scanResult2.SSID = TEST_SSID_2; + scanData.addResults(new ScanResult[]{scanResult2}); + + ScanResult[] consolidatedScanResults = scanData.getResults(); + assertEquals(2, consolidatedScanResults.length); + assertEquals(TEST_SSID_1, consolidatedScanResults[0].SSID); + assertEquals(TEST_SSID_2, consolidatedScanResults[1].SSID); + } + + @Test + public void testScanDataParcel() throws Exception { + ScanResult scanResult1 = new ScanResult(); + scanResult1.SSID = TEST_SSID_1; + ScanData scanData = new ScanData(5, 4, new ScanResult[]{scanResult1}); + + Parcel parcel = Parcel.obtain(); + scanData.writeToParcel(parcel, 0); + parcel.setDataPosition(0); // Rewind data position back to the beginning for read. + ScanData readScanData = ScanData.CREATOR.createFromParcel(parcel); + + assertEquals(scanData.getId(), readScanData.getId()); + assertEquals(scanData.getFlags(), readScanData.getFlags()); + assertEquals(scanData.getResults().length, readScanData.getResults().length); + assertEquals(scanData.getResults()[0].SSID, readScanData.getResults()[0].SSID); + } } |
